Author: mlandres
Date: 2015-07-23 01:11:21 +0200 (Thu, 23 Jul 2015)
New Revision: 92083
Modified:
trunk/lcn/50-pot/zypp.pot
Log:
a2e46f1c816322c1c0860f04541dafdeeee5362e (HEAD, origin/master, origin/HEAD, master) Factor out resolver internals
Modified: trunk/lcn/50-pot/zypp.pot
===================================================================
--- trunk/lcn/50-pot/zypp.pot 2015-07-22 11:43:53 UTC (rev 92082)
+++ trunk/lcn/50-pot/zypp.pot 2015-07-22 23:11:21 UTC (rev 92083)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: libzypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-21 01:13+0200\n"
+"POT-Creation-Date: 2015-07-23 01:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: zypp/solver/detail/SATResolver.cc:1145
+#: zypp/solver/detail/SATResolver.cc:1159
msgid ""
"\n"
"uninstallable providers: "
@@ -28,57 +28,57 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""
-#: zypp/target/TargetImpl.cc:442
+#: zypp/target/TargetImpl.cc:439
msgid " executed"
msgstr ""
-#: zypp/target/TargetImpl.cc:464
+#: zypp/target/TargetImpl.cc:461
msgid " execution failed"
msgstr ""
-#: zypp/target/TargetImpl.cc:591
+#: zypp/target/TargetImpl.cc:588
msgid " execution skipped while aborting"
msgstr ""
#. translators: We may find the same script content in files with different names.
#. Only the first occurence is executed, subsequent ones are skipped. It's a one-line
#. message for a log file. Preferably start translation with "%s"
-#: zypp/target/TargetImpl.cc:581
+#: zypp/target/TargetImpl.cc:578
#, c-format, boost-format
msgid "%s already executed as %s)"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1087
+#: zypp/solver/detail/SATResolver.cc:1101
#, c-format, boost-format
msgid "%s conflicts with %s provided by %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1040
+#: zypp/solver/detail/SATResolver.cc:1054
#, c-format, boost-format
msgid "%s does not belong to a distupgrade repository"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1044
+#: zypp/solver/detail/SATResolver.cc:1058
#, c-format, boost-format
msgid "%s has inferior architecture"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1072
+#: zypp/solver/detail/SATResolver.cc:1086
#, c-format, boost-format
msgid "%s is not installable"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1068
+#: zypp/solver/detail/SATResolver.cc:1082
#, c-format, boost-format
msgid "%s is provided by the system and cannot be erased"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1092
+#: zypp/solver/detail/SATResolver.cc:1106
#, c-format, boost-format
msgid "%s obsoletes %s provided by %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1133
+#: zypp/solver/detail/SATResolver.cc:1147
#, c-format, boost-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -118,7 +118,7 @@
msgid "Adangme"
msgstr ""
-#: zypp/RepoManager.cc:1505
+#: zypp/RepoManager.cc:1511
#, c-format, boost-format
msgid "Adding repository '%s'"
msgstr ""
@@ -129,7 +129,7 @@
#. report additional rpm output in finish
#. TranslatorExplanation Text is followed by a ':' and the actual output.
-#: zypp/target/rpm/RpmDb.cc:2058 zypp/target/rpm/RpmDb.cc:2205
+#: zypp/target/rpm/RpmDb.cc:2059 zypp/target/rpm/RpmDb.cc:2206
msgid "Additional rpm output"
msgstr ""
@@ -347,7 +347,7 @@
msgstr ""
#. !\todo add comma to the message for the next release
-#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1680
+#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1692
#, c-format, boost-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -611,7 +611,7 @@
msgid "Buginese"
msgstr ""
-#: zypp/RepoManager.cc:1205
+#: zypp/RepoManager.cc:1211
#, c-format, boost-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -684,12 +684,12 @@
msgid "Can't chroot to '%s' (%s)."
msgstr ""
-#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1219
+#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1225
#, c-format, boost-format
msgid "Can't create %s"
msgstr ""
-#: zypp/RepoManager.cc:1225
+#: zypp/RepoManager.cc:1231
#, c-format, boost-format
msgid "Can't create cache at %s - no writing permissions."
msgstr ""
@@ -699,7 +699,7 @@
msgstr ""
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:1682 zypp/RepoManager.cc:1871
+#: zypp/RepoManager.cc:1688 zypp/RepoManager.cc:1885
#, c-format, boost-format
msgid "Can't delete '%s'"
msgstr ""
@@ -710,11 +710,11 @@
msgid "Can't exec '%s' (%s)."
msgstr ""
-#: zypp/RepoManager.cc:1670 zypp/RepoManager.cc:1746
+#: zypp/RepoManager.cc:1676 zypp/RepoManager.cc:1752
msgid "Can't figure out where the repo is stored."
msgstr ""
-#: zypp/RepoManager.cc:1859 zypp/RepoManager.cc:2235
+#: zypp/RepoManager.cc:1873 zypp/RepoManager.cc:2249
msgid "Can't figure out where the service is stored."
msgstr ""
@@ -732,8 +732,8 @@
msgstr ""
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1544 zypp/RepoManager.cc:1626
-#: zypp/RepoManager.cc:1700 zypp/RepoManager.cc:1765 zypp/RepoManager.cc:1883
+#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1550 zypp/RepoManager.cc:1632
+#: zypp/RepoManager.cc:1706 zypp/RepoManager.cc:1771 zypp/RepoManager.cc:1897
#, c-format, boost-format
msgid "Can't open file '%s' for writing."
msgstr ""
@@ -867,7 +867,7 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: zypp/target/rpm/RpmDb.cc:1849
+#: zypp/target/rpm/RpmDb.cc:1850
#, c-format, boost-format
msgid "Changed configuration files for %s:"
msgstr ""
@@ -1297,9 +1297,9 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""
-#: zypp/target/TargetImpl.cc:646 zypp/target/TargetImpl.cc:666
-#: zypp/target/TargetImpl.cc:694 zypp/target/TargetImpl.cc:731
-#: zypp/target/TargetImpl.cc:739
+#: zypp/target/TargetImpl.cc:643 zypp/target/TargetImpl.cc:663
+#: zypp/target/TargetImpl.cc:691 zypp/target/TargetImpl.cc:728
+#: zypp/target/TargetImpl.cc:736
msgid "Error sending update message notification."
msgstr ""
@@ -1309,7 +1309,7 @@
#. on ftp file-not-found(bnc #335906). Instead we'll check another types
#. before throwing.
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1330 zypp/RepoManager.cc:2301
+#: zypp/RepoManager.cc:1336 zypp/RepoManager.cc:2315
#, c-format, boost-format
msgid "Error trying to read from '%s'"
msgstr ""
@@ -1349,7 +1349,7 @@
msgid "Ewondo"
msgstr ""
-#: zypp/RepoManager.cc:1289
+#: zypp/RepoManager.cc:1295
#, c-format, boost-format
msgid "Failed to cache repo (%d)."
msgstr ""
@@ -1358,7 +1358,7 @@
msgid "Failed to delete key."
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:1127
+#: zypp/target/rpm/RpmDb.cc:1128
#, c-format, boost-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1369,19 +1369,19 @@
msgstr ""
#. TranslatorExplanation %s = name of the package being processed.
-#: zypp/repo/PackageProvider.cc:385
+#: zypp/repo/PackageProvider.cc:386
#, c-format, boost-format
msgid "Failed to provide Package %s. Do you want to retry retrieval?"
msgstr ""
#. TranslatorExplanation '%s' is a pathname
-#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1417
+#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1423
#: zypp/repo/PluginServices.cc:49
#, c-format, boost-format
msgid "Failed to read directory '%s'"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:1198
+#: zypp/target/rpm/RpmDb.cc:1199
#, c-format, boost-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -1535,7 +1535,7 @@
msgstr ""
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2378
+#: zypp/target/rpm/RpmDb.cc:2379
msgid "File does not exist or signature can't be checked"
msgstr ""
@@ -1559,8 +1559,7 @@
msgid "Finno-Ugrian (Other)"
msgstr ""
-#: zypp/solver/detail/ProblemSolutionCombi.cc:85
-#: zypp/solver/detail/ProblemSolutionCombi.cc:104
+#: zypp/ProblemSolution.cc:114
msgid "Following actions will be done:"
msgstr ""
@@ -1845,8 +1844,8 @@
msgid "Hausa"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1058
-#: zypp/solver/detail/SATResolver.cc:1062
+#: zypp/solver/detail/SATResolver.cc:1072
+#: zypp/solver/detail/SATResolver.cc:1076
msgid "Have you enabled all requested repositories?"
msgstr ""
@@ -2004,8 +2003,8 @@
msgid "Ingush"
msgstr ""
-#: zypp/target/TargetImpl.cc:1362 zypp/target/TargetImpl.cc:1431
-#: zypp/target/TargetImpl.cc:1760
+#: zypp/target/TargetImpl.cc:1372 zypp/target/TargetImpl.cc:1441
+#: zypp/target/TargetImpl.cc:1770
#: zypp/target/TargetImpl.commitFindFileConflicts.cc:166
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2091,7 +2090,7 @@
msgstr ""
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1612
+#: zypp/RepoManager.cc:1618
#, c-format, boost-format
msgid "Invalid repo file name at '%s'"
msgstr ""
@@ -2965,7 +2964,7 @@
msgid "New Zealand"
msgstr ""
-#: zypp/target/TargetImpl.cc:790
+#: zypp/target/TargetImpl.cc:787
msgid "New update message"
msgstr ""
@@ -3372,8 +3371,8 @@
#. TranslatorExplanation after semicolon is error message
#. TranslatorExplanation the colon is followed by an error message
-#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2044
-#: zypp/target/rpm/RpmDb.cc:2191
+#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2045
+#: zypp/target/rpm/RpmDb.cc:2192
msgid "RPM failed: "
msgstr ""
@@ -3405,7 +3404,7 @@
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: zypp/RepoManager.cc:1651
+#: zypp/RepoManager.cc:1657
#, c-format, boost-format
msgid "Removing repository '%s'"
msgstr ""
@@ -3650,7 +3649,7 @@
msgstr ""
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2372
+#: zypp/target/rpm/RpmDb.cc:2373
msgid "Signature does not verify"
msgstr ""
@@ -3660,21 +3659,21 @@
msgstr ""
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2368
+#: zypp/target/rpm/RpmDb.cc:2369
msgid "Signature is OK"
msgstr ""
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2374
+#: zypp/target/rpm/RpmDb.cc:2375
msgid "Signature is OK, but key is not trusted"
msgstr ""
-#: zypp/repo/PackageProvider.cc:215
+#: zypp/repo/PackageProvider.cc:216
msgid "Signature verification failed"
msgstr ""
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2376
+#: zypp/target/rpm/RpmDb.cc:2377
msgid "Signatures public key is not available"
msgstr ""
@@ -4014,8 +4013,8 @@
msgid "This action is being run by another program already."
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1280
-#: zypp/solver/detail/SATResolver.cc:1301
+#: zypp/solver/detail/SATResolver.cc:1294
+#: zypp/solver/detail/SATResolver.cc:1315
msgid "This request will break your system!"
msgstr ""
@@ -4227,7 +4226,7 @@
msgid "Undetermined"
msgstr ""
-#: zypp/RepoManager.cc:1300
+#: zypp/RepoManager.cc:1306
msgid "Unhandled repository type"
msgstr ""
@@ -4256,7 +4255,7 @@
msgstr ""
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1383 zypp/RepoManager.cc:2309
+#: zypp/RepoManager.cc:1389 zypp/RepoManager.cc:2323
#, c-format, boost-format
msgid "Unknown error reading from '%s'"
msgstr ""
@@ -4288,7 +4287,7 @@
msgstr ""
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2370
+#: zypp/target/rpm/RpmDb.cc:2371
msgid "Unknown type of signature"
msgstr ""
@@ -4395,7 +4394,7 @@
msgid "Virgin Islands, U.S."
msgstr ""
-#: zypp/media/MediaCurl.cc:994
+#: zypp/media/MediaCurl.cc:1006
msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired."
msgstr ""
@@ -4534,101 +4533,101 @@
msgid "Zuni"
msgstr ""
-#: zypp/repo/PackageProvider.cc:514
+#: zypp/repo/PackageProvider.cc:515
msgid "applydeltarpm check failed."
msgstr ""
-#: zypp/repo/PackageProvider.cc:524
+#: zypp/repo/PackageProvider.cc:525
msgid "applydeltarpm failed."
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1388
+#: zypp/solver/detail/SATResolver.cc:1402
#, c-format, boost-format
msgid "architecture change of %s to %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:42
#, c-format, boost-format
msgid "break %s by ignoring some of its dependencies"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1082
+#: zypp/solver/detail/SATResolver.cc:1096
#, c-format, boost-format
msgid "cannot install both %s and %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1051
+#: zypp/solver/detail/SATResolver.cc:1065
msgid "conflicting requests"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:2347
+#: zypp/target/rpm/RpmDb.cc:2348
#, c-format, boost-format
msgid "created backup %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1417
+#: zypp/solver/detail/SATResolver.cc:1431
#, c-format, boost-format
msgid "deinstallation of %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1135
+#: zypp/solver/detail/SATResolver.cc:1149
msgid "deleted providers: "
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1308
+#: zypp/solver/detail/SATResolver.cc:1322
#, c-format, boost-format
msgid "do not ask to delete all solvables providing %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1286
+#: zypp/solver/detail/SATResolver.cc:1300
#, c-format, boost-format
msgid "do not ask to install a solvable providing %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1209
-#: zypp/solver/detail/SATResolver.cc:1245
+#: zypp/solver/detail/SATResolver.cc:1223
+#: zypp/solver/detail/SATResolver.cc:1259
#, c-format, boost-format
msgid "do not install %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1321
+#: zypp/solver/detail/SATResolver.cc:1335
#, c-format, boost-format
msgid "do not install most recent version of %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1381
+#: zypp/solver/detail/SATResolver.cc:1395
#, c-format, boost-format
msgid "downgrade of %s to %s"
msgstr ""
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:61
-msgid "generally ignore of some dependecies"
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:48
+msgid "generally ignore of some dependencies"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1281
-#: zypp/solver/detail/SATResolver.cc:1302
+#: zypp/solver/detail/SATResolver.cc:1295
+#: zypp/solver/detail/SATResolver.cc:1316
msgid "ignore the warning of a broken system"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1397
+#: zypp/solver/detail/SATResolver.cc:1411
#, c-format, boost-format
msgid ""
"install %s (with vendor change)\n"
" %s --> %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1347
+#: zypp/solver/detail/SATResolver.cc:1361
#, c-format, boost-format
msgid "install %s despite the inferior architecture"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1361
+#: zypp/solver/detail/SATResolver.cc:1375
#, c-format, boost-format
msgid "install %s from excluded repository"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1097
+#: zypp/solver/detail/SATResolver.cc:1111
#, c-format, boost-format
msgid "installed %s obsoletes %s provided by %s"
msgstr ""
@@ -4637,18 +4636,18 @@
msgid "invalid"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1224
-#: zypp/solver/detail/SATResolver.cc:1266
+#: zypp/solver/detail/SATResolver.cc:1238
+#: zypp/solver/detail/SATResolver.cc:1280
#, c-format, boost-format
msgid "keep %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1342
+#: zypp/solver/detail/SATResolver.cc:1356
#, c-format, boost-format
msgid "keep %s despite the inferior architecture"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1356
+#: zypp/solver/detail/SATResolver.cc:1370
#, c-format, boost-format
msgid "keep obsolete %s"
msgstr ""
@@ -4661,49 +4660,49 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1077
+#: zypp/solver/detail/SATResolver.cc:1091
#, c-format, boost-format
msgid "nothing provides %s needed by %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1057
+#: zypp/solver/detail/SATResolver.cc:1071
#, c-format, boost-format
msgid "nothing provides requested %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1061
+#: zypp/solver/detail/SATResolver.cc:1075
#, c-format, boost-format
msgid "package %s does not exist"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1048
+#: zypp/solver/detail/SATResolver.cc:1062
#, c-format, boost-format
msgid "problem with installed package %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1229
+#: zypp/solver/detail/SATResolver.cc:1243
#, c-format, boost-format
msgid "remove lock to allow installation of %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1204
+#: zypp/solver/detail/SATResolver.cc:1218
#, c-format, boost-format
msgid "remove lock to allow removal of %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1406
+#: zypp/solver/detail/SATResolver.cc:1420
#, c-format, boost-format
msgid "replacement of %s with %s"
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2030
+#: zypp/target/rpm/RpmDb.cc:2031
#, c-format, boost-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2032
+#: zypp/target/rpm/RpmDb.cc:2033
#, c-format, boost-format
msgid ""
"rpm created %s as %s.\n"
@@ -4711,29 +4710,29 @@
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2025
+#: zypp/target/rpm/RpmDb.cc:2026
#, c-format, boost-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2027
+#: zypp/target/rpm/RpmDb.cc:2028
#, c-format, boost-format
msgid ""
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1101
+#: zypp/solver/detail/SATResolver.cc:1115
#, c-format, boost-format
msgid "solvable %s conflicts with %s provided by itself"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1054
+#: zypp/solver/detail/SATResolver.cc:1068
msgid "some dependency problem"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1147
+#: zypp/solver/detail/SATResolver.cc:1161
msgid "uninstallable providers: "
msgstr ""
@@ -4745,6 +4744,6 @@
msgid "unsupported"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1065
+#: zypp/solver/detail/SATResolver.cc:1079
msgid "unsupported request"
msgstr ""
