Imported Upstream version 17.25.2

diff --git a/VERSION.cmake b/VERSION.cmake
index fed1492..f700ca6 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "22")
 SET(LIBZYPP_MINOR "25")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 17.25.1 (22)
+# LAST RELEASED: 17.25.2 (22)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 660fc27..01e6a7a 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Oct  7 12:05:33 CEST 2020 - ma@suse.de
+
+- Bump version to force rebuild against a fixed libsolv.
+  (bsc#1177238, bsc#1177275)
+- version 17.25.2 (22)
+
+-------------------------------------------------------------------
 Fri Sep 25 13:39:38 CEST 2020 - ma@suse.de
 
 - Fix bsc#1176902: When kernel-rt has been installed, the

diff --git a/po/fr.po b/po/fr.po
index ef735ac..4d20e42 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -20,10 +20,10 @@ msgstr ""
 "Project-Id-Version: zypp.fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-09-18 16:45+0200\n"
-"PO-Revision-Date: 2020-02-20 18:54+0000\n"
-"Last-Translator: Christine Gabriel <christine@stoquart.com>\n"
-"Language-Team: French <https://l10n.opensuse.org/projects/libzypp/master/fr/"
-">\n"
+"PO-Revision-Date: 2020-09-30 12:48+0000\n"
+"Last-Translator: Antoine Belvire <antoine.belvire@opensuse.org>\n"
+"Language-Team: French <https://l10n.opensuse.org/projects/libzypp/master/fr/>"
+"\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4944,6 +4944,8 @@ msgid ""
 "Download (curl) error for '%s':\n"
 "Error code: %s\n"
 msgstr ""
+"Erreur de téléchargement (curl) pour « %s » :\n"
+"Code d'erreur : %s\n"
 
 #: zypp/zyppng/media/network/networkrequesterror.cc:138
 #, c-format, boost-format
@@ -4951,6 +4953,8 @@ msgid ""
 "Download (curl) error for '%s':\n"
 "Unable to retrieve HTTP response\n"
 msgstr ""
+"Erreur de téléchargement (curl) pour « %s » :\n"
+"Impossible d'obtenir une réponse HTTP\n"
 
 #~ msgid "Can't open lock file: %s"
 #~ msgstr "Impossible d'ouvrir le fichier verrouillé : %s"

diff --git a/po/it.po b/po/it.po
index e407ef4..cef428e 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-09-18 16:45+0200\n"
-"PO-Revision-Date: 2020-08-24 00:40+0000\n"
-"Last-Translator: Michael Andres <ma@suse.com>\n"
+"PO-Revision-Date: 2020-09-30 19:48+0000\n"
+"Last-Translator: Paolo Za <zapaolo@email.it>\n"
 "Language-Team: Italian <https://l10n.opensuse.org/projects/libzypp/master/it/"
 ">\n"
 "Language: it\n"
@@ -4920,6 +4920,8 @@ msgid ""
 "Download (curl) error for '%s':\n"
 "Error code: %s\n"
 msgstr ""
+"Errore di download (curl) per '%s':\n"
+"Codice di errore %s\n"
 
 #: zypp/zyppng/media/network/networkrequesterror.cc:138
 #, c-format, boost-format
@@ -4927,6 +4929,8 @@ msgid ""
 "Download (curl) error for '%s':\n"
 "Unable to retrieve HTTP response\n"
 msgstr ""
+"Errore di download (curl) per '%s':\n"
+"Impossibile recuperare la risposta HTTP\n"
 
 #~ msgid "Can't open lock file: %s"
 #~ msgstr "Impossibile aprire file bloccato: %s"