Commit 0251dcdc authored by Jeremy Bicha's avatar Jeremy Bicha

New upstream version 3.32.0

parents 863f8dcf 0e76fa79
......@@ -567,7 +567,7 @@ add_bwrap (GPtrArray *array,
/* fontconfig cache if necessary */
if (!g_str_has_prefix (FONTCONFIG_CACHE_PATH, "/usr/"))
add_args (array, "--ro-bind", FONTCONFIG_CACHE_PATH, FONTCONFIG_CACHE_PATH, NULL);
add_args (array, "--ro-bind-try", FONTCONFIG_CACHE_PATH, FONTCONFIG_CACHE_PATH, NULL);
add_args (array,
"--proc", "/proc",
......
project('gnome-desktop', 'c',
meson_version: '>= 0.47.0',
version: '3.31.91',
version: '3.32.0',
license: ['GPL2+', 'LGPL2+']
)
......
This diff is collapsed.
......@@ -2,43 +2,42 @@
# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Samúel Jón Gunnarsson <sammi@techattack.nu>, 2003.
# Sveinn í Felli <sveinki@nett.is>, 2009, 2015.
# Sveinn í Felli <sveinki@nett.is>, 2009, 2015, 2019.
msgid ""
msgstr ""
"Project-Id-Version: gnome-desktop.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"desktop&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-02-08 07:58+0000\n"
"PO-Revision-Date: 2015-01-29 15:48+0000\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-desktop/issues\n"
"POT-Creation-Date: 2018-09-07 17:29+0000\n"
"PO-Revision-Date: 2019-02-21 08:28+0000\n"
"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
"Language: is\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.5\n"
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../libgnome-desktop/gnome-languages.c:717
#: libgnome-desktop/gnome-languages.c:711
msgid "Unspecified"
msgstr "Óskilgreint"
#: ../libgnome-desktop/gnome-rr-config.c:744
#: libgnome-desktop/gnome-rr-config.c:759
#, c-format
msgid "CRTC %d cannot drive output %s"
msgstr "CRTC skjástýringin %d getur ekki meðhöndlað úttakið á %s"
#: ../libgnome-desktop/gnome-rr-config.c:751
#: libgnome-desktop/gnome-rr-config.c:766
#, c-format
msgid "output %s does not support mode %dx%d@%dHz"
msgstr "úttakið %s styður ekki upplausnina %dx%d@%dHz"
#: ../libgnome-desktop/gnome-rr-config.c:762
#: libgnome-desktop/gnome-rr-config.c:777
#, c-format
msgid "CRTC %d does not support rotation=%d"
msgstr "CRTC skjástýringin %d styður ekki snúninginn rotation=%d"
#: ../libgnome-desktop/gnome-rr-config.c:775
#: libgnome-desktop/gnome-rr-config.c:790
#, c-format
msgid ""
"output %s does not have the same parameters as another cloned output:\n"
......@@ -51,24 +50,24 @@ msgstr ""
"núverandi hnit = (%d, %d), ný hnit = (%d, %d)\n"
"núverandi stefna = %d, ný stefna = %d"
#: ../libgnome-desktop/gnome-rr-config.c:790
#: libgnome-desktop/gnome-rr-config.c:805
#, c-format
msgid "cannot clone to output %s"
msgstr "get ekki klónað úttakið %s"
#: ../libgnome-desktop/gnome-rr-config.c:916
#: libgnome-desktop/gnome-rr-config.c:931
#, c-format
msgid "Trying modes for CRTC %d\n"
msgstr "Prófa upplausnir fyrir CRTC skjástýringuna %d\n"
#: ../libgnome-desktop/gnome-rr-config.c:940
#: libgnome-desktop/gnome-rr-config.c:955
#, c-format
msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
msgstr ""
"CRTC skjástýringin %d: prófa upplausn %dx%d@%dHz með úttak á %dx%d@%dHz "
"(pass %d)\n"
#: ../libgnome-desktop/gnome-rr-config.c:987
#: libgnome-desktop/gnome-rr-config.c:1002
#, c-format
msgid ""
"could not assign CRTCs to outputs:\n"
......@@ -77,7 +76,7 @@ msgstr ""
"gat ekki úthlutað CRTC-um á úttök:\n"
"%s"
#: ../libgnome-desktop/gnome-rr-config.c:991
#: libgnome-desktop/gnome-rr-config.c:1006
#, c-format
msgid ""
"none of the selected modes were compatible with the possible modes:\n"
......@@ -89,7 +88,7 @@ msgstr ""
#. Translators: the "requested", "minimum", and
#. * "maximum" words here are not keywords; please
#. * translate them as usual.
#: ../libgnome-desktop/gnome-rr-config.c:1072
#: libgnome-desktop/gnome-rr-config.c:1087
#, c-format
msgid ""
"required virtual size does not fit available size: requested=(%d, %d), "
......@@ -98,63 +97,95 @@ msgstr ""
"umbeðin sýndarstærð passar ekki: umbeðin stærð=(%d, %d), lágmark=(%d, %d), "
"hámark=(%d, %d)"
#. Translators: This is the time format with full date used
#. in 24-hour mode.
#: ../libgnome-desktop/gnome-wall-clock.c:290
msgid "%a %b %e, %R:%S"
msgstr "%a %e. %b, %R:%S"
#: ../libgnome-desktop/gnome-wall-clock.c:291
msgid "%a %b %e, %R"
msgstr "%a %e. %b, %R"
#. Translators: This is the time format with full date
#. plus day used in 24-hour mode. Please keep the under-
#. score to separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:290
#| msgid "%a %b %e, %R:%S"
msgid "%a %b %-e_%R:%S"
msgstr "%a %e. %b_%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:291
#| msgid "%a %b %e, %R"
msgid "%a %b %-e_%R"
msgstr "%a %e. %b_%R"
#. Translators: This is the time format with full date
#. used in 24-hour mode. Please keep the underscore to
#. separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:296
#| msgid "%a %b %e, %R:%S"
msgid "%b %-e_%R:%S"
msgstr "%e. %b_%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:297
#| msgid "%a %b %e, %R"
msgid "%b %-e_%R"
msgstr "%e. %b_%R"
#. Translators: This is the time format with day used
#. in 24-hour mode.
#: ../libgnome-desktop/gnome-wall-clock.c:295
#: libgnome-desktop/gnome-wall-clock.c:301
msgid "%a %R:%S"
msgstr "%a %R:%S"
#: ../libgnome-desktop/gnome-wall-clock.c:296
#: libgnome-desktop/gnome-wall-clock.c:302
msgid "%a %R"
msgstr "%a %R"
#. Translators: This is the time format without date used
#. in 24-hour mode.
#: ../libgnome-desktop/gnome-wall-clock.c:300
#: libgnome-desktop/gnome-wall-clock.c:306
msgid "%R:%S"
msgstr "%R:%S"
#: ../libgnome-desktop/gnome-wall-clock.c:300
#: libgnome-desktop/gnome-wall-clock.c:306
msgid "%R"
msgstr "%R"
#. Translators: This is a time format with full date used
#. for AM/PM.
#: ../libgnome-desktop/gnome-wall-clock.c:306
msgid "%a %b %e, %l:%M:%S %p"
msgstr "%a %e. %b, %l:%M:%S %p"
#: ../libgnome-desktop/gnome-wall-clock.c:307
msgid "%a %b %e, %l:%M %p"
msgstr "%a %e. %b, %l:%M"
#. Translators: This is a time format with full date
#. plus day used for AM/PM. Please keep the under-
#. score to separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:314
#| msgid "%a %b %e, %l:%M:%S %p"
msgid "%a %b %-e_%l:%M:%S %p"
msgstr "%a %e. %b_%l:%M:%S %p"
#: libgnome-desktop/gnome-wall-clock.c:315
#| msgid "%a %b %e, %l:%M %p"
msgid "%a %b %-e_%l:%M %p"
msgstr "%a %e_%b, %l:%M"
#. Translators: This is a time format with full date
#. used for AM/PM. Please keep the underscore to
#. separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:320
#| msgid "%a %b %e, %l:%M:%S %p"
msgid "%b %-e_%l:%M:%S %p"
msgstr "%e. %b_%l:%M:%S %p"
#: libgnome-desktop/gnome-wall-clock.c:321
#| msgid "%a %b %e, %l:%M %p"
msgid "%b %-e_%l:%M %p"
msgstr "%e. %b_%l:%M"
#. Translators: This is a time format with day used
#. for AM/PM.
#: ../libgnome-desktop/gnome-wall-clock.c:311
#: libgnome-desktop/gnome-wall-clock.c:325
msgid "%a %l:%M:%S %p"
msgstr "%a %l:%M:%S %p"
#: ../libgnome-desktop/gnome-wall-clock.c:312
#: libgnome-desktop/gnome-wall-clock.c:326
msgid "%a %l:%M %p"
msgstr "%a %l:%M"
#. Translators: This is a time format without date used
#. for AM/PM.
#: ../libgnome-desktop/gnome-wall-clock.c:316
#: libgnome-desktop/gnome-wall-clock.c:330
msgid "%l:%M:%S %p"
msgstr "%l:%M:%S %p"
#: ../libgnome-desktop/gnome-wall-clock.c:317
#: libgnome-desktop/gnome-wall-clock.c:331
msgid "%l:%M %p"
msgstr "%H:%M"
......
......@@ -36,7 +36,8 @@ test_utf8_character (const char *utf8_char,
{
GDateTime *datetime;
GnomeWallClock *clock;
const char *save_locale;
locale_t locale;
locale_t save_locale;
const char *str;
/* When testing that UTF8 locales don't use double spaces
......@@ -44,12 +45,10 @@ test_utf8_character (const char *utf8_char,
doesn't contain double spaces ("Aug 1") */
datetime = g_date_time_new_local (2014, 5, 28, 23, 59, 59);
/* Save current locale */
save_locale = setlocale (LC_ALL, NULL);
/* In the C locale, make sure the time string is formatted with regular
* colons */
setlocale (LC_ALL, "C");
locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
save_locale = uselocale (locale);
clock = gnome_wall_clock_new ();
str = gnome_wall_clock_string_for_datetime (clock,
datetime,
......@@ -59,8 +58,9 @@ test_utf8_character (const char *utf8_char,
g_assert (strstr (str, utf8_char) == NULL);
g_object_unref (clock);
/* In a UTF8 locale, we want ratio characters and no colons */
setlocale (LC_ALL, "en_US.utf8");
/* In a UTF8 locale, we want ratio characters and no colons. */
locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
uselocale (locale);
clock = gnome_wall_clock_new ();
str = gnome_wall_clock_string_for_datetime (clock,
datetime,
......@@ -72,7 +72,8 @@ test_utf8_character (const char *utf8_char,
/* ... and same thing with an RTL locale: should be formatted with
* ratio characters */
setlocale (LC_ALL, "he_IL.utf8");
locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
uselocale (locale);
clock = gnome_wall_clock_new ();
str = gnome_wall_clock_string_for_datetime (clock,
datetime,
......@@ -85,7 +86,8 @@ test_utf8_character (const char *utf8_char,
g_date_time_unref (datetime);
/* Restore previous locale */
setlocale (LC_ALL, save_locale);
uselocale (save_locale);
freelocale (locale);
}
static void
......@@ -105,13 +107,13 @@ test_clock_format_setting (void)
{
GnomeWallClock *clock;
GSettings *settings;
const char *save_locale;
locale_t locale;
locale_t save_locale;
const char *str;
/* Save current locale */
save_locale = setlocale (LC_ALL, NULL);
locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0);
save_locale = uselocale (locale);
setlocale (LC_ALL, "en_US.utf8");
settings = g_settings_new ("org.gnome.desktop.interface");
/* In 12h format, the string ends with AM or PM */
......@@ -131,7 +133,8 @@ test_clock_format_setting (void)
g_object_unref (settings);
/* Restore previous locale */
setlocale (LC_ALL, save_locale);
uselocale (save_locale);
freelocale (locale);
}
static gboolean
......@@ -183,13 +186,13 @@ test_weekday_setting (void)
{
GnomeWallClock *clock;
GSettings *settings;
const char *save_locale;
locale_t locale;
locale_t save_locale;
const char *str, *ptr, *s;
/* Save current locale */
save_locale = setlocale (LC_ALL, NULL);
setlocale (LC_ALL, "C");
locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
save_locale = uselocale (locale);
settings = g_settings_new ("org.gnome.desktop.interface");
/* Set 24h format, so that the only alphabetical part will be the weekday */
......@@ -225,7 +228,8 @@ test_weekday_setting (void)
g_object_unref (settings);
/* Restore previous locale */
setlocale (LC_ALL, save_locale);
uselocale (save_locale);
freelocale (locale);
}
int
......
......@@ -438,16 +438,18 @@ test_ui_file (GFile *file,
GtkStyleProvider *provider;
GnomeWallClock *clock;
GDateTime *datetime;
char *str, *set_locale;
char *str;
locale_t loc, previous_locale;
ui_file = g_file_get_path (file);
locale = get_locale_for_file (ui_file);
g_assert (locale);
set_locale = setlocale (LC_ALL, locale);
g_assert_cmpstr (set_locale, ==, locale);
loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
previous_locale = uselocale (loc);
g_assert_true (previous_locale != (locale_t) 0);
clock = gnome_wall_clock_new();
clock = gnome_wall_clock_new ();
datetime = g_date_time_new_local (2014, 5, 28, 23, 59, 59);
str = gnome_wall_clock_string_for_datetime (clock,
datetime,
......@@ -457,6 +459,9 @@ test_ui_file (GFile *file,
g_date_time_unref (datetime);
g_object_unref (clock);
uselocale (previous_locale);
freelocale (loc);
provider = add_extra_css (ui_file, ".css");
ui_image = snapshot_ui_file (ui_file, str);
......@@ -570,13 +575,18 @@ main (int argc, char **argv)
const char *basedir;
GFile *file;
/* unset environment variables that can interfere with our tests */
unsetenv("LANG");
unsetenv("LANGUAGE");
unsetenv("LC_ALL");
unsetenv("LC_TIME");
/* I don't want to fight fuzzy scaling algorithms in GPUs,
* so unless you explicitly set it to something else, we
* will use Cairo's image surface.
*/
g_setenv ("GDK_RENDERING", "image", FALSE);
setlocale (LC_ALL, "");
g_test_init (&argc, &argv, NULL);
gtk_init (&argc, &argv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment