Author: mlandres
Date: 2015-05-21 01:12:53 +0200 (Thu, 21 May 2015)
New Revision: 91724
Modified:
trunk/lcn/50-pot/zypp.pot
Log:
4d263817af6fd55636ba43b459dc263ebc6d55b1 (HEAD, origin/master, origin/HEAD, master) FindFileConflicts: avoid nested exception on user abort (bnc#931601)
Modified: trunk/lcn/50-pot/zypp.pot
===================================================================
--- trunk/lcn/50-pot/zypp.pot 2015-05-20 19:27:44 UTC (rev 91723)
+++ trunk/lcn/50-pot/zypp.pot 2015-05-20 23:12:53 UTC (rev 91724)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: libzypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-25 01:13+0100\n"
+"POT-Creation-Date: 2015-05-21 01:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -84,17 +84,17 @@
msgstr ""
#. translators: an annotation to a gpg keys expiry date
-#: zypp/PublicKey.cc:122
+#: zypp/PublicKey.cc:125
msgid "(EXPIRED)"
msgstr ""
#. translators: an annotation to a gpg keys expiry date
-#: zypp/PublicKey.cc:113
+#: zypp/PublicKey.cc:116
msgid "(does not expire)"
msgstr ""
#. translators: an annotation to a gpg keys expiry date
-#: zypp/PublicKey.cc:126
+#: zypp/PublicKey.cc:129
msgid "(expires within 24h)"
msgstr ""
@@ -118,7 +118,7 @@
msgid "Adangme"
msgstr ""
-#: zypp/RepoManager.cc:1501
+#: zypp/RepoManager.cc:1505
#, 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:1978 zypp/target/rpm/RpmDb.cc:2125
+#: zypp/target/rpm/RpmDb.cc:2058 zypp/target/rpm/RpmDb.cc:2205
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:1678
+#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1680
#, c-format, boost-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -611,7 +611,7 @@
msgid "Buginese"
msgstr ""
-#: zypp/RepoManager.cc:1202
+#: zypp/RepoManager.cc:1205
#, c-format, boost-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -684,22 +684,22 @@
msgid "Can't chroot to '%s' (%s)."
msgstr ""
-#: zypp/RepoManager.cc:1058 zypp/RepoManager.cc:1166 zypp/RepoManager.cc:1216
+#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1219
#, c-format, boost-format
msgid "Can't create %s"
msgstr ""
-#: zypp/RepoManager.cc:1222
+#: zypp/RepoManager.cc:1225
#, c-format, boost-format
msgid "Can't create cache at %s - no writing permissions."
msgstr ""
-#: zypp/RepoManager.cc:1066
+#: zypp/RepoManager.cc:1069
msgid "Can't create metadata cache directory."
msgstr ""
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:1678 zypp/RepoManager.cc:1867
+#: zypp/RepoManager.cc:1682 zypp/RepoManager.cc:1871
#, c-format, boost-format
msgid "Can't delete '%s'"
msgstr ""
@@ -710,11 +710,11 @@
msgid "Can't exec '%s' (%s)."
msgstr ""
-#: zypp/RepoManager.cc:1666 zypp/RepoManager.cc:1742
+#: zypp/RepoManager.cc:1670 zypp/RepoManager.cc:1746
msgid "Can't figure out where the repo is stored."
msgstr ""
-#: zypp/RepoManager.cc:1855 zypp/RepoManager.cc:2231
+#: zypp/RepoManager.cc:1859 zypp/RepoManager.cc:2235
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:1540 zypp/RepoManager.cc:1622
-#: zypp/RepoManager.cc:1696 zypp/RepoManager.cc:1761 zypp/RepoManager.cc:1879
+#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1544 zypp/RepoManager.cc:1626
+#: zypp/RepoManager.cc:1700 zypp/RepoManager.cc:1765 zypp/RepoManager.cc:1883
#, 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:1769
+#: zypp/target/rpm/RpmDb.cc:1849
#, c-format, boost-format
msgid "Changed configuration files for %s:"
msgstr ""
@@ -1181,7 +1181,7 @@
msgstr ""
#. dubious: Throw on malformed known types, otherwise log a warning.
-#: zypp/CheckSum.cc:95
+#: zypp/CheckSum.cc:136
#, c-format, boost-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
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:1326 zypp/RepoManager.cc:2297
+#: zypp/RepoManager.cc:1330 zypp/RepoManager.cc:2301
#, c-format, boost-format
msgid "Error trying to read from '%s'"
msgstr ""
@@ -1349,16 +1349,16 @@
msgid "Ewondo"
msgstr ""
-#: zypp/RepoManager.cc:1286
+#: zypp/RepoManager.cc:1289
#, c-format, boost-format
msgid "Failed to cache repo (%d)."
msgstr ""
-#: zypp/KeyRing.cc:571
+#: zypp/KeyRing.cc:568
msgid "Failed to delete key."
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:1123
+#: zypp/target/rpm/RpmDb.cc:1127
#, 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:286
+#: zypp/repo/PackageProvider.cc:385
#, 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:1413
+#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1417
#: zypp/repo/PluginServices.cc:49
#, c-format, boost-format
msgid "Failed to read directory '%s'"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:1194
+#: zypp/target/rpm/RpmDb.cc:1198
#, c-format, boost-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -1534,6 +1534,11 @@
msgid "File '%s' not found on medium '%s'"
msgstr ""
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2378
+msgid "File does not exist or signature can't be checked"
+msgstr ""
+
#. language code: fil
#: zypp/LanguageCode.cc:482
msgid "Filipino"
@@ -1999,9 +2004,9 @@
msgid "Ingush"
msgstr ""
-#: zypp/target/TargetImpl.cc:1361 zypp/target/TargetImpl.cc:1430
-#: zypp/target/TargetImpl.cc:1759
-#: zypp/target/TargetImpl.commitFindFileConflicts.cc:163
+#: zypp/target/TargetImpl.cc:1362 zypp/target/TargetImpl.cc:1431
+#: zypp/target/TargetImpl.cc:1760
+#: zypp/target/TargetImpl.commitFindFileConflicts.cc:166
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2086,7 +2091,7 @@
msgstr ""
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1608
+#: zypp/RepoManager.cc:1612
#, c-format, boost-format
msgid "Invalid repo file name at '%s'"
msgstr ""
@@ -3157,7 +3162,7 @@
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: zypp/repo/PackageProvider.cc:151
+#: zypp/repo/PackageProvider.cc:157
#, c-format, boost-format
msgid "Package %s seems to be corrupted during transfer. Do you want to retry retrieval?"
msgstr ""
@@ -3367,8 +3372,8 @@
#. TranslatorExplanation after semicolon is error message
#. TranslatorExplanation the colon is followed by an error message
-#: zypp/target/rpm/RpmDb.cc:846 zypp/target/rpm/RpmDb.cc:1964
-#: zypp/target/rpm/RpmDb.cc:2111
+#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2044
+#: zypp/target/rpm/RpmDb.cc:2191
msgid "RPM failed: "
msgstr ""
@@ -3400,7 +3405,7 @@
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: zypp/RepoManager.cc:1647
+#: zypp/RepoManager.cc:1651
#, c-format, boost-format
msgid "Removing repository '%s'"
msgstr ""
@@ -3644,11 +3649,35 @@
msgid "Sign Languages"
msgstr ""
-#: zypp/KeyRing.cc:581
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2372
+msgid "Signature does not verify"
+msgstr ""
+
+#: zypp/KeyRing.cc:578
#, c-format, boost-format
msgid "Signature file %s not found"
msgstr ""
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2368
+msgid "Signature is OK"
+msgstr ""
+
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2374
+msgid "Signature is OK, but key is not trusted"
+msgstr ""
+
+#: zypp/repo/PackageProvider.cc:215
+msgid "Signature verification failed"
+msgstr ""
+
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2376
+msgid "Signatures public key is not available"
+msgstr ""
+
#. language code: bla
#: zypp/LanguageCode.cc:322
msgid "Siksika"
@@ -4056,7 +4085,7 @@
msgid "Tonga (Tonga Islands)"
msgstr ""
-#: zypp/KeyRing.cc:528
+#: zypp/KeyRing.cc:525
#, c-format, boost-format
msgid "Tried to import not existent key %s into keyring %s"
msgstr ""
@@ -4198,7 +4227,7 @@
msgid "Undetermined"
msgstr ""
-#: zypp/RepoManager.cc:1296
+#: zypp/RepoManager.cc:1300
msgid "Unhandled repository type"
msgstr ""
@@ -4227,7 +4256,7 @@
msgstr ""
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1379 zypp/RepoManager.cc:2305
+#: zypp/RepoManager.cc:1383 zypp/RepoManager.cc:2309
#, c-format, boost-format
msgid "Unknown error reading from '%s'"
msgstr ""
@@ -4258,6 +4287,11 @@
msgid "Unknown support option. Description not available"
msgstr ""
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2370
+msgid "Unknown type of signature"
+msgstr ""
+
#: zypp/media/MediaUserAuth.cc:136
#, c-format, boost-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4361,7 +4395,7 @@
msgid "Virgin Islands, U.S."
msgstr ""
-#: zypp/media/MediaCurl.cc:992
+#: zypp/media/MediaCurl.cc:994
msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired."
msgstr ""
@@ -4500,11 +4534,11 @@
msgid "Zuni"
msgstr ""
-#: zypp/repo/PackageProvider.cc:415
+#: zypp/repo/PackageProvider.cc:514
msgid "applydeltarpm check failed."
msgstr ""
-#: zypp/repo/PackageProvider.cc:425
+#: zypp/repo/PackageProvider.cc:524
msgid "applydeltarpm failed."
msgstr ""
@@ -4528,7 +4562,7 @@
msgid "conflicting requests"
msgstr ""
-#: zypp/target/rpm/RpmDb.cc:2267
+#: zypp/target/rpm/RpmDb.cc:2347
#, c-format, boost-format
msgid "created backup %s"
msgstr ""
@@ -4663,13 +4697,13 @@
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1950
+#: zypp/target/rpm/RpmDb.cc:2030
#, 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:1952
+#: zypp/target/rpm/RpmDb.cc:2032
#, c-format, boost-format
msgid ""
"rpm created %s as %s.\n"
@@ -4677,13 +4711,13 @@
msgstr ""
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1945
+#: zypp/target/rpm/RpmDb.cc:2025
#, 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:1947
+#: zypp/target/rpm/RpmDb.cc:2027
#, c-format, boost-format
msgid ""
"rpm saved %s as %s.\n"
