Merge branch 'master' of https://gitlab.gnome.org/GNOME/gnome-desktop

1 files changed, 71 insertions, 57 deletions

diff --git a/po/eo.po b/po/eo.po
index 15cd70e5..624bcdd9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,50 +5,45 @@
 # Guillaume SAVATON <llumeao@tuxfamily.org>, 2006.
 # Michael MORONI < >, 2011.
 # Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011, 2017.
+# Carmen Bianca BAKKER <carmen@carmenbianca.eu>, 2018.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop 2.3.6.1\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-27 19:50+0000\n"
-"PO-Revision-Date: 2017-06-11 03:30+0200\n"
-"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\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: 2018-10-15 14:33+0200\n"
+"Last-Translator: Carmen Bianca BAKKER <carmen@carmenbianca.eu>\n"
 "Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.1.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../libgnome-desktop/gnome-languages.c:713
+#: libgnome-desktop/gnome-languages.c:711
 msgid "Unspecified"
-msgstr "Nedefinite"
+msgstr "Nedifinita"
 
-#: ../libgnome-desktop/gnome-rr-config.c:757
+#: libgnome-desktop/gnome-rr-config.c:759
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d ne subtenas la eligon %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:764
+#: libgnome-desktop/gnome-rr-config.c:766
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "eligo %s ne subtenas la reĝimon %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:775
+#: libgnome-desktop/gnome-rr-config.c:777
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
 msgid "CRTC %d does not support rotation=%d"
 msgstr "CRTC %d ne subtenas rotacion=%d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:788
+#: libgnome-desktop/gnome-rr-config.c:790
 #, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
@@ -60,22 +55,22 @@ msgstr ""
 "ekztistantaj koordinatoj = (%d, %d), novaj koordinatoj = (%d, %d)\n"
 "ekztistanta rotacio = %d, nova rotacio = %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:803
+#: libgnome-desktop/gnome-rr-config.c:805
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ne eblas kloni al eligo %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:929
+#: libgnome-desktop/gnome-rr-config.c:931
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Provreĝimoj por CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:953
+#: 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 %d: provreĝimo %dx%d@%dHz kun eligo ĉe %dx%d@%dHz (paso %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1000
+#: libgnome-desktop/gnome-rr-config.c:1002
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -84,7 +79,7 @@ msgstr ""
 "ne eblis atribui CRTC-ojn al eligoj:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1004
+#: libgnome-desktop/gnome-rr-config.c:1006
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -96,7 +91,7 @@ msgstr ""
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1085
+#: libgnome-desktop/gnome-rr-config.c:1087
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -105,70 +100,89 @@ msgstr ""
 "bezonata virtuala grando ne kongruas al havebla grando: petita=(%d, %d), "
 "minimumo=(%d, %d), maksimumo=(%d, %d)"
 
-#. Translators: This is the time format with full date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:299
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e. %b, %R:%S"
+#. 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"
+msgstr "%a %-e-a de %b_%R:%S"
+
+#: libgnome-desktop/gnome-wall-clock.c:291
+msgid "%a %b %-e_%R"
+msgstr "%a %-e-a de %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 "%b %-e_%R:%S"
+msgstr "%-e-a de %b_%R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:300
-msgid "%a %b %e, %R"
-msgstr "%a, %e. %b, %R"
+#: libgnome-desktop/gnome-wall-clock.c:297
+msgid "%b %-e_%R"
+msgstr "%-e-a de %b_%R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:304
+#: libgnome-desktop/gnome-wall-clock.c:301
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:305
+#: 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:309
-#| msgid "%a %R:%S"
+#: libgnome-desktop/gnome-wall-clock.c:306
 msgid "%R:%S"
 msgstr "%R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:309
+#: 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:315
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e. %b, %l:%M:%S"
+#. 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"
+msgstr "%a %-e-a de %b_%l:%M:%S %p"
+
+#: libgnome-desktop/gnome-wall-clock.c:315
+msgid "%a %b %-e_%l:%M %p"
+msgstr "%a %-e-a de %b_%l:%M %p"
+
+#. 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 "%b %-e_%l:%M:%S %p"
+msgstr "%-e-a de %b_%l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:316
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e. %b, %l:%M"
+#: libgnome-desktop/gnome-wall-clock.c:321
+msgid "%b %-e_%l:%M %p"
+msgstr "%-e-a de %b_%l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:320
+#: libgnome-desktop/gnome-wall-clock.c:325
 msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S"
+msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:321
+#: libgnome-desktop/gnome-wall-clock.c:326
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M"
+msgstr "%a %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:325
-#, fuzzy
-#| msgid "%a %l:%M:%S %p"
+#: libgnome-desktop/gnome-wall-clock.c:330
 msgid "%l:%M:%S %p"
-msgstr "%a %l:%M:%S"
+msgstr "%l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:326
-#, fuzzy
-#| msgid "%a %l:%M %p"
+#: libgnome-desktop/gnome-wall-clock.c:331
 msgid "%l:%M %p"
-msgstr "%a %l:%M"
+msgstr "%l:%M %p"
 
 #~ msgctxt "Monitor vendor"
 #~ msgid "Unknown"