diff options
| -rw-r--r-- | debian/changelog | 23 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/po/ca.po | 30 | ||||
| -rw-r--r-- | debian/po/cs.po | 29 | ||||
| -rw-r--r-- | debian/po/da.po | 31 | ||||
| -rw-r--r-- | debian/po/de.po | 28 | ||||
| -rw-r--r-- | debian/po/es.po | 29 | ||||
| -rw-r--r-- | debian/po/eu.po | 29 | ||||
| -rw-r--r-- | debian/po/fi.po | 29 | ||||
| -rw-r--r-- | debian/po/fr.po | 29 | ||||
| -rw-r--r-- | debian/po/gl.po | 29 | ||||
| -rw-r--r-- | debian/po/it.po | 29 | ||||
| -rw-r--r-- | debian/po/ja.po | 33 | ||||
| -rw-r--r-- | debian/po/nl.po | 30 | ||||
| -rw-r--r-- | debian/po/pl.po | 29 | ||||
| -rw-r--r-- | debian/po/pt.po | 32 | ||||
| -rw-r--r-- | debian/po/pt_BR.po | 29 | ||||
| -rw-r--r-- | debian/po/ru.po | 29 | ||||
| -rw-r--r-- | debian/po/sk.po | 29 | ||||
| -rw-r--r-- | debian/po/sv.po | 29 | ||||
| -rw-r--r-- | debian/po/templates.pot | 18 | ||||
| -rw-r--r-- | debian/po/vi.po | 35 | ||||
| -rw-r--r-- | debian/templates | 4 | ||||
| -rw-r--r-- | examples/postinst | 4 | ||||
| -rwxr-xr-x | ucf | 8 | ||||
| -rw-r--r-- | ucf.1 | 17 | ||||
| -rw-r--r-- | ucfr.1 | 6 |
29 files changed, 501 insertions, 163 deletions
diff --git a/debian/changelog b/debian/changelog index 498495b..5d731ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +ucf (3.0037) unstable; urgency=medium + + * A new bugfixing release. + * Bug fix: "Typo in ucfr(1)", thanks to Carsten Leonhardt (Closes: + #835171). + * Bug fix: "[PATCH] diffs are rendered with broken spacing", thanks to + Dima Kogan (Closes: #862607). + * Bug fix: "offers 3-way merge even without --three-way option", thanks + to Marc Haber (Closes: #879558). + * Bug fix: "Corrupt its database if root's bashrc has GREP_OPTIONS + env", thanks to Adam Cecile <adam.cecile@hitec.lu> (Closes: + #845625). + * Bug fix: "please consider removing the experimental tag from + --three-way", thanks to Marc Haber (Closes: #879641). + * Bug fix: "manpage ucf(1) refers ancient releases", thanks to Marc + Haber (Closes: #878891). + * Bug fix: "Bad UI on prompts", thanks to Peter Palfrader (Closes: + #870474). We already had a title that mentioned the conffile + name. Added it to the beginning of the running text as well. If the + title is not displayed, then the denconf frontend should be improved. + + -- Manoj Srivastava <srivasta@debian.org> Fri, 16 Feb 2018 16:07:03 -0800 + ucf (3.0036) unstable; urgency=low * Incorporate enhancement from Robert Luberda <robert@debian.org> diff --git a/debian/compat b/debian/compat index ec63514..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +11 diff --git a/debian/control b/debian/control index 08df212..d1dfd7d 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,17 @@ Source: ucf -VCS-Git: git://anonscm.debian.org/users/srivasta/debian/ucf.git -VCS-Browser: http://anonscm.debian.org/gitweb/?p=users/srivasta/debian/ucf.git +VCS-Git: https://anonscm.debian.org/users/srivasta/debian/ucf.git +VCS-Browser: https://anonscm.debian.org/gitweb/?p=users/srivasta/debian/ucf.git Section: utils Priority: standard Maintainer: Manoj Srivastava <srivasta@debian.org> -Build-Depends-Indep: po-debconf, gettext, debhelper (>= 9.0.0) -Standards-Version: 3.9.7 +Build-Depends-Indep: po-debconf, gettext, debhelper (>= 11) +Standards-Version: 4.1.3 Package: ucf Architecture: all Multi-Arch: foreign -Depends: debconf (>= 1.5.19), coreutils (>= 5.91), ${misc:Depends} +Depends: debconf (>= 1.5.19), coreutils (>= 5.91), ${misc:Depends}, + sensible-utils Description: Update Configuration File(s): preserve user changes to config files Debian policy mandates that user changes to configuration files must be preserved during package upgrades. The easy way to achieve this behavior diff --git a/debian/copyright b/debian/copyright index 8f41fc7..59d7534 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ucf Upstream-Contact: Manoj Srivastava <srivasta@debian.org> -Source: git://anonscm.debian.org/users/srivasta/debian/ucf.git +Source: https://anonscm.debian.org/users/srivasta/debian/ucf.git Copyright: 2002, 2003, 2003, 2004, 2005, 2006, 2015 Manoj Srivastava <srivasta@debian.org> License: GPL-2 diff --git a/debian/po/ca.po b/debian/po/ca.po index 5f63ff3..2cda460 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf 3.0025+nmu1\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: 2010-07-07 09:53+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -69,8 +69,10 @@ msgstr "mostra les diferències a 3 bandes entre les versions" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "fes una fusió a 3 bandes entre les versions disponibles (experimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "mostra les diferències a 3 bandes entre les versions" #. Type: select #. Choices @@ -92,9 +94,7 @@ msgstr "" #. Type: select #. Description -#. Type: select -#. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:3002 #, fuzzy #| msgid "" #| "A new version of configuration file ${FILE} is available, but the version " @@ -106,6 +106,20 @@ msgstr "" "Hi ha una nova versió del fitxer de configuració ${FILE}, però la vostra " "versió s'ha modificat localment." +#. Type: select +#. Description +#: ../templates:4002 +#, fuzzy +#| msgid "" +#| "A new version 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 "" +"Hi ha una nova versió del fitxer de configuració ${FILE}, però la vostra " +"versió s'ha modificat localment." + #. Type: note #. Description #: ../templates:5001 @@ -138,6 +152,10 @@ msgstr "" "El fitxer «${dest_file}.${ERR_SUFFIX}» té un registre de la fusió fallida " "del fitxer de configuració." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "" +#~ "fes una fusió a 3 bandes entre les versions disponibles (experimental)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/cs.po b/debian/po/cs.po index 707db1e..9809f53 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf\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-16 17:47+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -77,8 +77,10 @@ msgstr "zobrazit třícestný rozdíl mezi dostupnými verzemi" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "provést třícestné sloučení dostupných verzí (experimentální)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "zobrazit třícestný rozdíl mezi dostupnými verzemi" #. Type: select #. Choices @@ -99,9 +101,7 @@ msgstr "Co chcete provést se změněným konfiguračním souborem ${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." @@ -109,6 +109,20 @@ msgstr "" "K dispozici je novější verze (${NEW}) konfiguračního souboru ${FILE}, avšak " "nainstalovaná verze obsahuje lokální úpravy." +#. 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 "" +"K dispozici je novější verze (${NEW}) konfiguračního souboru ${FILE}, avšak " +"nainstalovaná verze obsahuje lokální úpravy." + #. Type: note #. Description #: ../templates:5001 @@ -141,6 +155,9 @@ msgstr "" "Soubor „${dest_file}.${ERR_SUFFIX}“ obsahuje záznam nepodařeného sloučení " "konfiguračního souboru." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "provést třícestné sloučení dostupných verzí (experimentální)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/da.po b/debian/po/da.po index 403ca0b..ba3fc19 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf debconf template\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-08 17:34+0000\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -73,9 +73,10 @@ msgstr "vis 3-vejs forskelle mellem de tilgængelige udgaver af filen" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "" -"udfør en 3-vejs fletning mellem tilgængelige versioner (eksperimentelt)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "vis 3-vejs forskelle mellem de tilgængelige udgaver af filen" #. Type: select #. Choices @@ -96,9 +97,7 @@ msgstr "Hvad vil du gøre med ændret opsætningsfil ${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." @@ -106,6 +105,20 @@ msgstr "" "En ny version (${NEW}) af opsætningsfilen ${FILE} er tilgængelig, men den " "installerede version er blevet ændret lokalt." +#. 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 "" +"En ny version (${NEW}) af opsætningsfilen ${FILE} er tilgængelig, men den " +"installerede version er blevet ændret lokalt." + #. Type: note #. Description #: ../templates:5001 @@ -138,4 +151,6 @@ msgstr "" "Filen `${dest_file}.${ERR_SUFFIX}' har en post over den mislykkede " "sammenføjning af opsætningsfilen." - +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "" +#~ "udfør en 3-vejs fletning mellem tilgængelige versioner (eksperimentelt)" diff --git a/debian/po/de.po b/debian/po/de.po index 6ee3d22..c819d50 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -16,7 +16,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-22 20:42+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -78,8 +78,10 @@ msgstr "3-Wege-Unterschiede verfügbarer Versionen anzeigen" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "3-Wege-Vereinigung verfügbarer Versionen [experimentell]" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "3-Wege-Unterschiede verfügbarer Versionen anzeigen" #. Type: select #. Choices @@ -101,9 +103,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." @@ -111,6 +111,20 @@ msgstr "" "Eine neue Version (${NEW}) der Konfigurationsdatei ${FILE} ist verfügbar, " "aber die installierte Version wurde verändert." +#. 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 "" +"Eine neue Version (${NEW}) der Konfigurationsdatei ${FILE} ist verfügbar, " +"aber die installierte Version wurde verändert." + #. Type: note #. Description #: ../templates:5001 @@ -143,3 +157,5 @@ msgstr "" "Die Datei »${dest_file}.${ERR_SUFFIX}« enthält eine Aufzeichnung der " "fehlgeschlagenen Vereinigung der Konfigurationsdateien." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "3-Wege-Vereinigung verfügbarer Versionen [experimentell]" diff --git a/debian/po/es.po b/debian/po/es.po index 3bba235..2d7f3f4 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -31,7 +31,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf 3.0025\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-06-13 21:05-0300\n" "Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -93,8 +93,10 @@ msgstr "comparar a tres bandas las versiones disponibles" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "fusionar a tres bandas las versiones disponibles (experimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "comparar a tres bandas las versiones disponibles" #. Type: select #. Choices @@ -116,9 +118,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." @@ -126,6 +126,20 @@ msgstr "" "Hay una nueva versión («${NEW}») del archivo de configuración «${FILE}» , " "pero la versión que está instalada ha sido modificada localmente." +#. 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 "" +"Hay una nueva versión («${NEW}») del archivo de configuración «${FILE}» , " +"pero la versión que está instalada ha sido modificada localmente." + #. Type: note #. Description #: ../templates:5001 @@ -158,6 +172,9 @@ msgstr "" "El archivo «${dest_file}.${ERR_SUFFIX}» tiene un registro del fallo de " "fusión del archivo de configuración." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "fusionar a tres bandas las versiones disponibles (experimental)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." 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." diff --git a/debian/po/fi.po b/debian/po/fi.po index 00efd65..2f89a49 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf_3.003\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 18:38+0200\n" "Last-Translator: Esko Arajärvi <edu@iki.fi>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -67,8 +67,10 @@ msgstr "Näytä versioiden välinen kolmisuuntainen erotus" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "Tee kolmisuuntainen versioiden yhdistys (kokeellinen)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "Näytä versioiden välinen kolmisuuntainen erotus" #. Type: select #. Choices @@ -89,9 +91,7 @@ msgstr "Miten muokattu asetustiedosto ${BASENAME} käsitellään?" #. 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." @@ -99,6 +99,20 @@ msgstr "" "Asetustiedostosta ${FILE} on tarjolla uusi versio (${NEW}), mutta nykyistä " "versiota on muokattu paikallisesti." +#. 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 "" +"Asetustiedostosta ${FILE} on tarjolla uusi versio (${NEW}), mutta nykyistä " +"versiota on muokattu paikallisesti." + #. Type: note #. Description #: ../templates:5001 @@ -131,6 +145,9 @@ msgstr "" "Tiedostossa ”${dest_file}.${ERR_SUFFIX}” on tiedot asetustiedoston " "epäonnistuneesta yhdistämisestä." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "Tee kolmisuuntainen versioiden yhdistys (kokeellinen)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/fr.po b/debian/po/fr.po index 19d3f21..5bc12c5 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\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 13:44+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -74,8 +74,10 @@ msgstr "Montrer les différences entre les trois versions du fichier" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "Fusionner les trois versions (« 3-way merge » : expérimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "Montrer les différences entre les trois versions du fichier" #. Type: select #. Choices @@ -97,9 +99,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." @@ -107,6 +107,20 @@ msgstr "" "Une nouvelle version (${NEW}) du fichier de configuration ${FILE} est " "disponible mais la version actuellement utilisée a été modifiée localement." +#. 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 "" +"Une nouvelle version (${NEW}) du fichier de configuration ${FILE} est " +"disponible mais la version actuellement utilisée a été modifiée localement." + #. Type: note #. Description #: ../templates:5001 @@ -139,6 +153,9 @@ msgstr "" "Le fichier « ${dest_file}.${ERR_SUFFIX} » contient une trace de la fusion " "qui a échoué." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "Fusionner les trois versions (« 3-way merge » : expérimental)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/gl.po b/debian/po/gl.po index bb7e1de..323dbfd 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf\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: 2009-11-05 20:38+0100\n" "Last-Translator: Marce Villarino <mvillarino@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -71,8 +71,10 @@ msgstr "mostrar unha diferenza a tres entre as versións dispoñíbeis" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "fusionar a tres as versións dispoñibles (experimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "mostrar unha diferenza a tres entre as versións dispoñíbeis" #. Type: select #. Choices @@ -93,9 +95,7 @@ msgstr "Que desexa facer co ficheiro de configuración modificado ${BASENAME}?" #. Type: select #. Description -#. Type: select -#. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:3002 #, fuzzy #| msgid "" #| "A new version of configuration file ${FILE} is available, but the version " @@ -107,6 +107,20 @@ msgstr "" "Hai dispoñíbel unha nova versión do ficheiro de configuración ${FILE}, pero " "a versión actualmente instalada ten modificacións locais." +#. Type: select +#. Description +#: ../templates:4002 +#, fuzzy +#| msgid "" +#| "A new version 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 "" +"Hai dispoñíbel unha nova versión do ficheiro de configuración ${FILE}, pero " +"a versión actualmente instalada ten modificacións locais." + #. Type: note #. Description #: ../templates:5001 @@ -139,6 +153,9 @@ msgstr "" "O ficheiro «${dest_file}.{ERR_SUFFIX}» contén un rexistro da fusión " "fracasada do ficheiro de configuración." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "fusionar a tres as versións dispoñibles (experimental)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/it.po b/debian/po/it.po index 3a45a26..a51d7ef 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf_1.18_templates\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: 2007-09-19 01:10-0500\n" "Last-Translator: Luca Bruno <lucab@debian.org>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -66,8 +66,10 @@ msgstr "mostrare le differenze tra le 3 versioni del file disponibili" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "integrare le differenze tra le 3 versioni (sperimentale)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "mostrare le differenze tra le 3 versioni del file disponibili" #. Type: select #. Choices @@ -88,9 +90,7 @@ msgstr "Cosa si vuol fare del file di configurazione modificato ${BASENAME}?" #. Type: select #. Description -#. Type: select -#. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:3002 #, fuzzy #| msgid "" #| "A new version of configuration file ${FILE} is available, but the version " @@ -102,6 +102,20 @@ msgstr "" "Una nuova versione del file di configurazione ${FILE} è disponibile, ma la " "propria versione è stata modificata localmente." +#. Type: select +#. Description +#: ../templates:4002 +#, fuzzy +#| msgid "" +#| "A new version 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 "" +"Una nuova versione del file di configurazione ${FILE} è disponibile, ma la " +"propria versione è stata modificata localmente." + #. Type: note #. Description #: ../templates:5001 @@ -134,6 +148,9 @@ msgstr "" "Il file «${dest_file}.${ERR_SUFFIX}» contiene il resoconto della tentata " "integrazione del file di configurazione." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "integrare le differenze tra le 3 versioni (sperimentale)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/ja.po b/debian/po/ja.po index d64171e..2ca507b 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf\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-08 08:47+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -77,8 +77,10 @@ msgstr "利用可能なバージョン間の 3 ウェイ差分を表示" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "利用可能なバージョン間での 3 ウェイマージを行う (実験的)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "利用可能なバージョン間の 3 ウェイ差分を表示" #. Type: select #. Choices @@ -99,13 +101,27 @@ msgstr "変更された設定ファイル ${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." -msgstr "設定ファイル ${FILE} の新しいバージョン (${NEW}) が利用可能ですが、現在インストールされているバージョンは、ローカルで変更されています。" +msgstr "" +"設定ファイル ${FILE} の新しいバージョン (${NEW}) が利用可能ですが、現在イン" +"ストールされているバージョンは、ローカルで変更されています。" + +#. 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} の新しいバージョン (${NEW}) が利用可能ですが、現在イン" +"ストールされているバージョンは、ローカルで変更されています。" #. Type: note #. Description @@ -138,3 +154,6 @@ msgid "" msgstr "" "ファイル `${dest_file}.${ERR_SUFFIX}' に設定ファイルのマージに失敗した記録が" "保持されています。" + +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "利用可能なバージョン間での 3 ウェイマージを行う (実験的)" diff --git a/debian/po/nl.po b/debian/po/nl.po index fd6304a..b2c032c 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf_3.0031\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: 2016-01-12 23:14+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -73,8 +73,10 @@ msgstr "toon een 3-voudig verschil tussen de beschikbare versies" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "een 3-voudige samenvoeging tussen beschikbare versies (testfase)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "toon een 3-voudig verschil tussen de beschikbare versies" #. Type: select #. Choices @@ -95,15 +97,24 @@ msgstr "Wat wilt u met het aangepaste configuratiebestand ${BASENAME} doen?" #. Type: select #. Description +#: ../templates:3002 +msgid "" +"A new version (${NEW}) of configuration file ${FILE} is available, but the " +"version installed currently has been locally modified." +msgstr "" +"Een nieuwe versie (${NEW}) van het configuratiebestand ${FILE} is " +"beschikbaar, maar de geïnstalleerde versie is lokaal gewijzigd." + #. Type: select #. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:4002 +#, fuzzy #| msgid "" -#| "A new version of configuration file ${FILE} is available, but the version " -#| "installed currently has been locally modified." +#| "A new version (${NEW}) of configuration file ${FILE} is available, but " +#| "the version installed currently has been locally modified." msgid "" -"A new version (${NEW}) of configuration file ${FILE} is available, but the " -"version installed currently has been locally modified." +"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " +"available, but the version installed currently has been locally modified." msgstr "" "Een nieuwe versie (${NEW}) van het configuratiebestand ${FILE} is " "beschikbaar, maar de geïnstalleerde versie is lokaal gewijzigd." @@ -140,6 +151,9 @@ msgstr "" "Het bestand `${dest_file}.${ERR_SUFFIX}' bevat een verslag van de mislukte " "samenvoeging van het configuratiebestand." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "een 3-voudige samenvoeging tussen beschikbare versies (testfase)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/pl.po b/debian/po/pl.po index 8aacef3..ee32fbb 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf3002\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-10 16:20+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -82,8 +82,10 @@ msgstr "pokazanie różnic pomiędzy trzema dostępnymi wersjami" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "scalenie zmian pomiędzy 3 dostępnymi wersjami (eksperymentalne)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "pokazanie różnic pomiędzy trzema dostępnymi wersjami" #. Type: select #. Choices @@ -105,9 +107,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." @@ -115,6 +115,20 @@ msgstr "" "Dostępna jest nowa wersja (${NEW}) pliku konfiguracyjnego ${FILE}, ale " "obecna wersja została lokalnie zmodyfikowana." +#. 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 "" +"Dostępna jest nowa wersja (${NEW}) pliku konfiguracyjnego ${FILE}, ale " +"obecna wersja została lokalnie zmodyfikowana." + #. Type: note #. Description #: ../templates:5001 @@ -147,6 +161,9 @@ msgstr "" "Plik \"${dest_file}.${ERR_SUFFIX}\" posiada wpis o niepoprawnym scalaniu " "pliku konfiguracyjnego." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "scalenie zmian pomiędzy 3 dostępnymi wersjami (eksperymentalne)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/pt.po b/debian/po/pt.po index 85de385..2d84927 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -10,7 +10,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-07 13:06+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -74,10 +74,10 @@ msgstr "mostrar uma diferença em 3 vias entre as versões disponíveis" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "" -"fazer uma fusão em 3 vias entre versões disponíveis do ficheiro " -"(experimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "mostrar uma diferença em 3 vias entre as versões disponíveis" #. Type: select #. Choices @@ -99,9 +99,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." @@ -109,6 +107,20 @@ msgstr "" "Está disponível nova versão (${NEW}) do ficheiro de configuração ${FILE}, " "mas a versão actualmente instalada foi modificada localmente." +#. 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 "" +"Está disponível nova versão (${NEW}) do ficheiro de configuração ${FILE}, " +"mas a versão actualmente instalada foi modificada localmente." + #. Type: note #. Description #: ../templates:5001 @@ -141,3 +153,7 @@ msgstr "" "O ficheiro '${dest_file}.${ERR_SUFFIX}' tem um registo da fusão falhada do " "ficheiro de configuração." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "" +#~ "fazer uma fusão em 3 vias entre versões disponíveis do ficheiro " +#~ "(experimental)" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 7d136d8..421ad47 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf\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-14 23:25-0300\n" "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -71,8 +71,10 @@ msgstr "exibir as diferenças entre as 3 versões disponíveis" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "juntar as 3 versões disponíveis (experimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "exibir as diferenças entre as 3 versões disponíveis" #. Type: select #. Choices @@ -94,9 +96,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." @@ -104,6 +104,20 @@ msgstr "" "Uma nova versão (${NEW}) do arquivo de configuração ${FILE} está disponível, " "mas a versão atualmente instalada foi modificada localmente." +#. 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 "" +"Uma nova versão (${NEW}) do arquivo de configuração ${FILE} está disponível, " +"mas a versão atualmente instalada foi modificada localmente." + #. Type: note #. Description #: ../templates:5001 @@ -136,6 +150,9 @@ msgstr "" "O arquivo '${dest_file}.${ERR_SUFFIX}' contém um registro da falha na junção " "do arquivo de configuração." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "juntar as 3 versões disponíveis (experimental)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/ru.po b/debian/po/ru.po index 45bb625..b958216 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.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-07 19:10+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -73,8 +73,10 @@ msgstr "показать 3-x стороннее различие между до #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "3-x стороннее слияние доступных версий (эксперимен. режим)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "показать 3-x стороннее различие между доступными версиями" #. 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 "" "Доступна новая версия (${NEW}) файла настройки ${FILE}, но версия файла, " "находящаяся в системе, была изменёна локально." +#. 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 "" +"Доступна новая версия (${NEW}) файла настройки ${FILE}, но версия файла, " +"находящаяся в системе, была изменёна локально." + #. Type: note #. Description #: ../templates:5001 @@ -137,6 +151,9 @@ msgstr "" "Файл `${dest_file}.${ERR_SUFFIX}' содержит элементы, которые не дают " "объединить файлы настройки." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "3-x стороннее слияние доступных версий (эксперимен. режим)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." 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." diff --git a/debian/po/sv.po b/debian/po/sv.po index 4ca5fc6..d73d55b 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf 2.002\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 11:12+0100\n" "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" @@ -71,8 +71,10 @@ msgstr "visa en 3-vägs skillnad mellan tillgängliga versioner" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "gör en 3-vägs sammanslagning mellan versionerna (experimentell)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "visa en 3-vägs skillnad mellan tillgängliga versioner" #. Type: select #. Choices @@ -93,9 +95,7 @@ msgstr "Vad vill du göra med den uppdaterade filen ${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." @@ -103,6 +103,20 @@ msgstr "" "En ny version (${NEW}) av konfigurationsfilen ${FILE} finns tillgänglig, men " "versionen som är installerad har ändrats lokalt." +#. 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 "" +"En ny version (${NEW}) av konfigurationsfilen ${FILE} finns tillgänglig, men " +"versionen som är installerad har ändrats lokalt." + #. Type: note #. Description #: ../templates:5001 @@ -135,6 +149,9 @@ msgstr "" "Filen \"${dest_file}.${ERR_SUFFIX}\" innehåller en notering av den " "misslyckade sammanslagningen av inställningsfilerna." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "gör en 3-vägs sammanslagning mellan versionerna (experimentell)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index f53c455..79ecfb5 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the ucf package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -70,7 +70,7 @@ msgstr "" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" +msgid "do a 3-way merge between available versions" msgstr "" #. Type: select @@ -92,14 +92,20 @@ 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." msgstr "" +#. Type: select +#. Description +#: ../templates:4002 +msgid "" +"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " +"available, but the version installed currently has been locally modified." +msgstr "" + #. Type: note #. Description #: ../templates:5001 diff --git a/debian/po/vi.po b/debian/po/vi.po index 02e8742..8d18a35 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf 3.0023\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: 2009-10-14 19:51+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -66,14 +66,14 @@ msgstr "hiển thị khác biệt cạnh nhau giữa những phiên bản" msgid "show a 3-way difference between available versions" msgstr "hiển thị khác biệt ba hướng giữa những phiên bản sẵn sàng" -# do a 3 way merge between available versions of the file [Very -# Experimental] #. Type: select #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "hoà trộn ba hướng những phiên bản sẵn sàng (vẫn thực nghiệm)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "hiển thị khác biệt ba hướng giữa những phiên bản sẵn sàng" #. Type: select #. Choices @@ -96,9 +96,7 @@ msgstr "Đối với tập tin cấu hình bị sửa đổi ${BASENAME} muốn # version has been locally modified. #. Type: select #. Description -#. Type: select -#. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:3002 #, fuzzy #| msgid "" #| "A new version of configuration file ${FILE} is available, but the version " @@ -110,6 +108,22 @@ msgstr "" "Có sẵn một phiên bản mới của tập tin cấu hình ${FILE}, nhưng phiên bản được " "cài đặt hiện thời đã bị sửa đổi cục bộ." +# A new version of configuration file ${FILE} is available, but your +# version has been locally modified. +#. Type: select +#. Description +#: ../templates:4002 +#, fuzzy +#| msgid "" +#| "A new version 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 "" +"Có sẵn một phiên bản mới của tập tin cấu hình ${FILE}, nhưng phiên bản được " +"cài đặt hiện thời đã bị sửa đổi cục bộ." + #. Type: note #. Description #: ../templates:5001 @@ -142,6 +156,11 @@ msgstr "" "Tập tin đích « ${dest_file}.${ERR_SUFFIX} » đã ghi lưu tiến trình hoà trộn " "bị lỗi của tập tin cấu hình." +# do a 3 way merge between available versions of the file [Very +# Experimental] +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "hoà trộn ba hướng những phiên bản sẵn sàng (vẫn thực nghiệm)" + # A new version of configuration file ${FILE} is available, but your # version has been locally modified. #~ msgid "" diff --git a/debian/templates b/debian/templates index 5653cf3..28e2a91 100644 --- a/debian/templates +++ b/debian/templates @@ -14,7 +14,7 @@ _Description: Modified configuration file Template: ucf/changeprompt_threeway Type: select # Translators, please keep translations *short* (less than 65 columns) -__Choices: install the package maintainer's version, keep the local version currently installed, show the differences between the versions, show a side-by-side difference between the versions, show a 3-way difference between available versions, do a 3-way merge between available versions (experimental), start a new shell to examine the situation +__Choices: install the package maintainer's version, keep the local version currently installed, show the differences between the versions, show a side-by-side difference between the versions, show a 3-way difference between available versions, do a 3-way merge between available versions, start a new shell to examine the situation Choices-C: install_new, keep_current, diff, sdiff, diff_threeway, merge_threeway, shell Default: keep_current _Description: What do you want to do about modified configuration file ${BASENAME}? @@ -27,7 +27,7 @@ __Choices: install the package maintainer's version, keep the local version curr Choices-C: install_new, keep_current, diff, sdiff, shell Default: keep_current _Description: What do you want to do about modified configuration file ${BASENAME}? - A new version (${NEW}) of configuration file ${FILE} is available, but the version installed + ${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is available, but the version installed currently has been locally modified. Template: ucf/show_diff diff --git a/examples/postinst b/examples/postinst index 7977233..2def0a9 100644 --- a/examples/postinst +++ b/examples/postinst @@ -65,7 +65,7 @@ case "$1" in ### We could also do this on the fly. The following is from Tore ### Anderson: - + #. /usr/share/debconf/confmodule ### find out what the user answered. @@ -89,7 +89,7 @@ case "$1" in ### Note that some versions of debconf do not release stdin, so ### the following invocation of ucf may not work, since the stdin - ### is never coneected to ucfr. + ### is never connected to ucfr. ### now, invoke ucf, which will take care of the rest, and ask ### the user if he wants to update his file, if it is modified. @@ -39,6 +39,8 @@ set -e progname="$(basename $0)" pversion='Revision: 3.00 ' +unset GREP_OPTIONS + ###################################################################### ######## ######### ######## Utility functions ######### @@ -937,7 +939,7 @@ else while [ "X$done" = "XNO" ]; do if [ "$DEBCONF_OK" = "YES" ] && [ "$DEBIAN_HAS_FRONTEND" ]; then # Use debconf to prompt. - if [ -e "$statedir/cache/$cached_file" ]; then + if [ -e "$statedir/cache/$cached_file" ] && [ "X$THREEWAY" != "X" ]; then templ=ucf/changeprompt_threeway else templ=ucf/changeprompt @@ -1011,7 +1013,7 @@ else exit 0; ;; diff|D|d) - DIFF="$(run_diff diff -uBbw "$dest_file" "$new_file")" + DIFF="$(run_diff diff -uBbwt "$dest_file" "$new_file")" show_diff "$DIFF" ;; sdiff|S|s) @@ -1032,7 +1034,7 @@ else fi show_diff "$DIFF" else - DIFF="$(run_diff diff -uBbw "$dest_file" "$new_file")" + DIFF="$(run_diff diff -uBbwt "$dest_file" "$new_file")" show_diff "$DIFF" fi ;; @@ -184,28 +184,13 @@ configuration file. This is accomplished by taking the configuration file and stashing it in a cache area during registration, and using diff3 during the install (the stashed file name is a munged version of the full path of the configuration file to avoid name space clashes). -.I Note -This option appeared in Version 0.8 of -.B ucf, -which was the first version released into unstable and ultimately -.B Sarge. -The version of ucf in woody does not contain this option. .TP .B "\-\-debconf\-ok" Indicate that it is ok for .I ucf to use an already running debconf instance for prompting (it has always been ok to use ucf when debconf is not running -- it shall -invoke debconf as needed). Since historically maintainer scripts that -used debconf and also ucf had to disable/cripple debconf before -running ucf (since ucf did not prompt with debconf, and needed stdio -available), ucf must be cautious when called from a maintainer script -that uses debconf. This option lets it know that the maintainer script -has not told debconf to stop, or redirected its stdio from debconf, or -anything of the sort -- and thus it is safe to use debconf even when -the script discovers that debconf is running. Packages that call ucf -with this option should take care to depend on version 0.28 or higher -of ucf (the first to support use this option). +invoke debconf as needed). .TP .B "\-\-debconf\-template foo" Instruct ucf to use the named multiselect debconf template instead of @@ -35,7 +35,7 @@ .\" Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA .\" 02111-1307, USA. .\" -.TH UCFR 1 "Apr 11 2006" "Debian" "Debian GNU/Linux manual" +.TH UCFR 1 "Feb 16 2018" "Debian" "Debian GNU/Linux manual" .SH NAME ucfr \- Update Configuration File Registry: associate packages with configuration files .SH SYNOPSIS @@ -67,7 +67,7 @@ package, but handled by the postinst by instead. This script is idempotent, associating a package to a file multiple times is not an error. It is normally an error to try to associate a file which is already associated with another package, but -this can be over ridden by using the +this can be overridden by using the .I \-\-force option. .SH OPTIONS @@ -144,7 +144,7 @@ needed: .I /etc/foo.conf .PP On purge, one should tell ucf to forget about the file (see detailed -examples in /usr/share/doc/examples): +examples in /usr/share/doc/ucf/examples): .PP .B ucfr .I \-\-purge |