[DRE-commits] [chef] 06/07: debconf-updatepo + manual translation merge

Wed Mar 25 17:34:34 UTC 2015

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository chef.

commit 41ed4b0e160d5e2910c37cfdfac2ed3e9d96922c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Mar 25 10:03:18 2015 -0300

    debconf-updatepo + manual translation merge
    
    The translations were slightly outdated so I had to do this. Let's hope
    I did not have messed up people's languages here.
---
 debian/po/nl.po | 76 ++++++++++++---------------------------------------------
 debian/po/ru.po | 35 ++++++++++++++------------
 2 files changed, 35 insertions(+), 76 deletions(-)

diff --git a/debian/po/nl.po b/debian/po/nl.po
index 538f331..7201d09 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: chef 0.8.16-4.2\n"
 "Report-Msgid-Bugs-To: chef at packages.debian.org\n"
-"POT-Creation-Date: 2014-01-10 01:17+0200\n"
-"PO-Revision-Date: 2014-09-25 20:04+0200\n"
+"POT-Creation-Date: 2014-02-18 07:08+0100\n"
+"PO-Revision-Date: 2015-03-25 10:01-0300\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
 "Language: nl\n"
@@ -19,68 +19,24 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../chef.templates:1001
-msgid "URL of Chef Server (e.g., http://chef.example.com:4000):"
-msgstr "De URL van de Chef-server (bijv. http://chef.example.com:4000):"
+#: ../chef.templates:2001
+msgid "URL of Chef server"
+msgstr "URL van de Chef-server"
 
 #. Type: string
 #. Description
-#: ../chef.templates:1001
-#| msgid ""
-#| "Please specify the full URL that clients will use to connect to the Chef "
-#| "server (for instance \"http://chef.example.com:4000\")."
+#: ../chef.templates:2001
 msgid ""
-" This is the full URI that clients will use to connect to the\n"
-" server.\n"
-" .\n"
-" This will be used in /etc/chef/client.rb as 'chef_server_url'."
+"Please choose the full URI that clients will use to connect to the server "
+"(for instance: http://chef.example.com:4000)."
 msgstr ""
 " Het betreft de volledige URI die clients zullen gebruiken om\n"
-" verbinding te maken met de server.\n"
-" Hij zal vermeld staan in /etc/chef/client.rb als 'chef_server_url'."
-
-#~ msgid "Chef server URL:"
-#~ msgstr "URL van de Chef-server:"
-
-#~ msgid "Password for the AMQP user \"chef\":"
-#~ msgstr "Wachtwoord voor de AMQP-gebruiker \"chef\":"
-
-#~ msgid ""
-#~ "Please choose a password for the default user (named \"chef\") in the "
-#~ "AMQP server queue, under the default RabbitMQ vhost (also \"/chef\")."
-#~ msgstr ""
-#~ "Kies een wachtwoord voor de standaard gebruiker (genaamd \"chef\") in de "
-#~ "AMQP-serverwachtrij, van de standaard RabbitMQ-vhost (ook \"/chef\")."
-
-#~ msgid ""
-#~ "RabbitMQ's rabbitmqctl program, which will be used to set this password, "
-#~ "cannot read input from a file. Instead it will be passed as a command-"
-#~ "line argument, so the password should not include any shell meta-"
-#~ "characters that could cause errors, such as \"!\"."
-#~ msgstr ""
-#~ "RabbitMQ's programma rabbitmqctl, welke gebruikt zal worden om het "
-#~ "wachtwoord in te stellen, kan geen invoer vanuit een bestand lezen. Het "
-#~ "wachtwoord zal als een argument op de commando-regel worden opgegeven, en "
-#~ "mag daarom geen shell-metatekens bevatten die voor fouten kunnen zorgen, "
-#~ "zoals \"!\"."
-
-#~ msgid "Temporary password for the Chef server user \"admin\":"
-#~ msgstr "Tijdelijk wachtwoord voor de Chef-server-gebruiker \"admin\":"
+" verbinding te maken met de server (bijv. http://chef.example.com:4000)."
 
-#~ msgid ""
-#~ "Please choose a temporary password for the first time the \"admin\" user "
-#~ "logs into the Chef server web interface. It should be changed immediately "
-#~ "after being used."
-#~ msgstr ""
-#~ "Kies een tijdelijk wachtwoord voor de eerste keer dat de \"admin\"-"
-#~ "gebruiker inlogt bij de Chef-server webinterface. Deze dient daarna "
-#~ "onmiddelijk te worden veranderd."
-
-#~ msgid ""
-#~ "This password must be at least six characters long. If no password is "
-#~ "entered, a default value will be used which is displayed on the Chef "
-#~ "server web interface home page."
-#~ msgstr ""
-#~ "Dit wachtwoord moet ten minste zes tekens lang zijn. Als u geen "
-#~ "wachtwoord opgeeft zal de standaardwaarde worden gebruikt die op de "
-#~ "thuispagina van de Chef-server-webinterface wordt getoond."
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"This setting will be stored in /etc/chef/client.rb as \"chef_server_url\"."
+msgstr ""
+" Hij zal vermeld staan in /etc/chef/client.rb als 'chef_server_url'."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 2e69729..91e4353 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -7,35 +7,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: chef\n"
 "Report-Msgid-Bugs-To: chef at packages.debian.org\n"
-"POT-Creation-Date: 2014-01-10 01:17+0200\n"
-"PO-Revision-Date: 2014-01-19 22:23+0400\n"
+"POT-Creation-Date: 2014-02-18 07:08+0100\n"
+"PO-Revision-Date: 2015-03-25 10:03-0300\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks at lists.sourceforge.net>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.4\n"
 
 #. Type: string
 #. Description
-#: ../chef.templates:1001
-msgid "URL of Chef Server (e.g., http://chef.example.com:4000):"
-msgstr "URL сервера Chef (пример: http://chef.example.com:4000):"
+#: ../chef.templates:2001
+msgid "URL of Chef server"
+msgstr "URL сервера Chef"
 
 #. Type: string
 #. Description
-#: ../chef.templates:1001
+#: ../chef.templates:2001
 msgid ""
-" This is the full URI that clients will use to connect to the\n"
-" server.\n"
-" .\n"
-" This will be used in /etc/chef/client.rb as 'chef_server_url'."
+"Please choose the full URI that clients will use to connect to the server "
+"(for instance: http://chef.example.com:4000)."
 msgstr ""
-" Нужно указать полный URI, который будут использовать клиенты для\n"
-" подключения к серверу.\n"
-" .\n"
-" Он будет использоваться в /etc/chef/client.rb к «chef_server_url»."
+" Нужно указать полный URI, который будут использовать клиенты для"
+" подключения к серверу (пример: http://chef.example.com:4000)."
 
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"This setting will be stored in /etc/chef/client.rb as \"chef_server_url\"."
+msgstr ""
+" Он будет использоваться в /etc/chef/client.rb к «chef_server_url»."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git

