summaryrefslogtreecommitdiff
path: root/debian/po/eu.po
diff options
context:
space:
mode:
Diffstat (limited to 'debian/po/eu.po')
-rw-r--r--debian/po/eu.po29
1 files changed, 23 insertions, 6 deletions
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 16da34f..cd0c28e 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ucf_3.0024_eu\n"
"Report-Msgid-Bugs-To: ucf@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-07 01:28-0700\n"
+"POT-Creation-Date: 2018-02-16 15:56-0800\n"
"PO-Revision-Date: 2014-05-07 12:11+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
"Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -72,8 +72,10 @@ msgstr "erakutsi bertsioen arteko desberdintasunak 3-moduan"
#. Choices
#. Translators, please keep translations *short* (less than 65 columns)
#: ../templates:3001
-msgid "do a 3-way merge between available versions (experimental)"
-msgstr "egin bertsio eskuragarrien 3-moduko batura (esperimentala)"
+#, fuzzy
+#| msgid "show a 3-way difference between available versions"
+msgid "do a 3-way merge between available versions"
+msgstr "erakutsi bertsioen arteko desberdintasunak 3-moduan"
#. Type: select
#. Choices
@@ -95,9 +97,7 @@ msgstr ""
#. Type: select
#. Description
-#. Type: select
-#. Description
-#: ../templates:3002 ../templates:4002
+#: ../templates:3002
msgid ""
"A new version (${NEW}) of configuration file ${FILE} is available, but the "
"version installed currently has been locally modified."
@@ -105,6 +105,20 @@ msgstr ""
"${FILE} konfigurazioko fitxategiaren bertsio berri bat (${NEW}) dago "
"eskuragarri, baina instalatutako bertsioa lokalki aldatua izan da."
+#. Type: select
+#. Description
+#: ../templates:4002
+#, fuzzy
+#| msgid ""
+#| "A new version (${NEW}) of configuration file ${FILE} is available, but "
+#| "the version installed currently has been locally modified."
+msgid ""
+"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is "
+"available, but the version installed currently has been locally modified."
+msgstr ""
+"${FILE} konfigurazioko fitxategiaren bertsio berri bat (${NEW}) dago "
+"eskuragarri, baina instalatutako bertsioa lokalki aldatua izan da."
+
#. Type: note
#. Description
#: ../templates:5001
@@ -137,6 +151,9 @@ msgstr ""
"'${dest_file}.${ERR_SUFFIX}' fitxategiak erregistro bat du konfigurazioko "
"fitxategiak batzean huts egin duten sarrerekin."
+#~ msgid "do a 3-way merge between available versions (experimental)"
+#~ msgstr "egin bertsio eskuragarrien 3-moduko batura (esperimentala)"
+
#~ msgid ""
#~ "A new version of configuration file ${FILE} is available, but the version "
#~ "installed currently has been locally modified."