Skip to content
Commits on Source (5)
Hide whitespace changes
Inline Side-by-side
meson.build
View file @ 9634ae8e
......@@ -17,7 +17,7 @@
project(
'vte',
['c', 'cpp'],
version: '0.62.2',
version: '0.62.3',
license: ['LGPL-3.0-or-later', 'GPL-3.0-or-later'],
default_options: [
'buildtype=release',
......
po/nb.po
View file @ 9634ae8e
# Norwegian (bokmål) translation of vte.
# Copyright (C) Kjartan Maraas, 2002-2014.
# Copyright (C) Kjartan Maraas, 2002-2020.
# Free Software Foundation, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: vte 0.46.x\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-16 12:39+0200\n"
"PO-Revision-Date: 2016-10-16 12:38+0200\n"
"Project-Id-Version: vte 0.62.x\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/vte/issues\n"
"POT-Creation-Date: 2020-09-12 19:27+0000\n"
"PO-Revision-Date: 2021-01-25 15:05+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
......@@ -15,28 +15,44 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../src/iso2022.cc:73 ../src/iso2022.cc:81 ../src/iso2022.cc:111
#: ../src/vtegtk.cc:3072
#: src/vte.cc:7764
msgid "WARNING"
msgstr "ADVARSEL"
#: src/vte.cc:7766
msgid "GnuTLS not enabled; data will be written to disk unencrypted!"
msgstr ""
"GNUTLS er ikke aktivert; data vil bli skrevet til disk uten kryptering!"
#: src/spawn.cc:111
#, c-format
msgid "Unable to convert characters from %s to %s."
msgstr "Kan ikke konvertere tegn fra %s til %s."
msgid "Failed to set pipe nonblocking: %s"
msgstr "Klarte ikke å sette rør til ikke-blokkerende: %s"
#. Translators: %s is replaced with error message returned by strerror().
#: ../src/vte.cc:4002
#: src/spawn.cc:156
#, c-format
msgid "Error reading from child: %s."
msgstr "Feil under lesing fra underprosess: %s."
msgid "poll error: %s"
msgstr "feil ved henting: %s"
#: src/spawn.cc:163
msgid "Operation timed out"
msgstr "Operasjonen fikk tidsavbrudd"
#: ../src/vte.cc:4141
#: src/spawn.cc:173
msgid "Operation was cancelled"
msgstr "Operasjonen ble avbrutt"
#: src/spawn.cc:191
#, c-format
msgid "Error (%s) converting data for child, dropping."
msgstr "Feil (%s) ved konvertering av data for underprosess. Hopper over."
msgid "Failed to read from child pipe (%s)"
msgstr "Feil under lesing fra underrør (%s)"
#: ../src/vte.cc:7910
msgid "WARNING"
msgstr "ADVARSEL"
#: src/spawn.cc:621
#, c-format
msgid "Failed to change to directory “%s”: %s"
msgstr "Klarte ikke å endre til katalog «%s»: %s"
#: ../src/vte.cc:7911
msgid "GNUTLS not enabled; data will be written to disk unencrypted!"
msgstr ""
"GNUTLS er ikke aktivert; data vil bli skrevet til disk uten kryptering!"
#: src/spawn.cc:690
#, c-format
msgid "Failed to execute child process “%s”: "
msgstr "Klarte ikke å kjøre underprosess «%s»: "
src/keymap.cc
View file @ 9634ae8e
......@@ -19,6 +19,8 @@
#include "config.h"
#include <cassert>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
......@@ -74,7 +76,7 @@ struct _vte_keymap_entry {
guint keypad_mode;
guint mod_mask;
const char normal[8];
gssize normal_length;
int8_t normal_length;
};
#define X_NULL ""
......@@ -757,6 +759,7 @@ _vte_keymap_map(guint keyval,
if ((modifiers & entries[i].mod_mask) == entries[i].mod_mask) {
if (entries[i].normal_length != -1) {
*normal_length = entries[i].normal_length;
assert(entries[i].normal_length < G_MAXINT);
*normal = (char*)g_memdup(entries[i].normal,
entries[i].normal_length);
} else {
......
src/vte.cc
View file @ 9634ae8e
......@@ -7340,14 +7340,6 @@ Terminal::set_font_desc(PangoFontDescription const* font_desc)
"Using default monospace font.\n");
}
/* Sanitise the font description. Style and weight need to be default here,
* since those are set via SGR attributes; and gravity makes no sense in vte.
*/
pango_font_description_unset_fields(desc,
PangoFontMask(PANGO_FONT_MASK_GRAVITY |
PANGO_FONT_MASK_STYLE |
PANGO_FONT_MASK_WEIGHT));
bool const same_desc = m_unscaled_font_desc &&
pango_font_description_equal(m_unscaled_font_desc.get(), desc);
......