Merge lp:~ubuntu-branches/ubuntu/natty/strongswan/natty-201011201113 into lp:ubuntu/natty/strongswan

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/strongswan now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/strongswan/natty-201011201113. A merge should be performed if necessary.

Unmerged revisions

14. By Bilal Akhtar on 2010-11-20

* Merge from Debian Unstable, remaining changes:
  - Build depend on libnm-glib-dev instead of libnm-glib-vpn-dev to
    match the network manager package naming in Ubuntu.
* Non-maintainer upload.
  - Fix pending l10n issues. Debconf translations:
  - Vietnamese (Clytie Siddall). Closes: #598925
  - Japanese (Hideki Yamane). Closes: #599888
  - Czech (Miroslav Kure). Closes: #600354
  - Spanish (Francisco Javier Cuadrado). Closes: #600409
  - Danish (Joe Hansen). Closes: #602449
  - Basque (Iñaki Larrañaga Murgoitio). Closes: #603723
  - Italian (Vincenzo Campanella). Closes: #603779

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2010-11-20 13:03:03 +0000
+++ debian/po/de.po	2010-11-20 11:18:54 +0000
@@ -8,14 +8,18 @@
 msgstr ""
 "Project-Id-Version: strongswan 4.4.0-1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-06-29 21:55+0200\n"
 "Last-Translator: Helge Kreutzmann <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 
 # (mes) andere Übersetzungen für supersede: etw.Akk. ersetzen, für etw.Akk. Ersatz sein, an die Stelle von etw. Dat. treten, etw.Akk. überflüssig machen, etw.Akk. verdrängen
 #. Type: note
@@ -353,8 +357,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "Ohne einen gültigen Ländercode nach ISO-3166 wird es OpenSSL ablehnen, ein "
@@ -705,8 +709,8 @@
 #~ "Falls Sie Ihren /usr-Baum über NFS eingehängt haben und keine PCMCIA-"
 #~ "Netzwerkkarte benutzen, müssen Sie strongSwan nach NFS starten, so dass "
 #~ "alle benötigten Dateien verfügbar sind. In diesem Fall antworten Sie "
-#~ "»nach NFS« auf diese Frage. Bitte beachten Sie, dass NFS-Einhängungen "
-#~ "von /usr in diesem Fall nicht über IPSec gesichert werden können."
+#~ "»nach NFS« auf diese Frage. Bitte beachten Sie, dass NFS-Einhängungen von /"
+#~ "usr in diesem Fall nicht über IPSec gesichert werden können."
 
 #~ msgid ""
 #~ "If you use a PCMCIA network card for your IPSec connections, then you "

=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2010-11-20 13:03:03 +0000
+++ debian/po/fi.po	2010-11-20 11:18:54 +0000
@@ -6,14 +6,18 @@
 msgstr ""
 "Project-Id-Version: strongswan\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2009-05-25 14:49+0100\n"
 "Last-Translator: Esko Arajärvi <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -294,8 +298,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2010-11-20 13:03:03 +0000
+++ debian/po/fr.po	2010-11-20 11:18:54 +0000
@@ -7,14 +7,18 @@
 msgstr ""
 "Project-Id-Version: strongswan\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-06-24 22:17+0200\n"
 "Last-Translator: Christian Perrier <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
@@ -349,8 +353,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "Il est impératif de choisir ici un code de pays ISO-3166 valable sinon "

=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2010-11-20 13:03:03 +0000
+++ debian/po/gl.po	2010-11-20 11:18:54 +0000
@@ -6,14 +6,18 @@
 msgstr ""
 "Project-Id-Version: templates_[kI6655]\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2009-05-25 14:50+0100\n"
 "Last-Translator: marce villarino <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
@@ -292,8 +296,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 

=== modified file 'debian/po/nb.po'
--- debian/po/nb.po	2010-11-20 13:03:03 +0000
+++ debian/po/nb.po	2010-11-20 11:18:54 +0000
@@ -6,14 +6,18 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2009-05-25 14:59+0100\n"
 "Last-Translator: Bjørn Steensrud <[e-mail]>\n"
 "Language-Team: Norwegian Bokmål <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -293,8 +297,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2010-11-20 13:03:03 +0000
+++ debian/po/nl.po	2010-11-20 11:18:54 +0000
@@ -19,14 +19,18 @@
 msgstr ""
 "Project-Id-Version: strongswan_2.7.3+dfsg-1_nl\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2006-09-28 19:50+0200\n"
 "Last-Translator: Kurt De Bree <[e-mail]>\n"
 "Language-Team: Dutch <[e-mail]>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #. Type: note
@@ -332,8 +336,8 @@
 #: ../strongswan-starter.templates:13001
 #, fuzzy
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "U moet hier wel een geldige landcode opgeven omdat openssl anders zal "

=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2010-11-20 13:03:03 +0000
+++ debian/po/pt.po	2010-11-20 11:18:54 +0000
@@ -8,14 +8,18 @@
 msgstr ""
 "Project-Id-Version: strongswan 4.4.0-1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-06-26 18:47+0100\n"
 "Last-Translator: Américo Monteiro <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -342,8 +346,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "O OpenSSL irá recusar gerar um certificado a menos que isto seja um código "

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2010-11-20 13:03:03 +0000
+++ debian/po/pt_BR.po	2010-11-20 11:18:54 +0000
@@ -15,14 +15,18 @@
 msgstr ""
 "Project-Id-Version: openswan\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2005-01-24 21:53-0200\n"
 "Last-Translator: André Luís Lopes <[e-mail]>\n"
 "Language-Team: Debian-BR Project <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #. Type: note
 #. Description
@@ -331,8 +335,8 @@
 #: ../strongswan-starter.templates:13001
 #, fuzzy
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "Você realmente precisa informar um código de país válido aqui devido ao "

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2010-11-20 13:03:03 +0000
+++ debian/po/ru.po	2010-11-20 11:18:54 +0000
@@ -7,17 +7,21 @@
 msgstr ""
 "Project-Id-Version: strongswan 4.4.0-1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-06-25 19:08+0400\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "X-Generator: KBabel 1.11.4\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"
 
 #. Type: note
 #. Description
@@ -337,8 +341,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "Зде�ь нужно вве�ти правильный код �траны �огла�но ISO-3166, так как OpenSSL "

=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2010-11-20 13:03:03 +0000
+++ debian/po/sv.po	2010-11-20 11:18:54 +0000
@@ -17,14 +17,18 @@
 msgstr ""
 "Project-Id-Version: strongswan_sv\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-06-26 16:51+0200\n"
 "Last-Translator: Martin Ågren <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "X-Poedit-Language: swe\n"
 "X-Poedit-Country: swe\n"
 "X-Generator: KBabel 1.11.4\n"
@@ -350,8 +354,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""
 "OpenSSL kommer vägra generera ett certifikat såvida det här värdet inte är "

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2010-11-20 13:03:03 +0000
+++ debian/po/templates.pot	2010-11-20 11:18:54 +0000
@@ -8,11 +8,14 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-11-20 13:06+0300\n"
+=======
+"POT-Creation-Date: 2010-10-18 10:22+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -268,8 +271,8 @@
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"OpenSSL will refuse to generate a certificate unless this is a valid "
-"ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
+"OpenSSL will refuse to generate a certificate unless this is a valid ISO-"
+"3166 country code; an empty field is allowed elsewhere in the X.509 "
 "certificate, but not here."
 msgstr ""