Imported Upstream version 17.1.2

diff --git a/VERSION.cmake b/VERSION.cmake
index e8ae0f5..82d4621 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "0")
 SET(LIBZYPP_MINOR "1")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 17.1.1 (0)
+# LAST RELEASED: 17.1.2 (0)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 7ca118f..b18c640 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Feb  2 16:07:08 CET 2018 - ma@suse.de
+
+- Fix crash when installing broken rpm packages (bsc#1078284)
+- Testcase: Minor fix writing update testcases
+- version 17.1.2 (0)
+
+-------------------------------------------------------------------
 Mon Jan 15 17:01:33 CET 2018 - ma@suse.de
 
 - Adapt rpm package verification to changes in rpm-4.14 (bsc#1076018)

diff --git a/po/ar.po b/po/ar.po
index eecc23b..e466591 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-12-18 07:15+0000\n"
-"Last-Translator: mohammad alhargan <malham1@gmail.com>\n"
+"PO-Revision-Date: 2018-01-30 22:00+0000\n"
+"Last-Translator: George Yacoub <george.yacoub@arabize.com>\n"
 "Language-Team: Arabic <https://l10n.opensuse.org/projects/libzypp/master/ar/>"
 "\n"
 "Language: ar\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 2.17.1\n"
+"X-Generator: Weblate 2.18\n"
 "X-Language-English: Arabic\n"
 "X-Language-Local: Arabic*\n"
 
@@ -729,7 +729,7 @@ msgstr "موناكو"
 #. :MCO:492:
 #: zypp/CountryCode.cc:295
 msgid "Moldova"
-msgstr "مولدافا"
+msgstr "مولدوفا"
 
 #. :MDA:498:
 #: zypp/CountryCode.cc:296
@@ -1285,7 +1285,7 @@ msgstr "يتطلب"
 
 #: zypp/Dep.cc:99
 msgid "Conflicts"
-msgstr "يتعارض"
+msgstr "تعارضات"
 
 #: zypp/Dep.cc:100
 msgid "Obsoletes"
@@ -1310,7 +1310,7 @@ msgstr "يُضيف"
 #: zypp/ExternalProgram.cc:261
 #, c-format, boost-format
 msgid "Can't open pty (%s)."
-msgstr "تعذر فتح pty (%s)."
+msgstr "تعذر فتح pty (‏%s)."
 
 #: zypp/ExternalProgram.cc:272
 #, c-format, boost-format
@@ -1320,17 +1320,19 @@ msgstr "لا يمكن فتح المسار (%s)."
 #: zypp/ExternalProgram.cc:353
 #, c-format, boost-format
 msgid "Can't chroot to '%s' (%s)."
-msgstr "Ù\84ا Ù\8aÙ\85Ù\83Ù\86 إجراء chroot Ù\84تغÙ\8aÙ\8aر اÙ\84دÙ\84Ù\8aÙ\84 اÙ\84جذر Ø¥Ù\84Ù\89 '%s' (%s)."
+msgstr "Ù\84ا Ù\8aÙ\85Ù\83Ù\86 تغÙ\8aÙ\8aر اÙ\84جذر اÙ\84اÙ\81تراضÙ\8a Ø¥Ù\84Ù\89 '%s' (â\80\8f%s)."
 
 #: zypp/ExternalProgram.cc:363
 #, c-format, boost-format
 msgid "Can't chdir to '%s' inside chroot '%s' (%s)."
-msgstr "لا يمكن إجراء chdir إلى '%s' داخل chroot تغيير الدليل الجذر '%s' (%s)."
+msgstr ""
+"لا يمكن إجراء تغيير الدليل الافتراضي إلى '%s' داخل تغيير الجذر الافتراضي '%"
+"s' (‏%s)."
 
 #: zypp/ExternalProgram.cc:364
 #, c-format, boost-format
 msgid "Can't chdir to '%s' (%s)."
-msgstr "Ù\84ا Ù\8aÙ\85Ù\83Ù\86 إجراء chdir إلى '%s' (%s)."
+msgstr "Ù\84ا Ù\8aÙ\85Ù\83Ù\86 تغÙ\8aÙ\8aر اÙ\84دÙ\84Ù\8aÙ\84 اÙ\84اÙ\81تراضÙ\8a إلى '%s' (%s)."
 
 #. don't want to get here
 #: zypp/ExternalProgram.cc:376
@@ -1839,18 +1841,21 @@ msgstr "الكورسيكية"
 #: zypp/LanguageCode.cc:353
 msgid "Creoles and Pidgins, English-Based (Other)"
 msgstr ""
-"الكرييولى واللغات المبسطة الأخرى للتفاهم بين الشعوب على أساس الأنجليزية"
+"الكرييولى واللغات المبسطة الأخرى للتفاهم بين الشعوب على أساس الإنجليزية "
+"(أخرى)"
 
 #. language code: cpf
 #: zypp/LanguageCode.cc:355
 msgid "Creoles and Pidgins, French-Based (Other)"
-msgstr "الكرييولى واللغات المبسطة الأخرى للتفاهم بين الشعوب على أساس الفرنسية"
+msgstr ""
+"الكرييولى واللغات المبسطة الأخرى للتفاهم بين الشعوب على أساس الفرنسية (أخرى)"
 
 #. language code: cpp
 #: zypp/LanguageCode.cc:357
 msgid "Creoles and Pidgins, Portuguese-Based (Other)"
 msgstr ""
-"الكرييولى واللغات المبسطة الأخرى للتفاهم بين الشعوب على أساس البرتغالية"
+"الكرييولى واللغات المبسطة الأخرى للتفاهم بين الشعوب على أساس البرتغالية "
+"(أخرى)"
 
 #. language code: cre cr
 #: zypp/LanguageCode.cc:359
@@ -3818,7 +3823,7 @@ msgstr "تعذر فتح الملف '%s' للكتابة."
 #: zypp/RepoManager.cc:871
 #, boost-format
 msgid "Unknown service '%1%': Removing orphaned service repository '%2%'"
-msgstr "خدمة غير معروفة '%1%': إزالة مخزن الخدمة الوحيد '%2%'"
+msgstr "خدÙ\85Ø© غÙ\8aر Ù\85عرÙ\88Ù\81Ø© '%1%': تتÙ\85 اÙ\84Ø¢Ù\86 إزاÙ\84Ø© Ù\85خزÙ\86 اÙ\84خدÙ\85Ø© اÙ\84Ù\88Ø­Ù\8aد '%2%'"
 
 #. we will throw this later if no URL checks out fine
 #: zypp/RepoManager.cc:1098
@@ -3843,7 +3848,7 @@ msgstr "لا يمكن إنشاء دليل لذاكرة التخزين المؤق
 #: zypp/RepoManager.cc:1300
 #, c-format, boost-format
 msgid "Building repository '%s' cache"
-msgstr "بناء الذاكرة المؤقتة لمخزن '%s'"
+msgstr "يتم الآن بناء الذاكرة المؤقتة لمخزن '%s'"
 
 #: zypp/RepoManager.cc:1320
 #, c-format, boost-format
@@ -4170,7 +4175,7 @@ msgstr "الوسيط '%s' مستخدَم بواسطة مثيل آخر"
 
 #: zypp/media/MediaException.cc:162
 msgid "Cannot eject any media"
-msgstr "لا يمكن إخراج أية وسائط"
+msgstr "لا يمكن إخراج أي وسائط"
 
 #: zypp/media/MediaException.cc:164
 #, c-format, boost-format
@@ -4562,7 +4567,7 @@ msgstr "تجاهل تحذير النظام المعطل"
 #: zypp/solver/detail/SATResolver.cc:1227
 #, c-format, boost-format
 msgid "do not ask to install a solvable providing %s"
-msgstr "عدم طلب تثبيت كل المشاكل القابلة للحل التي توفر %s"
+msgstr "عدم طلب تثبيت المشاكل القابلة للحل التي توفر %s"
 
 #: zypp/solver/detail/SATResolver.cc:1249
 #, c-format, boost-format
@@ -4723,7 +4728,7 @@ msgstr "لم يتم توقيع الحزمة!"
 #: zypp/target/rpm/RpmDb.cc:1896
 #, c-format, boost-format
 msgid "Changed configuration files for %s:"
-msgstr "ملفات التكوين التي تم تغييرها لـ  %s 1:"
+msgstr "ملفات التكوين التي تم تغييرها لـ %s:"
 
 #. %s = filenames
 #: zypp/target/rpm/RpmDb.cc:2071
@@ -4849,7 +4854,7 @@ msgstr "يعتبر مخطط Url مكونًا مطلوبًا"
 #: zypp/url/UrlBase.cc:830
 #, c-format, boost-format
 msgid "Invalid Url scheme '%s'"
-msgstr "مخطط Url غير صالح '%s'"
+msgstr "مخطط Url '%s' غير صالح"
 
 #: zypp/url/UrlBase.cc:949
 msgid "Url scheme does not allow a username"

diff --git a/po/es.po b/po/es.po
index fc9019a..8937c8e 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -17,16 +17,16 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-08-28 07:53+0000\n"
-"Last-Translator: jc sl <trcs@gmx.com>\n"
-"Language-Team: Spanish <https://l10n.opensuse.org/projects/libzypp/master/es/"
-">\n"
+"PO-Revision-Date: 2018-01-25 19:07+0000\n"
+"Last-Translator: Juan Sarria <juansarriam@gmail.com>\n"
+"Language-Team: Spanish "
+"<https://l10n.opensuse.org/projects/libzypp/master/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.13.1\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -1370,9 +1370,8 @@ msgstr ""
 "Se intentó importar una clave que no existe (%s) al almacén de claves %s"
 
 #: zypp/KeyRing.cc:583
-#, fuzzy
 msgid "Failed to import key."
-msgstr "Error al importar la clave pública %1%"
+msgstr "Error al importar la clave."
 
 #: zypp/KeyRing.cc:606
 msgid "Failed to delete key."
@@ -3753,13 +3752,13 @@ msgstr "no caduca"
 #: zypp/PublicKey.cc:65
 #, boost-format
 msgid "expired: %1%"
-msgstr ""
+msgstr "caducado: %1%"
 
 #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12"
 #: zypp/PublicKey.cc:70
 #, boost-format
 msgid "expires: %1%"
-msgstr ""
+msgstr "caduca: %1%"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:79

diff --git a/po/hu.po b/po/hu.po
index 093d8ff..7612a82 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -19,16 +19,16 @@ msgstr ""
 "Project-Id-Version: zypp.hu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-04-21 14:59+0000\n"
-"Last-Translator: Janos Stampf <jstampf@consell.hu>\n"
-"Language-Team: Hungarian <https://l10n.opensuse.org/projects/libzypp/master/"
-"hu/>\n"
+"PO-Revision-Date: 2018-01-29 18:33+0000\n"
+"Last-Translator: Robert Taisz <robert.taisz@emerald.hu>\n"
+"Language-Team: Hungarian "
+"<https://l10n.opensuse.org/projects/libzypp/master/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.6\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -1517,9 +1517,8 @@ msgid "Tried to import not existent key %s into keyring %s"
 msgstr "Kísérlet nem létező kulcs (%s) importálására a(z) %s kulcstárban"
 
 #: zypp/KeyRing.cc:583
-#, fuzzy
 msgid "Failed to import key."
-msgstr "Nem sikerült a(z) %1% fájlból importálni a publikus kulcsot"
+msgstr "Nem sikerült importálni a kulcsot."
 
 #: zypp/KeyRing.cc:606
 msgid "Failed to delete key."
@@ -4012,21 +4011,20 @@ msgstr "A rendszer a következő műveleteket hajtja végre:"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:60
-#, fuzzy
 msgid "does not expire"
-msgstr "(nem jár le)"
+msgstr "nem jár le"
 
 #. translators: an annotation to a gpg keys expiry date: "expired: 1999-04-12"
 #: zypp/PublicKey.cc:65
 #, boost-format
 msgid "expired: %1%"
-msgstr ""
+msgstr "lejárt: %1%"
 
 #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12"
 #: zypp/PublicKey.cc:70
 #, boost-format
 msgid "expires: %1%"
-msgstr ""
+msgstr "lejár: %1%"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:79
@@ -4141,7 +4139,7 @@ msgstr "Nem kezelt tárolótípus"
 #: zypp/RepoManager.cc:1432 zypp/RepoManager.cc:2488
 #, c-format, boost-format
 msgid "Error trying to read from '%s'"
-msgstr "Hiba történt a(z) '%s' beolvasása közben."
+msgstr "Hiba történt a következőből való olvasás során: \"%s\""
 
 #. TranslatorExplanation '%s' is an URL
 #: zypp/RepoManager.cc:1485 zypp/RepoManager.cc:2496
@@ -5001,7 +4999,7 @@ msgstr "A(z) %1% publikus kulcs eltávolítása sikertelen"
 
 #: zypp/target/rpm/RpmDb.cc:1596
 msgid "Package is not signed!"
-msgstr ""
+msgstr "A csomag nincs aláírva."
 
 # modules/dialup/dialup.ycp:231 modules/dialup/dialup.ycp:246
 # modules/dialup/dialup.ycp:259
@@ -5093,7 +5091,7 @@ msgstr "A fájl nem létezik, vagy nem ellenőrizhető az aláírása"
 #. translators: possible rpm package signature check result [brief]
 #: zypp/target/rpm/RpmDb.cc:2424
 msgid "File is unsigned"
-msgstr ""
+msgstr "A fájl nincs aláírva"
 
 #: zypp/thread/Mutex.cc:33
 msgid "Can't initialize mutex attributes"

diff --git a/po/ja.po b/po/ja.po
index b00f232..964ae10 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-12-01 11:06+0000\n"
+"PO-Revision-Date: 2018-01-25 08:03+0000\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese "
 "<https://l10n.opensuse.org/projects/libzypp/master/ja/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.17.1\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -4086,7 +4086,7 @@ msgstr "不正なメディアの接続点"
 #: zypp/media/MediaException.cc:77
 #, c-format, boost-format
 msgid "Download (curl) initialization failed for '%s'"
-msgstr "「%s」のダウンロード(curl)初期化が失敗しました"
+msgstr "「%s」のダウンロード(curl)準備が失敗しました"
 
 #: zypp/media/MediaException.cc:82
 #, c-format, boost-format
@@ -4662,11 +4662,11 @@ msgstr "HalContextが接続されていません"
 
 #: zypp/target/hal/HalContext.cc:127
 msgid "HalDrive not initialized"
-msgstr "HalDriveが初期化されていません"
+msgstr "HalDriveが準備されていません"
 
 #: zypp/target/hal/HalContext.cc:137
 msgid "HalVolume not initialized"
-msgstr "HalVolumeが初期化されていません"
+msgstr "HalVolumeが準備されていません"
 
 #: zypp/target/hal/HalContext.cc:229
 msgid "Unable to create dbus connection"
@@ -4682,8 +4682,7 @@ msgstr "libhal_set_dbus_connection:dbus接続を設定できません"
 
 #: zypp/target/hal/HalContext.cc:272
 msgid "Unable to initalize HAL context -- hald not running?"
-msgstr ""
-"HALコンテキストを初期化できません。haldが動作していない可能性があります。"
+msgstr "HALコンテキストを準備できません。haldが動作していない可能性があります。"
 
 #: zypp/target/hal/HalContext.cc:851
 msgid "Not a CDROM drive"
@@ -4799,7 +4798,7 @@ msgstr "ファイルに署名がありません"
 
 #: zypp/thread/Mutex.cc:33
 msgid "Can't initialize mutex attributes"
-msgstr "相互排他的属性を初期化できません"
+msgstr "相互排他属性を準備できません"
 
 #: zypp/thread/Mutex.cc:40
 msgid "Can't set recursive mutex attribute"
@@ -4807,7 +4806,7 @@ msgstr "再帰相互排他的属性を設定できません"
 
 #: zypp/thread/Mutex.cc:47
 msgid "Can't initialize recursive mutex"
-msgstr "再帰相互排他的属性を初期化できません"
+msgstr "再帰相互排他属性を準備できません"
 
 #: zypp/thread/Mutex.cc:77
 msgid "Can't acquire the mutex lock"

diff --git a/po/ko.po b/po/ko.po
index e476b7d..59001b1 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,16 +9,16 @@ msgstr ""
 "Project-Id-Version: zypp.ko\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-04-18 02:48+0000\n"
+"PO-Revision-Date: 2018-01-29 02:49+0000\n"
 "Last-Translator: Hwajin Kim <hwajin.kim@e4net.net>\n"
-"Language-Team: Korean <https://l10n.opensuse.org/projects/libzypp/master/ko/"
-">\n"
+"Language-Team: Korean <https://l10n.opensuse.org/projects/libzypp/master/ko/>"
+"\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.6\n"
+"X-Generator: Weblate 2.18\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
@@ -1437,9 +1437,8 @@ msgid "Tried to import not existent key %s into keyring %s"
 msgstr "기존 키 %s을(를) 키링 %s(으)로 임포트하려고 했습니다."
 
 #: zypp/KeyRing.cc:583
-#, fuzzy
 msgid "Failed to import key."
-msgstr "%1% 파일에서 공용 키를 임포트하지 못했습니다."
+msgstr "키를 임포트하지 못했습니다."
 
 #: zypp/KeyRing.cc:606
 msgid "Failed to delete key."
@@ -3921,21 +3920,20 @@ msgstr "다음 작업이 수행됨:"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:60
-#, fuzzy
 msgid "does not expire"
-msgstr "(만료되지 않음)"
+msgstr "만료되지 않음"
 
 #. translators: an annotation to a gpg keys expiry date: "expired: 1999-04-12"
 #: zypp/PublicKey.cc:65
 #, boost-format
 msgid "expired: %1%"
-msgstr ""
+msgstr "만료됨: 1%"
 
 #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12"
 #: zypp/PublicKey.cc:70
 #, boost-format
 msgid "expires: %1%"
-msgstr ""
+msgstr "만료: %1%"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:79
@@ -4896,7 +4894,7 @@ msgstr "%1% 공용 키를 제거하지 못했습니다."
 
 #: zypp/target/rpm/RpmDb.cc:1596
 msgid "Package is not signed!"
-msgstr ""
+msgstr "패키지가 서명되지 않았습니다!"
 
 #  progress stage
 #. Translator: %s = name of an rpm package. A list of diffs follows
@@ -4983,7 +4981,7 @@ msgstr "파일이 존재하지 않거나 서명을 확인할 수 없음"
 #. translators: possible rpm package signature check result [brief]
 #: zypp/target/rpm/RpmDb.cc:2424
 msgid "File is unsigned"
-msgstr ""
+msgstr "파일이 서명되지 않음"
 
 #: zypp/thread/Mutex.cc:33
 msgid "Can't initialize mutex attributes"

diff --git a/po/tr.po b/po/tr.po
index c0252da..9219a8c 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,14 +11,16 @@ msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2011-11-23 19:47+0200\n"
-"Last-Translator: Huseyin <huseyinaksu95@gmail.com>\n"
-"Language-Team: turkish <i18n@suse.de>\n"
-"Language: \n"
+"PO-Revision-Date: 2018-01-29 14:07+0000\n"
+"Last-Translator: Özgür Ateş Fırat <ozgursebahat@mail.ru>\n"
+"Language-Team: Turkish "
+"<https://l10n.opensuse.org/projects/libzypp/master/tr/>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -1476,8 +1478,9 @@ msgid "Provides"
 msgstr ""
 
 #: zypp/Dep.cc:97
+#, fuzzy
 msgid "Prerequires"
-msgstr ""
+msgstr "Öngereklilikler"
 
 # clients/hwinfo.ycp:54
 #: zypp/Dep.cc:98

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 578f257..de24662 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,16 +12,16 @@ msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-04-20 02:18+0000\n"
-"Last-Translator: Emily Dong <Emily.Dong@excel-gits.com>\n"
-"Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/libzypp/"
-"master/zh_CN/>\n"
+"PO-Revision-Date: 2018-01-23 12:01+0000\n"
+"Last-Translator: Grace Yu <grace.yu@excel-gits.com>\n"
+"Language-Team: Chinese (China) "
+"<https://l10n.opensuse.org/projects/libzypp/master/zh_CN/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.6\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -32,7 +32,7 @@ msgstr "Hal 例外"
 #: zypp/CheckSum.cc:136
 #, c-format, boost-format
 msgid "Dubious type '%s' for %u byte checksum '%s'"
-msgstr "可疑类型 '%s'，在 %u 字节，校验和 '%s'"
+msgstr "“%s”对 %u 属于错误类型，字节校验和“%s”"
 
 #: zypp/CountryCode.cc:50
 msgid "Unknown country: "
@@ -1359,9 +1359,8 @@ msgid "Tried to import not existent key %s into keyring %s"
 msgstr "尝试导入尚不存在的密钥 %s 到密钥环 %s"
 
 #: zypp/KeyRing.cc:583
-#, fuzzy
 msgid "Failed to import key."
-msgstr "从文件 %1% 中导入公钥失败"
+msgstr "导入密钥失败。"
 
 #: zypp/KeyRing.cc:606
 msgid "Failed to delete key."
@@ -3732,21 +3731,20 @@ msgstr "将执行以下动作："
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:60
-#, fuzzy
 msgid "does not expire"
-msgstr "（未过期）"
+msgstr "未过期"
 
 #. translators: an annotation to a gpg keys expiry date: "expired: 1999-04-12"
 #: zypp/PublicKey.cc:65
 #, boost-format
 msgid "expired: %1%"
-msgstr ""
+msgstr "过期日期：%1%"
 
 #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12"
 #: zypp/PublicKey.cc:70
 #, boost-format
 msgid "expires: %1%"
-msgstr ""
+msgstr "过期日期：%1%"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:79
@@ -4704,7 +4702,7 @@ msgstr "移除公钥 %1% 失败"
 
 #: zypp/target/rpm/RpmDb.cc:1596
 msgid "Package is not signed!"
-msgstr ""
+msgstr "未签署包！"
 
 #. Translator: %s = name of an rpm package. A list of diffs follows
 #. this message.
@@ -4789,7 +4787,7 @@ msgstr "文件不存在或无法检查其签名"
 #. translators: possible rpm package signature check result [brief]
 #: zypp/target/rpm/RpmDb.cc:2424
 msgid "File is unsigned"
-msgstr ""
+msgstr "未签署文件"
 
 #: zypp/thread/Mutex.cc:33
 msgid "Can't initialize mutex attributes"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 137c63e..007bfa6 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,16 +12,16 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-08-09 14:53+0000\n"
-"Last-Translator: Ramax Lo <ramaxlo@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) <https://l10n.opensuse.org/projects/libzypp/"
-"master/zh_TW/>\n"
+"PO-Revision-Date: 2018-02-02 06:34+0000\n"
+"Last-Translator: Emily Dong <Emily.Dong@excel-gits.com>\n"
+"Language-Team: Chinese (Taiwan) "
+"<https://l10n.opensuse.org/projects/libzypp/master/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.13.1\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -1359,9 +1359,8 @@ msgid "Tried to import not existent key %s into keyring %s"
 msgstr "嘗試將不存在的金鑰 %s 匯入金鑰圈 %s"
 
 #: zypp/KeyRing.cc:583
-#, fuzzy
 msgid "Failed to import key."
-msgstr "從檔案 %1% 輸入公用金鑰失敗"
+msgstr "輸入金鑰失敗。"
 
 #: zypp/KeyRing.cc:606
 msgid "Failed to delete key."
@@ -3732,21 +3731,20 @@ msgstr "將執行以下操作："
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:60
-#, fuzzy
 msgid "does not expire"
-msgstr "(未過期)"
+msgstr "不過期"
 
 #. translators: an annotation to a gpg keys expiry date: "expired: 1999-04-12"
 #: zypp/PublicKey.cc:65
 #, boost-format
 msgid "expired: %1%"
-msgstr ""
+msgstr "過期日期：%1%"
 
 #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12"
 #: zypp/PublicKey.cc:70
 #, boost-format
 msgid "expires: %1%"
-msgstr ""
+msgstr "過期日期：%1%"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:79

diff --git a/zypp/PathInfo.cc b/zypp/PathInfo.cc
index 67eaca5..cf1efa7 100644 (file)
--- a/zypp/PathInfo.cc
+++ b/zypp/PathInfo.cc
@@ -10,9 +10,9 @@
  *
 */
 
-#include <sys/types.h> // for ::minor, ::major macros
 #include <utime.h>     // for ::utime
 #include <sys/statvfs.h>
+#include <sys/sysmacros.h> // for ::minor, ::major macros
 
 #include <iostream>
 #include <fstream>

diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc
index f433b66..e42d88d 100644 (file)
--- a/zypp/solver/detail/Testcase.cc
+++ b/zypp/solver/detail/Testcase.cc
@@ -603,8 +603,8 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver
     control.addUpgradeRepos( resolver.upgradeRepos() );
 
     control.addTagIf( "distupgrade",   resolver.isUpgradeMode() );
-    control.addTagIf( "verify",                resolver.isUpdateMode() );
-    control.addTagIf( "update",                resolver.isVerifyingMode() );
+    control.addTagIf( "update",                resolver.isUpdateMode() );
+    control.addTagIf( "verify",                resolver.isVerifyingMode() );
 
     return true;
 }

diff --git a/zypp/target/RpmPostTransCollector.cc b/zypp/target/RpmPostTransCollector.cc
index bc57404..a5bec21 100644 (file)
--- a/zypp/target/RpmPostTransCollector.cc
+++ b/zypp/target/RpmPostTransCollector.cc
@@ -53,6 +53,11 @@ namespace zypp
        bool collectScriptFromPackage( ManagedFile rpmPackage_r )
        {
          rpm::RpmHeader::constPtr pkg( rpm::RpmHeader::readPackage( rpmPackage_r, rpm::RpmHeader::NOVERIFY ) );
+         if ( ! pkg )
+         {
+           WAR << "Unexpectedly this is no package: " << rpmPackage_r << endl;
+           return false;
+         }
 
          std::string prog( pkg->tag_posttransprog() );
          if ( prog.empty() || prog == "<lua>" )        // by now leave lua to rpm