diff options
Diffstat (limited to 'debian/po/sk.po')
-rw-r--r-- | debian/po/sk.po | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/debian/po/sk.po b/debian/po/sk.po index 852dc0b..00b1af7 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf 3.0028\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-09 18:58+0200\n" "Last-Translator: Slavko <linux@slavino.sk>\n" "Language-Team: slovenčina <linux@slavino.sk>\n" @@ -72,8 +72,10 @@ msgstr "zobraziť trojcestný rozdiel medzi dostupnými verziami" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "urobiť trojcestné zlúčenie dostupných verzií (experimentálne)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "zobraziť trojcestný rozdiel medzi dostupnými verziami" #. Type: select #. Choices @@ -94,9 +96,7 @@ msgstr "Čo chcete urobiť so zmeneným konfiguračným súborom ${BASENAME}?" #. 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." @@ -104,6 +104,20 @@ msgstr "" "Je dostupná nová verzia (${NEW}) konfiguračného súboru ${FILE}, ale aktuálne " "nainštalovaná verzia bola lokálne upravená." +#. 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 "" +"Je dostupná nová verzia (${NEW}) konfiguračného súboru ${FILE}, ale aktuálne " +"nainštalovaná verzia bola lokálne upravená." + #. Type: note #. Description #: ../templates:5001 @@ -136,6 +150,9 @@ msgstr "" "Súbor „${dest_file}.${ERR_SUFFIX}” má záznam o neúspešnom zlúčení " "konfiguračného súboru." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "urobiť trojcestné zlúčenie dostupných verzií (experimentálne)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." |