diff -Nru s390-netdevice-0.0.40ubuntu1/debian/changelog s390-netdevice-0.0.42ubuntu1/debian/changelog --- s390-netdevice-0.0.40ubuntu1/debian/changelog 2016-02-09 10:49:17.000000000 +0000 +++ s390-netdevice-0.0.42ubuntu1/debian/changelog 2016-03-07 12:08:23.000000000 +0000 @@ -1,3 +1,25 @@ +s390-netdevice (0.0.42ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Default to level2 qeth mode by default. + + -- Dimitri John Ledkov Mon, 07 Mar 2016 12:07:33 +0000 + +s390-netdevice (0.0.42) unstable; urgency=medium + + [ Updated translations ] + * Japanese (ja.po) by Kenshi Muto + * Thai (th.po) by Theppitak Karoonboonyanan + + -- Christian Perrier Tue, 23 Feb 2016 06:50:59 +0100 + +s390-netdevice (0.0.41) unstable; urgency=medium + + [ Updated translations ] + * Turkish (tr.po) by Mert Dirik + + -- Christian Perrier Mon, 15 Feb 2016 18:35:27 +0100 + s390-netdevice (0.0.40ubuntu1) xenial; urgency=low * Merge from Debian unstable LP: #1536649. Remaining changes: diff -Nru s390-netdevice-0.0.40ubuntu1/debian/po/ja.po s390-netdevice-0.0.42ubuntu1/debian/po/ja.po --- s390-netdevice-0.0.40ubuntu1/debian/po/ja.po 2016-02-07 00:35:01.000000000 +0000 +++ s390-netdevice-0.0.42ubuntu1/debian/po/ja.po 2016-02-24 11:13:16.000000000 +0000 @@ -27,7 +27,7 @@ "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: s390-netdevice@packages.debian.org\n" "POT-Creation-Date: 2016-01-29 22:01+0000\n" -"PO-Revision-Date: 2016-01-09 18:53+0900\n" +"PO-Revision-Date: 2016-02-17 12:04+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian L10n Japanese \n" "Language: ja\n" @@ -187,7 +187,6 @@ #. Description #. :sl5: #: ../s390-netdevice.templates:8001 -#, fuzzy msgid "" "The configured parameters are:\n" " channels = ${device0}, ${device1}, ${device2}\n" @@ -197,7 +196,6 @@ "設定されたパラメータは次のとおりです:\n" " チャネル = ${device0}, ${device1}, ${device2}\n" " ポート = ${port}\n" -" ポート名 = ${portname}\n" " レイヤ2 = ${layer2}" #. Type: error diff -Nru s390-netdevice-0.0.40ubuntu1/debian/po/nl.po s390-netdevice-0.0.42ubuntu1/debian/po/nl.po --- s390-netdevice-0.0.40ubuntu1/debian/po/nl.po 2016-02-07 00:35:01.000000000 +0000 +++ s390-netdevice-0.0.42ubuntu1/debian/po/nl.po 2016-02-24 11:13:16.000000000 +0000 @@ -28,7 +28,7 @@ "Project-Id-Version: debian-installer/sublevel1\n" "Report-Msgid-Bugs-To: s390-netdevice@packages.debian.org\n" "POT-Creation-Date: 2016-01-29 22:01+0000\n" -"PO-Revision-Date: 2016-01-13 19:51+0100\n" +"PO-Revision-Date: 2016-02-01 22:00+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" "Language: nl\n" @@ -191,7 +191,6 @@ #. Description #. :sl5: #: ../s390-netdevice.templates:8001 -#, fuzzy msgid "" "The configured parameters are:\n" " channels = ${device0}, ${device1}, ${device2}\n" @@ -201,7 +200,6 @@ "De ingestelde parameters zijn:\n" " kanalen = ${device0},${device1},${device2}\n" " poort = ${port}\n" -" poortnaam = ${portname}\n" " layer2 = ${layer2}" #. Type: error diff -Nru s390-netdevice-0.0.40ubuntu1/debian/po/th.po s390-netdevice-0.0.42ubuntu1/debian/po/th.po --- s390-netdevice-0.0.40ubuntu1/debian/po/th.po 2016-02-07 00:35:01.000000000 +0000 +++ s390-netdevice-0.0.42ubuntu1/debian/po/th.po 2016-02-24 11:13:16.000000000 +0000 @@ -4,7 +4,7 @@ # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # # Thai translation of debian-installer. -# Copyright (C) 2006-2015 Software in the Public Interest, Inc. +# Copyright (C) 2006-2016 Software in the Public Interest, Inc. # This file is distributed under the same license as debian-installer. # Theppitak Karoonboonyanan , 2006-2015. # @@ -16,14 +16,14 @@ # Alastair McKinstry , 2002, 2004 # Translations from KDE: # Thanomsub Noppaburana -# Theppitak Karoonboonyanan , 2005-2015 +# Theppitak Karoonboonyanan , 2005-2016 # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: s390-netdevice@packages.debian.org\n" "POT-Creation-Date: 2016-01-29 22:01+0000\n" -"PO-Revision-Date: 2015-11-29 16:55+0700\n" +"PO-Revision-Date: 2016-02-21 11:19+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" "Language: th\n" @@ -182,7 +182,6 @@ #. Description #. :sl5: #: ../s390-netdevice.templates:8001 -#, fuzzy msgid "" "The configured parameters are:\n" " channels = ${device0}, ${device1}, ${device2}\n" @@ -192,7 +191,6 @@ "ค่าที่ตั้งไว้คือ:\n" " ช่อง = ${device0}, ${device1}, ${device2}\n" " พอร์ต = ${port}\n" -" ชื่อพอร์ต = ${portname}\n" " layer2 = ${layer2}" #. Type: error diff -Nru s390-netdevice-0.0.40ubuntu1/debian/po/tr.po s390-netdevice-0.0.42ubuntu1/debian/po/tr.po --- s390-netdevice-0.0.40ubuntu1/debian/po/tr.po 2016-02-07 00:35:01.000000000 +0000 +++ s390-netdevice-0.0.42ubuntu1/debian/po/tr.po 2016-02-24 11:13:16.000000000 +0000 @@ -29,7 +29,7 @@ "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: s390-netdevice@packages.debian.org\n" "POT-Creation-Date: 2016-01-29 22:01+0000\n" -"PO-Revision-Date: 2015-09-23 18:35+0300\n" +"PO-Revision-Date: 2016-02-12 14:46+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian L10N Turkish\n" "Language: tr\n" @@ -191,7 +191,6 @@ #. Description #. :sl5: #: ../s390-netdevice.templates:8001 -#, fuzzy msgid "" "The configured parameters are:\n" " channels = ${device0}, ${device1}, ${device2}\n" @@ -199,10 +198,9 @@ " layer2 = ${layer2}" msgstr "" "Ayarlanan parametreler:\n" -" kanallar (channels) = ${device0}, ${device1}, ${device2}\n" -" port = ${port}\n" -" port adı (portname) = ${portname}\n" -" katman2 (layer2) = ${layer2}" +" channels = ${device0}, ${device1}, ${device2}\n" +" port = ${port}\n" +" layer2 = ${layer2}" #. Type: error #. Description