Author: mlandres
Date: 2015-05-07 16:57:02 +0200 (Thu, 07 May 2015)
New Revision: 91625
Modified:
branches/SLE11-SP4/lcn/50-pot/zypp.pot
Log:
c39325084d3cb680decc8ba7763e3c04576b014f (HEAD, tag: 9.38.7, origin/SuSE-SLE-11-SP3-Branch, SuSE-SLE-11-SP3-Branch) changes 9.38.7 (8)
Modified: branches/SLE11-SP4/lcn/50-pot/zypp.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/zypp.pot 2015-05-07 14:21:12 UTC (rev 91624)
+++ branches/SLE11-SP4/lcn/50-pot/zypp.pot 2015-05-07 14:57:02 UTC (rev 91625)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-01 01:15+0200\n"
+"POT-Creation-Date: 2015-05-07 16:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -124,7 +124,7 @@
#. report additional rpm output in finish
#. TranslatorExplanation Text is followed by a ':' and the actual output.
-#: zypp/target/rpm/RpmDb.cc:1954 zypp/target/rpm/RpmDb.cc:2101
+#: zypp/target/rpm/RpmDb.cc:1956 zypp/target/rpm/RpmDb.cc:2103
msgid "Additional rpm output"
msgstr ""
@@ -342,7 +342,7 @@
msgstr ""
#. !\todo add comma to the message for the next release
-#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1652
+#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1640
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -848,7 +848,7 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: zypp/target/rpm/RpmDb.cc:1744
+#: zypp/target/rpm/RpmDb.cc:1745
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
@@ -1370,7 +1370,7 @@
msgid "Failed to download %s from %s"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:1101
+#: zypp/target/rpm/RpmDb.cc:1102
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1393,7 +1393,7 @@
msgid "Failed to read directory '%s'"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:1172
+#: zypp/target/rpm/RpmDb.cc:1173
#, c-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -3263,8 +3263,8 @@
#. TranslatorExplanation after semicolon is error message
#. TranslatorExplanation the colon is followed by an error message
-#: zypp/target/rpm/RpmDb.cc:824 zypp/target/rpm/RpmDb.cc:1940
-#: zypp/target/rpm/RpmDb.cc:2087
+#: zypp/target/rpm/RpmDb.cc:824 zypp/target/rpm/RpmDb.cc:1942
+#: zypp/target/rpm/RpmDb.cc:2089
msgid "RPM failed: "
msgstr ""
@@ -4234,7 +4234,7 @@
msgid "Virgin Islands, U.S."
msgstr ""
-#: zypp/media/MediaCurl.cc:977
+#: zypp/media/MediaCurl.cc:965
msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired."
msgstr ""
@@ -4401,7 +4401,7 @@
msgid "conflicting requests"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:2243
+#: zypp/target/rpm/RpmDb.cc:2245
#, c-format
msgid "created backup %s"
msgstr ""
@@ -4425,11 +4425,6 @@
msgid "do not ask to install a solvable providing %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1135
-#, c-format
-msgid "do not forbid installation of %s"
-msgstr ""
-
#: zypp/solver/detail/SATResolver.cc:1115
#: zypp/solver/detail/SATResolver.cc:1151
#, c-format
@@ -4441,11 +4436,6 @@
msgid "do not install most recent version of %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1110
-#, c-format
-msgid "do not keep %s installed"
-msgstr ""
-
#: zypp/solver/detail/SATResolver.cc:1300
#, c-format
msgid "downgrade of %s to %s"
@@ -4527,19 +4517,29 @@
msgid "problem with installed package %s"
msgstr ""
+#: zypp/solver/detail/SATResolver.cc:1135
+#, c-format
+msgid "remove lock to allow installation of %s"
+msgstr ""
+
+#: zypp/solver/detail/SATResolver.cc:1110
+#, c-format
+msgid "remove lock to allow removal of %s"
+msgstr ""
+
#: zypp/solver/detail/SATResolver.cc:1327
#, c-format
msgid "replacement of %s with %s"
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1926
+#: zypp/target/rpm/RpmDb.cc:1928
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1928
+#: zypp/target/rpm/RpmDb.cc:1930
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4547,13 +4547,13 @@
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1921
+#: zypp/target/rpm/RpmDb.cc:1923
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1923
+#: zypp/target/rpm/RpmDb.cc:1925
#, c-format
msgid ""
"rpm saved %s as %s.\n"
