Merge branch '1475-atomic-casts' into 'master'
tests: Fix a -Wbad-function-cast warning in the atomic tests
Closes #1475
See merge request GNOME/glib!223
diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c
index f80c625..b38fad6 100644
--- a/gio/gtlsclientconnection.c
+++ b/gio/gtlsclientconnection.c
@@ -105,14 +105,7 @@
*
* If %TRUE, forces the connection to use a fallback version of TLS
* or SSL, rather than trying to negotiate the best version of TLS
- * to use. This can be used when talking to servers that don't
- * implement version negotiation correctly and therefore refuse to
- * handshake at all with a modern TLS handshake.
- *
- * Despite the property name, the fallback version is usually not
- * SSL 3.0, because SSL 3.0 is generally disabled by the #GTlsBackend.
- * #GTlsClientConnection will use the next-highest available version
- * as the fallback version.
+ * to use. See g_tls_client_connection_set_use_ssl3().
*
* Since: 2.28
*
@@ -304,14 +297,19 @@
* @conn: the #GTlsClientConnection
* @use_ssl3: whether to use the lowest-supported protocol version
*
- * If @use_ssl3 is %TRUE, this forces @conn to use the lowest-supported
- * TLS protocol version rather than trying to properly negotiate the
- * highest mutually-supported protocol version with the peer. This can
- * be used when talking to broken TLS servers that exhibit protocol
- * version intolerance.
+ * Since 2.42.1, if @use_ssl3 is %TRUE, this forces @conn to use the
+ * lowest-supported TLS protocol version rather than trying to properly
+ * negotiate the highest mutually-supported protocol version with the
+ * peer. Be aware that SSL 3.0 is generally disabled by the
+ * #GTlsBackend, so the lowest-supported protocol version is probably
+ * not SSL 3.0.
*
- * Be aware that SSL 3.0 is generally disabled by the #GTlsBackend, so
- * the lowest-supported protocol version is probably not SSL 3.0.
+ * Since 2.58, this may additionally cause an RFC 7507 fallback SCSV to
+ * be sent to the server, causing modern TLS servers to immediately
+ * terminate the connection. You should generally only use this function
+ * if you need to connect to broken servers that exhibit TLS protocol
+ * version intolerance, and when an initial attempt to connect to a
+ * server normally has already failed.
*
* Since: 2.28
*
diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c
index e13d986..b0353af 100644
--- a/gio/gtlsconnection.c
+++ b/gio/gtlsconnection.c
@@ -674,7 +674,8 @@
* @conn: a #GTlsConnection
* @mode: the rehandshaking mode
*
- * Sets how @conn behaves with respect to rehandshaking requests.
+ * Sets how @conn behaves with respect to rehandshaking requests, when
+ * TLS 1.2 or older is in use.
*
* %G_TLS_REHANDSHAKE_NEVER means that it will never agree to
* rehandshake after the initial handshake is complete. (For a client,
@@ -756,7 +757,8 @@
* the beginning of the communication, you do not need to call this
* function explicitly unless you want clearer error reporting.
* However, you may call g_tls_connection_handshake() later on to
- * renegotiate parameters (encryption methods, etc) with the client.
+ * rehandshake, if TLS 1.2 or older is in use. With TLS 1.3, this will
+ * instead perform a rekey.
*
* #GTlsConnection::accept_certificate may be emitted during the
* handshake.
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 3f0275f..31706ba 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -863,7 +863,8 @@
item->metadata->applications = g_list_prepend (item->metadata->applications, ai);
g_hash_table_replace (item->metadata->apps_by_name, ai->name, ai);
}
-
+
+ g_free (ai->exec);
ai->exec = g_strdup (exec);
if (count)
diff --git a/glib/gbytes.c b/glib/gbytes.c
index 74f8148..7b72886 100644
--- a/glib/gbytes.c
+++ b/glib/gbytes.c
@@ -403,10 +403,18 @@
*
* Compares the two #GBytes values.
*
- * This function can be used to sort GBytes instances in lexographical order.
+ * This function can be used to sort GBytes instances in lexicographical order.
*
- * Returns: a negative value if bytes2 is lesser, a positive value if bytes2 is
- * greater, and zero if bytes2 is equal to bytes1
+ * If @bytes1 and @bytes2 have different length but the shorter one is a
+ * prefix of the longer one then the shorter one is considered to be less than
+ * the longer one. Otherwise the first byte where both differ is used for
+ * comparison. If @bytes1 has a smaller value at that position it is
+ * considered less, otherwise greater than @bytes2.
+ *
+ * Returns: a negative value if @bytes1 is less than @bytes2, a positive value
+ * if @bytes1 is greater than @bytes2, and zero if @bytes1 is equal to
+ * @bytes2
+ *
*
* Since: 2.32
*/
diff --git a/glib/gtimer.c b/glib/gtimer.c
index e95ac0e..76da128 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -345,6 +345,8 @@
* zone indicator. (In the absence of any time zone indication, the
* timestamp is assumed to be in local time.)
*
+ * Any leading or trailing space in @iso_date is ignored.
+ *
* Returns: %TRUE if the conversion was successful.
*
* Since: 2.12
@@ -355,6 +357,8 @@
{
struct tm tm = {0};
long val;
+ long mday, mon, year;
+ long hour, min, sec;
g_return_val_if_fail (iso_date != NULL, FALSE);
g_return_val_if_fail (time_ != NULL, FALSE);
@@ -368,30 +372,42 @@
if (*iso_date == '\0')
return FALSE;
- if (!g_ascii_isdigit (*iso_date) && *iso_date != '-' && *iso_date != '+')
+ if (!g_ascii_isdigit (*iso_date) && *iso_date != '+')
return FALSE;
val = strtoul (iso_date, (char **)&iso_date, 10);
if (*iso_date == '-')
{
/* YYYY-MM-DD */
- tm.tm_year = val - 1900;
+ year = val;
iso_date++;
- tm.tm_mon = strtoul (iso_date, (char **)&iso_date, 10) - 1;
-
+
+ mon = strtoul (iso_date, (char **)&iso_date, 10);
if (*iso_date++ != '-')
return FALSE;
- tm.tm_mday = strtoul (iso_date, (char **)&iso_date, 10);
+ mday = strtoul (iso_date, (char **)&iso_date, 10);
}
else
{
/* YYYYMMDD */
- tm.tm_mday = val % 100;
- tm.tm_mon = (val % 10000) / 100 - 1;
- tm.tm_year = val / 10000 - 1900;
+ mday = val % 100;
+ mon = (val % 10000) / 100;
+ year = val / 10000;
}
+ /* Validation. */
+ if (year < 1900 || year > G_MAXINT)
+ return FALSE;
+ if (mon < 1 || mon > 12)
+ return FALSE;
+ if (mday < 1 || mday > 31)
+ return FALSE;
+
+ tm.tm_mday = mday;
+ tm.tm_mon = mon - 1;
+ tm.tm_year = year - 1900;
+
if (*iso_date != 'T')
return FALSE;
@@ -405,34 +421,50 @@
if (*iso_date == ':')
{
/* hh:mm:ss */
- tm.tm_hour = val;
+ hour = val;
iso_date++;
- tm.tm_min = strtoul (iso_date, (char **)&iso_date, 10);
+ min = strtoul (iso_date, (char **)&iso_date, 10);
if (*iso_date++ != ':')
return FALSE;
- tm.tm_sec = strtoul (iso_date, (char **)&iso_date, 10);
+ sec = strtoul (iso_date, (char **)&iso_date, 10);
}
else
{
/* hhmmss */
- tm.tm_sec = val % 100;
- tm.tm_min = (val % 10000) / 100;
- tm.tm_hour = val / 10000;
+ sec = val % 100;
+ min = (val % 10000) / 100;
+ hour = val / 10000;
}
+ /* Validation. Allow up to 2 leap seconds when validating @sec. */
+ if (hour > 23)
+ return FALSE;
+ if (min > 59)
+ return FALSE;
+ if (sec > 61)
+ return FALSE;
+
+ tm.tm_hour = hour;
+ tm.tm_min = min;
+ tm.tm_sec = sec;
+
time_->tv_usec = 0;
if (*iso_date == ',' || *iso_date == '.')
{
glong mul = 100000;
- while (g_ascii_isdigit (*++iso_date))
+ while (mul >= 1 && g_ascii_isdigit (*++iso_date))
{
time_->tv_usec += (*iso_date - '0') * mul;
mul /= 10;
}
+
+ /* Skip any remaining digits after we’ve reached our limit of precision. */
+ while (g_ascii_isdigit (*iso_date))
+ iso_date++;
}
/* Now parse the offset and convert tm to a time_t */
@@ -448,11 +480,24 @@
val = strtoul (iso_date + 1, (char **)&iso_date, 10);
if (*iso_date == ':')
- val = 60 * val + strtoul (iso_date + 1, (char **)&iso_date, 10);
+ {
+ /* hh:mm */
+ hour = val;
+ min = strtoul (iso_date + 1, (char **)&iso_date, 10);
+ }
else
- val = 60 * (val / 100) + (val % 100);
+ {
+ /* hhmm */
+ hour = val / 100;
+ min = val % 100;
+ }
- time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * val * sign);
+ if (hour > 99)
+ return FALSE;
+ if (min > 59)
+ return FALSE;
+
+ time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * (60 * hour + min) * sign);
}
else
{
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 172d166..3a11fd8 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -165,6 +165,8 @@
bookmarks/fail-37.xbel \
bookmarks/fail-38.xbel \
bookmarks/fail-39.xbel \
+ bookmarks/fail-40.xbel \
+ bookmarks/fail-41.xbel \
bookmarks/valid-01.xbel \
bookmarks/valid-02.xbel \
bookmarks/valid-03.xbel \
diff --git a/glib/tests/bookmarks/fail-40.xbel b/glib/tests/bookmarks/fail-40.xbel
new file mode 100644
index 0000000..9ce48a8
--- /dev/null
+++ b/glib/tests/bookmarks/fail-40.xbel
@@ -0,0 +1 @@
+<xbel version="1.0"><bookmark href=""><info><metadata owner="http://freedesktop.org"><applications><application name=""exec=""/><application name=""exec=""/
\ No newline at end of file
diff --git a/glib/tests/bookmarks/fail-41.xbel b/glib/tests/bookmarks/fail-41.xbel
new file mode 100644
index 0000000..8ac0c56
--- /dev/null
+++ b/glib/tests/bookmarks/fail-41.xbel
@@ -0,0 +1 @@
+<xbel version="1.0"><bookmark href=""added="2T0+819855292164632335">
diff --git a/glib/tests/timer.c b/glib/tests/timer.c
index cb9a268..f40a278 100644
--- a/glib/tests/timer.c
+++ b/glib/tests/timer.c
@@ -144,7 +144,39 @@
{ FALSE, "2001-10-08Tx", { 0, 0 } },
{ FALSE, "2001-10-08T10:11x", { 0, 0 } },
{ FALSE, "Wed Dec 19 17:20:20 GMT 2007", { 0, 0 } },
- { FALSE, "1980-02-22T10:36:00Zulu", { 0, 0 } }
+ { FALSE, "1980-02-22T10:36:00Zulu", { 0, 0 } },
+ { FALSE, "2T0+819855292164632335", { 0, 0 } },
+ { TRUE, "2018-08-03T14:08:05.446178377+01:00", { 1533301685, 446178 } },
+ { FALSE, "2147483648-08-03T14:08:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-13-03T14:08:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-00-03T14:08:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-08-00T14:08:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-08-32T14:08:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-08-03T24:08:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-08-03T14:60:05.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-08-03T14:08:63.446178377+01:00", { 0, 0 } },
+ { FALSE, "2018-08-03T14:08:05.446178377+100:00", { 0, 0 } },
+ { FALSE, "2018-08-03T14:08:05.446178377+01:60", { 0, 0 } },
+ { TRUE, "20180803T140805.446178377+0100", { 1533301685, 446178 } },
+ { FALSE, "21474836480803T140805.446178377+0100", { 0, 0 } },
+ { FALSE, "20181303T140805.446178377+0100", { 0, 0 } },
+ { FALSE, "20180003T140805.446178377+0100", { 0, 0 } },
+ { FALSE, "20180800T140805.446178377+0100", { 0, 0 } },
+ { FALSE, "20180832T140805.446178377+0100", { 0, 0 } },
+ { FALSE, "20180803T240805.446178377+0100", { 0, 0 } },
+ { FALSE, "20180803T146005.446178377+0100", { 0, 0 } },
+ { FALSE, "20180803T140863.446178377+0100", { 0, 0 } },
+ { FALSE, "20180803T140805.446178377+10000", { 0, 0 } },
+ { FALSE, "20180803T140805.446178377+0160", { 0, 0 } },
+ { TRUE, "+1980-02-22T12:36:00+02:00", { 320063760, 0 } },
+ { FALSE, "-0005-01-01T00:00:00Z", { 0, 0 } },
+ { FALSE, "2018-08-06", { 0, 0 } },
+ { FALSE, "2018-08-06 13:51:00Z", { 0, 0 } },
+ { TRUE, "20180803T140805,446178377+0100", { 1533301685, 446178 } },
+ { TRUE, "2018-08-03T14:08:05.446178377-01:00", { 1533308885, 446178 } },
+ { FALSE, "2018-08-03T14:08:05.446178377 01:00", { 0, 0 } },
+ { TRUE, "1990-11-01T10:21:17", { 657454877, 0 } },
+ { TRUE, "1990-11-01T10:21:17 ", { 657454877, 0 } },
};
GTimeVal out;
gboolean success;
diff --git a/po/lt.po b/po/lt.po
index 659b025..f9c42fe 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: lt\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
-"POT-Creation-Date: 2018-07-20 07:02+0000\n"
-"PO-Revision-Date: 2018-07-28 17:26+0300\n"
+"POT-Creation-Date: 2018-07-30 18:46+0000\n"
+"PO-Revision-Date: 2018-08-05 23:25+0300\n"
"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
"Language: lt\n"
@@ -641,8 +641,6 @@
#: gio/gdbusconnection.c:4115 gio/gdbusconnection.c:4462
#, c-format
-#| msgid ""
-#| "No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
msgid ""
"No such interface “org.freedesktop.DBus.Properties” on object at path %s"
msgstr ""
@@ -650,25 +648,21 @@
#: gio/gdbusconnection.c:4257
#, c-format
-#| msgid "No such property '%s'"
msgid "No such property “%s”"
msgstr "Nėra savybės „%s“"
#: gio/gdbusconnection.c:4269
#, c-format
-#| msgid "Property '%s' is not readable"
msgid "Property “%s” is not readable"
msgstr "Savybė „%s“ yra neskaitoma"
#: gio/gdbusconnection.c:4280
#, c-format
-#| msgid "Property '%s' is not writable"
msgid "Property “%s” is not writable"
msgstr "Savybė „%s“ nėra rašoma"
#: gio/gdbusconnection.c:4300
#, c-format
-#| msgid "Error setting property '%s': Expected type '%s' but got '%s'"
msgid "Error setting property “%s”: Expected type “%s” but got “%s”"
msgstr "Klaida nustatant savybę „%s“: tikėtasi tipo „%s“, bet gauta „%s“"
@@ -680,19 +674,16 @@
#: gio/gdbusconnection.c:4831 gio/gdbusconnection.c:7091
#, c-format
-#| msgid "No such interface '%s' on object at path %s"
msgid "No such interface “%s” on object at path %s"
msgstr "Nėra sąsajos „%s“ objektui, kurio kelias %s"
#: gio/gdbusconnection.c:4929
#, c-format
-#| msgid "No such key “%s”\n"
msgid "No such method “%s”"
msgstr "Nėra metodo „%s“"
#: gio/gdbusconnection.c:4960
#, c-format
-#| msgid "Type of message, '%s', does not match expected type '%s'"
msgid "Type of message, “%s”, does not match expected type “%s”"
msgstr "Pranešimo tipas „%s“ neatitinka laukiamo tipo „%s“"
@@ -713,13 +704,11 @@
#: gio/gdbusconnection.c:5618
#, c-format
-#| msgid "Method '%s' returned type '%s', but expected '%s'"
msgid "Method “%s” returned type “%s”, but expected “%s”"
msgstr "Metodas „%s“ grąžino tipą „%s“, bet laukta „%s“"
#: gio/gdbusconnection.c:6693
#, c-format
-#| msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
msgid "Method “%s” on interface “%s” with signature “%s” does not exist"
msgstr "Metodas „%s“ sąsajoje „%s“ su signatūra „%s“ neegzistuoja"
@@ -2004,7 +1993,6 @@
msgstr "Išstumti"
#: gio/gio-tool-mount.c:66
-#| msgid "Mount volume with device file"
msgid "Stop drive with device file"
msgstr "Sustabdyti laikmeną su įrenginio failu"
@@ -2042,8 +2030,6 @@
msgstr "Skaitmeninis PIM atrakinant VeraCrypt tomą"
#: gio/gio-tool-mount.c:74
-#| msgctxt "GDateTime"
-#| msgid "PM"
msgid "PIM"
msgstr "PIM"
@@ -2060,7 +2046,6 @@
msgstr "Neleidžiama anoniminė prieiga"
#: gio/gio-tool-mount.c:524
-#| msgid "No volume for device file"
msgid "No drive for device file"
msgstr "Nėra laikmenos ar įrenginio failo"
@@ -2297,14 +2282,10 @@
msgstr "Parodyti programos versiją ir išeiti"
#: gio/glib-compile-resources.c:737
-#| msgid "name of the output file"
msgid "Name of the output file"
msgstr "Išvesties failo pavadinimas"
#: gio/glib-compile-resources.c:738
-#| msgid ""
-#| "The directories where files are to be read from (default to current "
-#| "directory)"
msgid ""
"The directories to load files referenced in FILE from (default: current "
"directory)"
@@ -2327,7 +2308,6 @@
msgstr "Generuoti šaltinio antraštę"
#: gio/glib-compile-resources.c:741
-#| msgid "Generate sourcecode used to link in the resource file into your code"
msgid "Generate source code used to link in the resource file into your code"
msgstr "Generuoti kodą, naudojamą išteklių failo įrišimui į jūsų kodą"
@@ -2336,7 +2316,6 @@
msgstr "Generuoti priklausomybių sąrašą"
#: gio/glib-compile-resources.c:743
-#| msgid "name of the dependency file to generate"
msgid "Name of the dependency file to generate"
msgstr "Generuojamo priklausomybių failo pavadinimas"
@@ -2724,7 +2703,6 @@
#: gio/glib-compile-schemas.c:1959
#, c-format
-#| msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
msgid "No such key “%s” in schema “%s” as specified in override file “%s”"
msgstr "Nėra rakto „%s“ schemoje „%s“ kaip nurodyta perrašančiame faile „%s“"
@@ -2751,9 +2729,6 @@
#: gio/glib-compile-schemas.c:2011
#, c-format
-#| msgid ""
-#| "error parsing key '%s' in schema '%s' as specified in override file '%s': "
-#| "%s."
msgid ""
"error parsing key “%s” in schema “%s” as specified in override file “%s”: %s."
msgstr ""
@@ -2767,9 +2742,6 @@
#: gio/glib-compile-schemas.c:2040
#, c-format
-#| msgid ""
-#| "override for key '%s' in schema '%s' in override file '%s' is outside the "
-#| "range given in the schema"
msgid ""
"override for key “%s” in schema “%s” in override file “%s” is outside the "
"range given in the schema"
@@ -2779,9 +2751,6 @@
#: gio/glib-compile-schemas.c:2069
#, c-format
-#| msgid ""
-#| "override for key '%s' in schema '%s' in override file '%s' is not in the "
-#| "list of valid choices"
msgid ""
"override for key “%s” in schema “%s” in override file “%s” is not in the "
"list of valid choices"
@@ -2899,7 +2868,6 @@
#: gio/glocalfile.c:1979
#, c-format
-#| msgid "Copy (reflink/clone) between mounts is not supported"
msgid "Trashing on system internal mounts is not supported"
msgstr "Išmetimas tarp sistemos vidinių prijungimo taškų nepalaikomas"
@@ -4924,32 +4892,26 @@
#: glib/gmarkup.c:461 glib/gmarkup.c:544
#, c-format
-#| msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
msgid "Invalid UTF-8 encoded text in name — not valid “%s”"
msgstr "Klaidingai koduotas UTF-8 tekstas varde – netinkamas „%s“"
#: glib/gmarkup.c:472
#, c-format
-#| msgid "'%s' is not a valid name"
msgid "“%s” is not a valid name"
msgstr "„%s“ nėra tinkamas vardas"
#: glib/gmarkup.c:488
#, c-format
-#| msgid "'%s' is not a valid name: '%c'"
msgid "“%s” is not a valid name: “%c”"
msgstr "„%s“ nėra tinkamas vardas: „%c“"
-#: glib/gmarkup.c:598
+#: glib/gmarkup.c:610
#, c-format
msgid "Error on line %d: %s"
msgstr "Klaida eilutėje %d: %s"
-#: glib/gmarkup.c:675
+#: glib/gmarkup.c:687
#, c-format
-#| msgid ""
-#| "Failed to parse '%-.*s', which should have been a digit inside a "
-#| "character reference (ê for example) - perhaps the digit is too large"
msgid ""
"Failed to parse “%-.*s”, which should have been a digit inside a character "
"reference (ê for example) — perhaps the digit is too large"
@@ -4957,11 +4919,7 @@
"Nepavyko perskaityti „%-.*s“, kuris galėjo turėti skaičius simbolio aprašyme "
"(pvz., ê) – gal skaičius per didelis"
-#: glib/gmarkup.c:687
-#| msgid ""
-#| "Character reference did not end with a semicolon; most likely you used an "
-#| "ampersand character without intending to start an entity - escape "
-#| "ampersand as &"
+#: glib/gmarkup.c:699
msgid ""
"Character reference did not end with a semicolon; most likely you used an "
"ampersand character without intending to start an entity — escape ampersand "
@@ -4971,31 +4929,24 @@
"ampersendo simbolį nepradėdami elemento įvedimo – pakeiskite ampersendą "
"įvesdami &"
-#: glib/gmarkup.c:713
+#: glib/gmarkup.c:725
#, c-format
-#| msgid "Character reference '%-.*s' does not encode a permitted character"
msgid "Character reference “%-.*s” does not encode a permitted character"
msgstr "Simbolio aprašymas „%-.*s“ neatitinka leistinų simbolių"
-#: glib/gmarkup.c:751
-#| msgid ""
-#| "Empty entity '&;' seen; valid entities are: & " < > '"
+#: glib/gmarkup.c:763
msgid ""
"Empty entity “&;” seen; valid entities are: & " < > '"
msgstr ""
"Aptiktas tuščias elementas '&;'; galimi elementai yra: & " < "
"> '"
-#: glib/gmarkup.c:759
+#: glib/gmarkup.c:771
#, c-format
-#| msgid "Entity name '%-.*s' is not known"
msgid "Entity name “%-.*s” is not known"
msgstr "Elemento vardas „%-.*s“ nežinomas"
-#: glib/gmarkup.c:764
-#| msgid ""
-#| "Entity did not end with a semicolon; most likely you used an ampersand "
-#| "character without intending to start an entity - escape ampersand as &"
+#: glib/gmarkup.c:776
msgid ""
"Entity did not end with a semicolon; most likely you used an ampersand "
"character without intending to start an entity — escape ampersand as &"
@@ -5003,26 +4954,20 @@
"Elementas nepasibaigė kabliataškiu; greičiausiai Jūs panaudojote ampersendo "
"simbolį nepradėdami elemento įvedimo – pakeiskite ampersendą įvesdami &"
-#: glib/gmarkup.c:1170
+#: glib/gmarkup.c:1182
msgid "Document must begin with an element (e.g. <book>)"
msgstr "Dokumentas turėtų prasidėti elementu (pvz., <book>)"
-#: glib/gmarkup.c:1210
+#: glib/gmarkup.c:1222
#, c-format
-#| msgid ""
-#| "'%s' is not a valid character following a '<' character; it may not begin "
-#| "an element name"
msgid ""
"“%s” is not a valid character following a “<” character; it may not begin an "
"element name"
msgstr ""
"„%s“ negali būti rašomas po „<“ simbolio; jis nepradeda jokio elemento vardo"
-#: glib/gmarkup.c:1252
+#: glib/gmarkup.c:1264
#, c-format
-#| msgid ""
-#| "Odd character '%s', expected a '>' character to end the empty-element tag "
-#| "'%s'"
msgid ""
"Odd character “%s”, expected a “>” character to end the empty-element tag "
"“%s”"
@@ -5030,23 +4975,16 @@
"Neįprastas simbolis „%s“, tikėtasi sulaukti „>“ simbolio, užbaigiančio "
"tuščią žymą „%s“"
-#: glib/gmarkup.c:1333
+#: glib/gmarkup.c:1345
#, c-format
-#| msgid ""
-#| "Odd character '%s', expected a '=' after attribute name '%s' of element "
-#| "'%s'"
msgid ""
"Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”"
msgstr ""
"Neįprastas simbolis „%1$s“, tikėtasi sulaukti „=“ po elemento „%3$s“ "
"atributo vardo „%2$s“"
-#: glib/gmarkup.c:1374
+#: glib/gmarkup.c:1386
#, c-format
-#| msgid ""
-#| "Odd character '%s', expected a '>' or '/' character to end the start tag "
-#| "of element '%s', or optionally an attribute; perhaps you used an invalid "
-#| "character in an attribute name"
msgid ""
"Odd character “%s”, expected a “>” or “/” character to end the start tag of "
"element “%s”, or optionally an attribute; perhaps you used an invalid "
@@ -5056,11 +4994,8 @@
"užbaigiančių elementą „%s“, arba papildomo požymio; gal Jūs panaudojote "
"netinkama simbolį požymio varde"
-#: glib/gmarkup.c:1418
+#: glib/gmarkup.c:1430
#, c-format
-#| msgid ""
-#| "Odd character '%s', expected an open quote mark after the equals sign "
-#| "when giving value for attribute '%s' of element '%s'"
msgid ""
"Odd character “%s”, expected an open quote mark after the equals sign when "
"giving value for attribute “%s” of element “%s”"
@@ -5068,22 +5003,16 @@
"Neįprastas simbolis „%1$s“, po lygybės tikėtasi sulaukti atidarančio "
"citavimo simbolio pradedant „%3$s“ elemento „%2$s“ atributo reikšmę."
-#: glib/gmarkup.c:1551
+#: glib/gmarkup.c:1563
#, c-format
-#| msgid ""
-#| "'%s' is not a valid character following the characters '</'; '%s' may not "
-#| "begin an element name"
msgid ""
"“%s” is not a valid character following the characters “</”; “%s” may not "
"begin an element name"
msgstr ""
"„%s“ negali būti rašomas po simbolių „</“; „%s“ negali pradėti elemento vardo"
-#: glib/gmarkup.c:1587
+#: glib/gmarkup.c:1599
#, c-format
-#| msgid ""
-#| "'%s' is not a valid character following the close element name '%s'; the "
-#| "allowed character is '>'"
msgid ""
"“%s” is not a valid character following the close element name “%s”; the "
"allowed character is “>”"
@@ -5091,36 +5020,30 @@
"„%s“ negali būti rašomas po uždarančio elemento vardo „%s“; leistinas "
"simbolis yra „>“"
-#: glib/gmarkup.c:1598
+#: glib/gmarkup.c:1610
#, c-format
-#| msgid "Element '%s' was closed, no element is currently open"
msgid "Element “%s” was closed, no element is currently open"
msgstr ""
"Elemento „%s“ uždarymo simbolis sutiktas anksčiau už elemento atidarymo "
"simbolį"
-#: glib/gmarkup.c:1607
+#: glib/gmarkup.c:1619
#, c-format
-#| msgid "Element '%s' was closed, but the currently open element is '%s'"
msgid "Element “%s” was closed, but the currently open element is “%s”"
msgstr ""
"Sutiktas elemento „%s“ uždarymo simbolis, tačiau šiuo metu atidarytas kitas "
"elementas „%s“"
-#: glib/gmarkup.c:1760
+#: glib/gmarkup.c:1772
msgid "Document was empty or contained only whitespace"
msgstr "Dokumentas tuščias arba susideda tik iš tarpų"
-#: glib/gmarkup.c:1774
-#| msgid "Document ended unexpectedly just after an open angle bracket '<'"
+#: glib/gmarkup.c:1786
msgid "Document ended unexpectedly just after an open angle bracket “<”"
msgstr "Dokumentas netikėtai pasibaigė tuoj po atidarančių skliaustų „<“"
-#: glib/gmarkup.c:1782 glib/gmarkup.c:1827
+#: glib/gmarkup.c:1794 glib/gmarkup.c:1839
#, c-format
-#| msgid ""
-#| "Document ended unexpectedly with elements still open - '%s' was the last "
-#| "element opened"
msgid ""
"Document ended unexpectedly with elements still open — “%s” was the last "
"element opened"
@@ -5128,7 +5051,7 @@
"Dokumentas netikėtai pasibaigė neuždarius dalies elementų – „%s“ yra "
"paskutinis atviras elementas"
-#: glib/gmarkup.c:1790
+#: glib/gmarkup.c:1802
#, c-format
msgid ""
"Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -5137,19 +5060,19 @@
"Dokumentas netikėtai pasibaigė, tikėtasi uždarančių skliaustų simbolio, "
"užbaigiančio žymą <%s/>"
-#: glib/gmarkup.c:1796
+#: glib/gmarkup.c:1808
msgid "Document ended unexpectedly inside an element name"
msgstr "Dokumentas netikėtai pasibaigė elemento varde"
-#: glib/gmarkup.c:1802
+#: glib/gmarkup.c:1814
msgid "Document ended unexpectedly inside an attribute name"
msgstr "Dokumentas netikėtai pasibaigė požymio varde"
-#: glib/gmarkup.c:1807
+#: glib/gmarkup.c:1819
msgid "Document ended unexpectedly inside an element-opening tag."
msgstr "Dokumentas netikėtai pasibaigė elemento atvėrimo žyma."
-#: glib/gmarkup.c:1813
+#: glib/gmarkup.c:1825
msgid ""
"Document ended unexpectedly after the equals sign following an attribute "
"name; no attribute value"
@@ -5157,17 +5080,22 @@
"Dokumentas netikėtai pasibaigė lygybės simboliu einančio po požymio vardo; "
"nerasta požymio reikšmė"
-#: glib/gmarkup.c:1820
+#: glib/gmarkup.c:1832
msgid "Document ended unexpectedly while inside an attribute value"
msgstr "Dokumentas netikėtai pasibaigė požymio verte"
-#: glib/gmarkup.c:1836
+#: glib/gmarkup.c:1849
#, c-format
-#| msgid "Document ended unexpectedly inside the close tag for element '%s'"
msgid "Document ended unexpectedly inside the close tag for element “%s”"
msgstr "Dokumentas netikėtai pasibaigė žymos „%s“ uždarančiame simbolyje"
-#: glib/gmarkup.c:1842
+#: glib/gmarkup.c:1853
+#| msgid "Document ended unexpectedly inside the close tag for element “%s”"
+msgid ""
+"Document ended unexpectedly inside the close tag for an unopened element"
+msgstr "Dokumentas netikėtai pasibaigė neatidaryto elemento uždarymo žymoje"
+
+#: glib/gmarkup.c:1859
msgid "Document ended unexpectedly inside a comment or processing instruction"
msgstr ""
"Dokumentas netikėtai pasibaigė komentaruose arba apdorojimo instrukcijose"
@@ -5669,7 +5597,6 @@
#: glib/gspawn.c:1596
#, c-format
-#| msgid "Failed to execute child process “%s” (%s)"
msgid "Failed to spawn child process “%s” (%s)"
msgstr "Nepavyko paleisti antrinio proceso „%s“ (%s)"
