summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-03-04 11:23:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-03-04 11:29:20 +0000
commit41935089e9699144cdfc84603d3445d9824cdbe0 (patch)
tree137f2c3c0e901307672a6104735e77dacc3ca451
parentMerging upstream version 20190304. (diff)
downloadopen-infrastructure-compute-tools-41935089e9699144cdfc84603d3445d9824cdbe0.tar.xz
open-infrastructure-compute-tools-41935089e9699144cdfc84603d3445d9824cdbe0.zip
Updating packaging for curl script readding.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/control1
-rw-r--r--debian/open-infrastructure-container-tools.config4
-rwxr-xr-xdebian/open-infrastructure-container-tools.postinst13
-rwxr-xr-xdebian/open-infrastructure-container-tools.postrm1
-rwxr-xr-xdebian/open-infrastructure-container-tools.prerm1
-rw-r--r--debian/open-infrastructure-container-tools.templates10
-rw-r--r--debian/po/de.po67
-rw-r--r--debian/po/fr.po82
-rw-r--r--debian/po/nl.po82
-rw-r--r--debian/po/pt.po78
-rw-r--r--debian/po/pt_BR.po78
-rw-r--r--debian/po/ru.po70
-rw-r--r--debian/po/templates.pot51
13 files changed, 385 insertions, 153 deletions
diff --git a/debian/control b/debian/control
index ad02cc2..4be0786 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Depends:
${misc:Depends},
Recommends:
bash-completion,
+ curl,
debootstrap | mmdebstrap,
logrotate,
procps,
diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index 36720e1..3d6f9e5 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -23,6 +23,10 @@ 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 90d9885..f04f12b 100755
--- a/debian/open-infrastructure-container-tools.postinst
+++ b/debian/open-infrastructure-container-tools.postinst
@@ -40,10 +40,11 @@ Install ()
case "${1}" in
configure)
- update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/mmdebstrap 1000
- 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
+ update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/curl 1000
+ update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/mmdebstrap 2000
+ update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debootstrap 3000
+ update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/progress-linux 4000
+ update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debian 5000
. /usr/share/debconf/confmodule
@@ -59,6 +60,9 @@ 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)
@@ -74,6 +78,7 @@ 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 c531c57..ab1ea41 100755
--- a/debian/open-infrastructure-container-tools.postrm
+++ b/debian/open-infrastructure-container-tools.postrm
@@ -33,6 +33,7 @@ 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 e03e056..5083ca6 100755
--- a/debian/open-infrastructure-container-tools.prerm
+++ b/debian/open-infrastructure-container-tools.prerm
@@ -4,6 +4,7 @@ set -e
case "${1}" in
remove|upgrade|deconfigure)
+ 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/debootstrap
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 ff42b43..d251028 100644
--- a/debian/open-infrastructure-container-tools.templates
+++ b/debian/open-infrastructure-container-tools.templates
@@ -41,6 +41,16 @@ _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 3c46cad..7e777ba 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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
"PO-Revision-Date: 2018-08-06 21:31+0200\n"
"Last-Translator: Markus Hiereth <translation@hiereth.de>\n"
"Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
@@ -81,8 +81,7 @@ 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
@@ -94,8 +93,11 @@ 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:"
@@ -117,8 +119,7 @@ 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
@@ -143,24 +144,49 @@ 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:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid "cache directory:"
msgstr "Zwischenspeicher-Verzeichnis:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
@@ -170,30 +196,29 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
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:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr "${SCRIPT_CHOICES}"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr "Erzeugungs-Skript:"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
@@ -202,19 +227,19 @@ msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr "Wenn Sie unsicher sind, verwenden Sie das Standardskript debian."
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr "IRC-Benachrichtigungen:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -224,7 +249,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -234,12 +259,12 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr " irc://irc.oftc.net:6668/open-infrastructure"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
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 61a4c30..d58deaa 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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
"PO-Revision-Date: 2016-08-09 15:23+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -80,9 +80,8 @@ 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
@@ -94,8 +93,11 @@ 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 :"
@@ -116,9 +118,8 @@ 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
@@ -140,25 +141,54 @@ 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/hooks "
-"(répertoire par défaut) ou /srv/container/hooks si vous utilisez un stockage "
-"partagé."
+"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: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:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid "cache directory:"
msgstr "Répertoire cache :"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
@@ -168,30 +198,29 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
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:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr "${SCRIPT_CHOICES}"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr "Créez un script :"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
@@ -200,19 +229,19 @@ msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr "En cas de doute, utilisez debian (par défaut)."
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -220,7 +249,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -228,12 +257,15 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
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 a266e40..a0d0bb6 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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
"PO-Revision-Date: 2017-08-10 16:42+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\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,8 +94,11 @@ 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:"
@@ -116,9 +119,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
@@ -142,25 +145,51 @@ 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:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid "cache directory:"
msgstr "cache-map:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
@@ -170,30 +199,30 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
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:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr "${SCRIPT_CHOICES}"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr "aanmaakscript:"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
@@ -201,19 +230,19 @@ msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr "Indien u twijfelt, gebruik dan debian (standaard)."
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr "Kennisgeving via IRC:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -223,7 +252,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -233,12 +262,15 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr " irc://irc.oftc.net:6668/open-infrastructure"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
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 6fa9e3d..4444a38 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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
"PO-Revision-Date: 2017-08-02 21:47+0000\n"
"Last-Translator: Rui Branco - DebianPT <ruipb@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -81,9 +81,8 @@ 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
@@ -95,8 +94,11 @@ 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:"
@@ -117,9 +119,8 @@ 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
@@ -143,25 +144,50 @@ 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:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid "cache directory:"
msgstr "Directório de cache:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
@@ -171,30 +197,29 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
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:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr "${SCRIPT_CHOICES}"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr "Criar script:"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
@@ -203,19 +228,19 @@ msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr "Em caso de dúvida utilize debian (predefinido)."
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr "Notificações IRC:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -225,7 +250,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -235,12 +260,15 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr " irc://irc.oftc.net:6668/open-infrastructure"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
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 59f7737..f317fbf 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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
"PO-Revision-Date: 2016-08-25 22:07-0300\n"
"Last-Translator: Adriano Rafael Gomes <adrianorg@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -81,8 +81,8 @@ msgid ""
"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
"container/config when using shared storage."
msgstr ""
-"Se não tiver certeza, use /etc/open-infrastructure/container/config (padrão) "
-"ou /srv/container/config ao usar armazenamento compartilhado."
+"Se não tiver certeza, use /etc/open-infrastructure/container/config (padrão) ou /srv/"
+"container/config ao usar armazenamento compartilhado."
#. Type: string
#. Default
@@ -94,8 +94,11 @@ 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 "diretório do debconf:"
@@ -116,8 +119,8 @@ msgid ""
"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
"container/debconf when using shared storage."
msgstr ""
-"Se não tiver certeza, use /etc/open-infrastructure/container/debconf "
-"(padrão) ou /srv/container/debconf ao usar armazenamento compartilhado."
+"Se não tiver certeza, use /etc/open-infrastructure/container/debconf (padrão) ou /srv/"
+"container/debconf ao usar armazenamento compartilhado."
#. Type: string
#. Default
@@ -139,24 +142,54 @@ msgid ""
"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
"container/hooks when using shared storage."
msgstr ""
-"Se não tiver certeza, use /etc/open-infrastructure/container/hooks (padrão) "
-"ou /srv/container/hooks ao usar armazenamento compartilhado."
+"Se não tiver certeza, use /etc/open-infrastructure/container/keys (padrão) ou /srv/"
+"container/keys ao usar armazenamento compartilhado."
#. 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 ""
+"Por favor, especifique o diretório que será usado para armazenar os arquivos "
+"de configuração de contêiner."
+
+#. 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 ""
+"Se não tiver certeza, use /etc/open-infrastructure/container/keys (padrão) ou /srv/"
+"container/keys ao usar armazenamento compartilhado."
+
+#. 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:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid "cache directory:"
msgstr "diretório de cache:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
@@ -166,29 +199,29 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
"container/cache when using shared storage."
msgstr ""
-"Se não tiver certeza, use /var/cache/open-infrastructure/container (padrão) "
-"ou /srv/container/cache ao usar armazenamento compartilhado."
+"Se não tiver certeza, use /var/cache/open-infrastructure/container (padrão) ou /srv/"
+"container/cache ao usar armazenamento compartilhado."
#. Type: select
#. Choices
-#: ../open-infrastructure-container-tools.templates:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr "${SCRIPT_CHOICES}"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr "script de criação:"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
@@ -197,19 +230,19 @@ msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr "Se não tiver certeza, use debian (padrão)."
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -217,7 +250,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -225,12 +258,15 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "If unsure, leave empty (default)."
msgstr ""
+
+#~ msgid "/etc/container-tools/keys"
+#~ msgstr "/etc/container-tools/keys"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 6222ed1..3e5d5e1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -5,7 +5,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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
"PO-Revision-Date: 2017-12-03 22:46+0500\n"
"Last-Translator: Lev Lamberov <dogsleg@debian.org>\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,8 +92,11 @@ 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:"
@@ -114,8 +117,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
@@ -139,24 +142,50 @@ 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:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid "cache directory:"
msgstr "каталог кэша:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
@@ -166,7 +195,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
"container/cache when using shared storage."
@@ -176,19 +205,19 @@ msgstr ""
#. Type: select
#. Choices
-#: ../open-infrastructure-container-tools.templates:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr "${SCRIPT_CHOICES}"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr "сценарий создания:"
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
@@ -196,19 +225,19 @@ msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr "Если вы не уверены, то используйте debian (по умолчанию)."
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr "IRC-уведомления:"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -218,7 +247,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -228,12 +257,15 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr " irc://irc.oftc.net:6668/open-infrastructure"
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
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 d781f76..bdcc854 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-03-02 11:08+0100\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\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"
@@ -87,8 +87,11 @@ 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 ""
@@ -132,26 +135,48 @@ msgstr ""
#. Type: string
#. Default
#: ../open-infrastructure-container-tools.templates:6001
-msgid "/var/cache/open-infrastructure/container"
+msgid "/etc/open-infrastructure/container/keys"
msgstr ""
#. Type: string
#. Description
#: ../open-infrastructure-container-tools.templates:6002
-msgid "cache directory:"
+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
+msgid "cache directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../open-infrastructure-container-tools.templates:7002
+msgid ""
"Please specify the directory that will be used to cache files during "
"creation of containers."
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:6002
+#: ../open-infrastructure-container-tools.templates:7002
msgid ""
"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
"container/cache when using shared storage."
@@ -159,38 +184,38 @@ msgstr ""
#. Type: select
#. Choices
-#: ../open-infrastructure-container-tools.templates:7001
+#: ../open-infrastructure-container-tools.templates:8001
msgid "${SCRIPT_CHOICES}"
msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "create script:"
msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid ""
"Please select the script that will be used by default to create containers."
msgstr ""
#. Type: select
#. Description
-#: ../open-infrastructure-container-tools.templates:7002
+#: ../open-infrastructure-container-tools.templates:8002
msgid "If unsure, use debian (default)."
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "IRC notifications:"
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The container command can send IRC notifications via irker to one or more "
"(whitespace separated) IRC channels."
@@ -198,7 +223,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid ""
"The following example will send IRC notifications to the open-infrastructure "
"channel on irc.oftc.net:"
@@ -206,12 +231,12 @@ msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid " irc://irc.oftc.net:6668/open-infrastructure"
msgstr ""
#. Type: string
#. Description
-#: ../open-infrastructure-container-tools.templates:8002
+#: ../open-infrastructure-container-tools.templates:9002
msgid "If unsure, leave empty (default)."
msgstr ""