From 7044c2eb267acfecfb22f2429d01a7e749f09e66 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 2 Mar 2019 11:10:31 +0100 Subject: Updating packaging for curl script removal. Signed-off-by: Daniel Baumann --- debian/control | 3 +- debian/open-infrastructure-container-tools.config | 4 -- .../open-infrastructure-container-tools.postinst | 7 +- debian/open-infrastructure-container-tools.postrm | 1 - debian/open-infrastructure-container-tools.prerm | 1 - .../open-infrastructure-container-tools.templates | 10 --- debian/po/de.po | 67 ++++++------------ debian/po/fr.po | 82 +++++++--------------- debian/po/nl.po | 82 +++++++--------------- debian/po/pt.po | 78 +++++++------------- debian/po/pt_BR.po | 78 ++++++-------------- debian/po/ru.po | 70 +++++------------- debian/po/templates.pot | 51 ++++---------- 13 files changed, 151 insertions(+), 383 deletions(-) diff --git a/debian/control b/debian/control index b353ec8..ad02cc2 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,7 @@ Depends: ${misc:Depends}, Recommends: bash-completion, - curl, - debootstrap, + debootstrap | mmdebstrap, logrotate, procps, pv, diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config index 3d6f9e5..36720e1 100644 --- a/debian/open-infrastructure-container-tools.config +++ b/debian/open-infrastructure-container-tools.config @@ -22,10 +22,6 @@ db_settitle open-infrastructure-container-tools/title db_input low open-infrastructure-container-tools/hooks || true db_go -db_settitle open-infrastructure-container-tools/title -db_input low open-infrastructure-container-tools/keys || true -db_go - db_settitle open-infrastructure-container-tools/title db_input low open-infrastructure-container-tools/cache || true db_go diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst index f602ae0..9424b23 100755 --- a/debian/open-infrastructure-container-tools.postinst +++ b/debian/open-infrastructure-container-tools.postinst @@ -40,8 +40,7 @@ Install () case "${1}" in configure) - update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debootstrap 1000 - update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/curl 2000 + update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debootstrap 2000 update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/progress-linux 3000 update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debian 4000 @@ -59,9 +58,6 @@ case "${1}" in db_get open-infrastructure-container-tools/hooks HOOKS="${RET:-/etc/container-tools/hooks}" # string (w/o empty) - db_get open-infrastructure-container-tools/keys - KEYS="${RET:-/etc/container-tools/keys}" # string (w/o empty) - db_get open-infrastructure-container-tools/cache CACHE="${RET:-/var/cache/container-tools}" # string (w/o empty) @@ -77,7 +73,6 @@ case "${1}" in Install "/etc/open-infrastructure/container/config" "${CONFIG}" Install "/etc/open-infrastructure/container/debconf" "${DEBCONF}" Install "/etc/open-infrastructure/container/hooks" "${HOOKS}" - Install "/etc/open-infrastructure/container/keys" "${KEYS}" Install "/var/cache/open-infrastructure/container" "${CACHE}" update-alternatives --quiet --set container_script "/usr/share/open-infrastructure/container/scripts/${SCRIPT}" diff --git a/debian/open-infrastructure-container-tools.postrm b/debian/open-infrastructure-container-tools.postrm index ab1ea41..c531c57 100755 --- a/debian/open-infrastructure-container-tools.postrm +++ b/debian/open-infrastructure-container-tools.postrm @@ -33,7 +33,6 @@ case "${1}" in Remove /etc/open-infrastructure/container/debconf Remove /etc/open-infrastructure/container/config Remove /etc/open-infrastructure/container/hooks - Remove /etc/open-infrastructure/container/keys Remove /var/lib/machines ;; diff --git a/debian/open-infrastructure-container-tools.prerm b/debian/open-infrastructure-container-tools.prerm index c80e544..e03e056 100755 --- a/debian/open-infrastructure-container-tools.prerm +++ b/debian/open-infrastructure-container-tools.prerm @@ -5,7 +5,6 @@ set -e case "${1}" in remove|upgrade|deconfigure) update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/debootstrap - update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/curl update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/progress-linux update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/debian ;; diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates index d251028..ff42b43 100644 --- a/debian/open-infrastructure-container-tools.templates +++ b/debian/open-infrastructure-container-tools.templates @@ -41,16 +41,6 @@ _Description: debconf directory: If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/container/hooks when using shared storage. -Template: open-infrastructure-container-tools/keys -Type: string -_Default: /etc/open-infrastructure/container/keys -_Description: debconf directory: - Please specify the directory that will be used to store the container - keys for verifying container image downloads. - . - If unsure, use /etc/open-infrastructure/container/keys (default) or - /srv/container/keys when using shared storage. - Template: open-infrastructure-container-tools/cache Type: string _Default: /var/cache/open-infrastructure/container diff --git a/debian/po/de.po b/debian/po/de.po index 7e777ba..3c46cad 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: open-infrastructure-container-tools 20180527-1\n" "Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n" -"POT-Creation-Date: 2019-02-23 16:47+0100\n" +"POT-Creation-Date: 2019-03-02 11:08+0100\n" "PO-Revision-Date: 2018-08-06 21:31+0200\n" "Last-Translator: Markus Hiereth \n" "Language-Team: debian-l10n-german \n" @@ -81,7 +81,8 @@ msgid "" "container/config when using shared storage." msgstr "" "Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-" -"infrastructure/container/config oder für gemeinsam benutzten Speicher /srv/container/config." +"infrastructure/container/config oder für gemeinsam benutzten Speicher /srv/" +"container/config." #. Type: string #. Default @@ -93,11 +94,8 @@ msgstr "/etc/open-infrastructure/container/debconf" #. Description #. Type: string #. Description -#. Type: string -#. Description #: ../open-infrastructure-container-tools.templates:4002 #: ../open-infrastructure-container-tools.templates:5002 -#: ../open-infrastructure-container-tools.templates:6002 msgid "debconf directory:" msgstr "Verzeichnis des Konfigurationssystems für Debian-Pakete:" @@ -119,7 +117,8 @@ msgid "" "container/debconf when using shared storage." msgstr "" "Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-" -"infrastructure/container/debconf oder /srv/container/debconf für gemeinsam benutzten Speicher." +"infrastructure/container/debconf oder /srv/container/debconf für gemeinsam " +"benutzten Speicher." #. Type: string #. Default @@ -144,49 +143,24 @@ msgid "" "container/hooks when using shared storage." msgstr "" "Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-" -"infrastructure/container/hooks oder für gemeinsam benutzten Speicher /srv/container/hooks." +"infrastructure/container/hooks oder für gemeinsam benutzten Speicher /srv/" +"container/hooks." #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:6001 -msgid "/etc/open-infrastructure/container/keys" -msgstr "/etc/open-infrastructure/container/keys" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"Please specify the directory that will be used to store the container keys " -"for verifying container image downloads." -msgstr "" -"Bitte geben Sie das Verzeichnis für die Container-Schlüssel an, mit welchen " -"heruntergeladene Container-Abbilder überprüft werden." - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/" -"container/keys when using shared storage." -msgstr "" -"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-" -"infrastructure/container/keys oder /srv/container/keys für gemeinsam benutzten Speicher." - -#. Type: string -#. Default -#: ../open-infrastructure-container-tools.templates:7001 msgid "/var/cache/open-infrastructure/container" msgstr "/var/cache/open-infrastructure/container" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "Zwischenspeicher-Verzeichnis:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -196,29 +170,30 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/open-infrastructure/container (default) or /srv/" "container/cache when using shared storage." msgstr "" "Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /var/cache/" -"open-infrastructure/container oder für gemeinsam benutzten Speicher /srv/container/cache." +"open-infrastructure/container oder für gemeinsam benutzten Speicher /srv/" +"container/cache." #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:8001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "Erzeugungs-Skript:" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -227,19 +202,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "Wenn Sie unsicher sind, verwenden Sie das Standardskript debian." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "IRC-Benachrichtigungen:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -249,7 +224,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -259,12 +234,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr " irc://irc.oftc.net:6668/open-infrastructure" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "Wenn Sie unsicher sind, geben Sie nichts ein (Standardeinstellung)." diff --git a/debian/po/fr.po b/debian/po/fr.po index d58deaa..61a4c30 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: open-infrastructure-container-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n" -"POT-Creation-Date: 2019-02-23 16:47+0100\n" +"POT-Creation-Date: 2019-03-02 11:08+0100\n" "PO-Revision-Date: 2016-08-09 15:23+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -80,8 +80,9 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/config (default) or /srv/" "container/config when using shared storage." msgstr "" -"En cas de doute, utilisez /etc/open-infrastructure/container/config (répertoire par " -"défaut) ou /srv/container/config si vous utilisez un stockage partagé." +"En cas de doute, utilisez /etc/open-infrastructure/container/config " +"(répertoire par défaut) ou /srv/container/config si vous utilisez un " +"stockage partagé." #. Type: string #. Default @@ -93,11 +94,8 @@ msgstr "/etc/open-infrastructure/container/debconf" #. Description #. Type: string #. Description -#. Type: string -#. Description #: ../open-infrastructure-container-tools.templates:4002 #: ../open-infrastructure-container-tools.templates:5002 -#: ../open-infrastructure-container-tools.templates:6002 msgid "debconf directory:" msgstr "Répertoire de la configuration Debian :" @@ -118,8 +116,9 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/" "container/debconf when using shared storage." msgstr "" -"En cas de doute, utilisez /etc/open-infrastructure/container/debconf (répertoire par " -"défaut) ou /srv/container/debconf si vous utilisez un stockage partagé." +"En cas de doute, utilisez /etc/open-infrastructure/container/debconf " +"(répertoire par défaut) ou /srv/container/debconf si vous utilisez un " +"stockage partagé." #. Type: string #. Default @@ -141,54 +140,25 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/" "container/hooks when using shared storage." msgstr "" -"En cas de doute, utilisez /etc/open-infrastructure/container/keys (répertoire par défaut) " -"ou /srv/container/keys si vous utilisez un stockage partagé." +"En cas de doute, utilisez /etc/open-infrastructure/container/hooks " +"(répertoire par défaut) ou /srv/container/hooks si vous utilisez un stockage " +"partagé." #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:6001 -msgid "/etc/open-infrastructure/container/keys" -msgstr "" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -#, fuzzy -#| msgid "" -#| "Please specify the directory that will be used to store the container " -#| "configuration files." -msgid "" -"Please specify the directory that will be used to store the container keys " -"for verifying container image downloads." -msgstr "" -"Veuillez indiquer le répertoire qui sera utilisé pour stocker les fichiers " -"de configuration du conteneur." - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/" -"container/keys when using shared storage." -msgstr "" -"En cas de doute, utilisez /etc/open-infrastructure/container/keys (répertoire par défaut) " -"ou /srv/container/keys si vous utilisez un stockage partagé." - -#. Type: string -#. Default -#: ../open-infrastructure-container-tools.templates:7001 msgid "/var/cache/open-infrastructure/container" msgstr "/var/cache/open-infrastructure/container" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "Répertoire cache :" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -198,29 +168,30 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/open-infrastructure/container (default) or /srv/" "container/cache when using shared storage." msgstr "" -"En cas de doute, utilisez /var/cache/open-infrastructure/container (répertoire par défaut) " -"ou /srv/container/cache si vous utilisez un stockage partagé." +"En cas de doute, utilisez /var/cache/open-infrastructure/container " +"(répertoire par défaut) ou /srv/container/cache si vous utilisez un stockage " +"partagé." #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:8001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "Créez un script :" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -229,19 +200,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "En cas de doute, utilisez debian (par défaut)." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -249,7 +220,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -257,15 +228,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "" - -#~ msgid "/etc/container-tools/keys" -#~ msgstr "/etc/container-tools/keys" diff --git a/debian/po/nl.po b/debian/po/nl.po index a0d0bb6..a266e40 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: open-infrastructure-container-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n" -"POT-Creation-Date: 2019-02-23 16:47+0100\n" +"POT-Creation-Date: 2019-03-02 11:08+0100\n" "PO-Revision-Date: 2017-08-10 16:42+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -80,9 +80,9 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/config (default) or /srv/" "container/config when using shared storage." msgstr "" -"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/config (standaard) of /" -"srv/container/config in het geval er gebruik gemaakt wordt van gedeelde " -"opslag." +"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/config " +"(standaard) of /srv/container/config in het geval er gebruik gemaakt wordt " +"van gedeelde opslag." #. Type: string #. Default @@ -94,11 +94,8 @@ msgstr "/etc/open-infrastructure/container/debconf" #. Description #. Type: string #. Description -#. Type: string -#. Description #: ../open-infrastructure-container-tools.templates:4002 #: ../open-infrastructure-container-tools.templates:5002 -#: ../open-infrastructure-container-tools.templates:6002 msgid "debconf directory:" msgstr "debconf-map:" @@ -119,9 +116,9 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/" "container/debconf when using shared storage." msgstr "" -"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/debconf (standaard) of /" -"srv/container/debconf in het geval er gebruik gemaakt wordt van gedeelde " -"opslag." +"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/debconf " +"(standaard) of /srv/container/debconf in het geval er gebruik gemaakt wordt " +"van gedeelde opslag." #. Type: string #. Default @@ -145,51 +142,25 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/" "container/hooks when using shared storage." msgstr "" -"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/hooks (standaard) of /" -"srv/container/hooks in het geval er gebruik gemaakt wordt van gedeelde " -"opslag." +"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/hooks " +"(standaard) of /srv/container/hooks in het geval er gebruik gemaakt wordt " +"van gedeelde opslag." #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:6001 -msgid "/etc/open-infrastructure/container/keys" -msgstr "" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"Please specify the directory that will be used to store the container keys " -"for verifying container image downloads." -msgstr "" -"Geef op welke map gebruikt zal worden voor het opslaan van de " -"containersleutelbossen om gedownloade container-images te verifiëren." - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/" -"container/keys when using shared storage." -msgstr "" -"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/keys (standaard) of /srv/" -"container/keys in het geval er gebruik gemaakt wordt van gedeelde opslag." - -#. Type: string -#. Default -#: ../open-infrastructure-container-tools.templates:7001 msgid "/var/cache/open-infrastructure/container" msgstr "/var/cache/open-infrastructure/container" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "cache-map:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -199,30 +170,30 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/open-infrastructure/container (default) or /srv/" "container/cache when using shared storage." msgstr "" -"Indien u twijfelt, gebruik dan /var/cache/open-infrastructure/container (standaard) of /" -"srv/container/cache in het geval er gebruik gemaakt wordt van gedeelde " -"opslag." +"Indien u twijfelt, gebruik dan /var/cache/open-infrastructure/container " +"(standaard) of /srv/container/cache in het geval er gebruik gemaakt wordt " +"van gedeelde opslag." #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:8001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "aanmaakscript:" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -230,19 +201,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "Indien u twijfelt, gebruik dan debian (standaard)." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "Kennisgeving via IRC:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -252,7 +223,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -262,15 +233,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr " irc://irc.oftc.net:6668/open-infrastructure" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "Als u twijfelt, laat u dit best leeg (standaard)." - -#~ msgid "/etc/container-tools/keys" -#~ msgstr "/etc/container-tools/keys" diff --git a/debian/po/pt.po b/debian/po/pt.po index 4444a38..6fa9e3d 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: open-infrastructure-container-tools 20161101-lts2-2\n" "Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n" -"POT-Creation-Date: 2019-02-23 16:47+0100\n" +"POT-Creation-Date: 2019-03-02 11:08+0100\n" "PO-Revision-Date: 2017-08-02 21:47+0000\n" "Last-Translator: Rui Branco - DebianPT \n" "Language-Team: Portuguese \n" @@ -81,8 +81,9 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/config (default) or /srv/" "container/config when using shared storage." msgstr "" -"Em caso de dúvida utilize /etc/open-infrastructure/container/config (predefinido) ou /srv/" -"container/config quando utilizar armazenamento partilhado." +"Em caso de dúvida utilize /etc/open-infrastructure/container/config " +"(predefinido) ou /srv/container/config quando utilizar armazenamento " +"partilhado." #. Type: string #. Default @@ -94,11 +95,8 @@ msgstr "/etc/open-infrastructure/container/debconf" #. Description #. Type: string #. Description -#. Type: string -#. Description #: ../open-infrastructure-container-tools.templates:4002 #: ../open-infrastructure-container-tools.templates:5002 -#: ../open-infrastructure-container-tools.templates:6002 msgid "debconf directory:" msgstr "Directório do debconf:" @@ -119,8 +117,9 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/" "container/debconf when using shared storage." msgstr "" -"Em caso de dúvida utilize /etc/open-infrastructure/container/debconf (predefinido) ou /srv/" -"container/debconf quando utilizar armazenamento partilhado." +"Em caso de dúvida utilize /etc/open-infrastructure/container/debconf " +"(predefinido) ou /srv/container/debconf quando utilizar armazenamento " +"partilhado." #. Type: string #. Default @@ -144,50 +143,25 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/" "container/hooks when using shared storage." msgstr "" -"Em caso de dúvida utilize /etc/open-infrastructure/container/hooks (predefinido) ou /srv/" -"container/hooks quando utilizar armazenamento partilhado." +"Em caso de dúvida utilize /etc/open-infrastructure/container/hooks " +"(predefinido) ou /srv/container/hooks quando utilizar armazenamento " +"partilhado." #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:6001 -msgid "/etc/open-infrastructure/container/keys" -msgstr "" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"Please specify the directory that will be used to store the container keys " -"for verifying container image downloads." -msgstr "" -"Por favor especifique um directório que será usado para guardar as chaves " -"dos containers para verificar os downloads de imagem 'container'." - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/" -"container/keys when using shared storage." -msgstr "" -"Em caso de dúvida utilize /etc/open-infrastructure/container/keys (predefinido) ou /srv/" -"container/keys quando utilizar armazenamento partilhado." - -#. Type: string -#. Default -#: ../open-infrastructure-container-tools.templates:7001 msgid "/var/cache/open-infrastructure/container" msgstr "/var/cache/open-infrastructure/container" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "Directório de cache:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -197,29 +171,30 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/open-infrastructure/container (default) or /srv/" "container/cache when using shared storage." msgstr "" -"Em caso de dúvida utilize /var/cache/open-infrastructure/container (predefinido) ou /srv/" -"container/cache quando utilizar armazenamento partilhado." +"Em caso de dúvida utilize /var/cache/open-infrastructure/container " +"(predefinido) ou /srv/container/cache quando utilizar armazenamento " +"partilhado." #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:8001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "Criar script:" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -228,19 +203,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "Em caso de dúvida utilize debian (predefinido)." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "Notificações IRC:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -250,7 +225,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -260,15 +235,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr " irc://irc.oftc.net:6668/open-infrastructure" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "Se tem dúvidas deixe em branco (predefinição)." - -#~ msgid "/etc/container-tools/keys" -#~ msgstr "/etc/container-tools/keys" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index f317fbf..59f7737 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: open-infrastructure-container-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n" -"POT-Creation-Date: 2019-02-23 16:47+0100\n" +"POT-Creation-Date: 2019-03-02 11:08+0100\n" "PO-Revision-Date: 2016-08-25 22:07-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: \n" @@ -79,8 +79,8 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/config (default) or /srv/" "container/config when using shared storage." msgstr "" -"Если вы не уверены, то при использовании общего хранилища выберите /etc/" -"open-infrastructure/container/config (по умолчанию) или /srv/container/config." +"Если вы не уверены, то при использовании общего хранилища выберите /etc/open-" +"infrastructure/container/config (по умолчанию) или /srv/container/config." #. Type: string #. Default @@ -92,11 +92,8 @@ msgstr "/etc/open-infrastructure/container/debconf" #. Description #. Type: string #. Description -#. Type: string -#. Description #: ../open-infrastructure-container-tools.templates:4002 #: ../open-infrastructure-container-tools.templates:5002 -#: ../open-infrastructure-container-tools.templates:6002 msgid "debconf directory:" msgstr "каталог debconf:" @@ -117,8 +114,8 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/" "container/debconf when using shared storage." msgstr "" -"Если вы не уверены, то при использовании общего хранилища выберите /etc/" -"open-infrastructure/container/debconf (по умолчанию) или /srv/container/debconf." +"Если вы не уверены, то при использовании общего хранилища выберите /etc/open-" +"infrastructure/container/debconf (по умолчанию) или /srv/container/debconf." #. Type: string #. Default @@ -142,50 +139,24 @@ msgid "" "If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/" "container/hooks when using shared storage." msgstr "" -"Если вы не уверены, то при использовании общего хранилища выберите /etc/" -"open-infrastructure/container/hooks (по умолчанию) или /srv/container/hooks." +"Если вы не уверены, то при использовании общего хранилища выберите /etc/open-" +"infrastructure/container/hooks (по умолчанию) или /srv/container/hooks." #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:6001 -msgid "/etc/open-infrastructure/container/keys" -msgstr "" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"Please specify the directory that will be used to store the container keys " -"for verifying container image downloads." -msgstr "" -"Укажите каталог, который будет использоваться для хранения ключей " -"контейнеров для проверки загрузки образов контейнеров." - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/" -"container/keys when using shared storage." -msgstr "" -"Если вы не уверены, то при использовании общего хранилища выберите /etc/" -"open-infrastructure/container/keys (по умолчанию) или /srv/container/keys." - -#. Type: string -#. Default -#: ../open-infrastructure-container-tools.templates:7001 msgid "/var/cache/open-infrastructure/container" msgstr "/var/cache/open-infrastructure/container" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "каталог кэша:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -195,7 +166,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/open-infrastructure/container (default) or /srv/" "container/cache when using shared storage." @@ -205,19 +176,19 @@ msgstr "" #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:8001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "сценарий создания:" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -225,19 +196,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "Если вы не уверены, то используйте debian (по умолчанию)." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "IRC-уведомления:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -247,7 +218,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -257,15 +228,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr " irc://irc.oftc.net:6668/open-infrastructure" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "Если вы не уверены, то оставьте это поле пустым (по умолчанию)." - -#~ msgid "/etc/container-tools/keys" -#~ msgstr "/etc/container-tools/keys" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index bdcc854..d781f76 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: open-infrastructure-compute-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n" -"POT-Creation-Date: 2019-02-23 16:47+0100\n" +"POT-Creation-Date: 2019-03-02 11:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,11 +87,8 @@ msgstr "" #. Description #. Type: string #. Description -#. Type: string -#. Description #: ../open-infrastructure-container-tools.templates:4002 #: ../open-infrastructure-container-tools.templates:5002 -#: ../open-infrastructure-container-tools.templates:6002 msgid "debconf directory:" msgstr "" @@ -135,40 +132,18 @@ msgstr "" #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:6001 -msgid "/etc/open-infrastructure/container/keys" -msgstr "" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"Please specify the directory that will be used to store the container keys " -"for verifying container image downloads." -msgstr "" - -#. Type: string -#. Description -#: ../open-infrastructure-container-tools.templates:6002 -msgid "" -"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/" -"container/keys when using shared storage." -msgstr "" - -#. Type: string -#. Default -#: ../open-infrastructure-container-tools.templates:7001 msgid "/var/cache/open-infrastructure/container" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -176,7 +151,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/open-infrastructure/container (default) or /srv/" "container/cache when using shared storage." @@ -184,38 +159,38 @@ msgstr "" #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:8001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:8002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -223,7 +198,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -231,12 +206,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:9002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "" -- cgit v1.2.3