Author: mlandres
Date: 2016-08-11 01:13:10 +0200 (Thu, 11 Aug 2016)
New Revision: 96242
Modified:
branches/SLE12-SP1/lcn/50-pot/zypper.pot
Log:
09b035f640265a0e3df3b1b24977cf3dbed56d06 (HEAD, tag: 1.12.45, origin/SuSE-SLE-12-SP1-Branch, SuSE-SLE-12-SP1-Branch) changes 1.12.45
Modified: branches/SLE12-SP1/lcn/50-pot/zypper.pot
===================================================================
--- branches/SLE12-SP1/lcn/50-pot/zypper.pot 2016-08-10 12:48:14 UTC (rev 96241)
+++ branches/SLE12-SP1/lcn/50-pot/zypper.pot 2016-08-10 23:13:10 UTC (rev 96242)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-16 01:13+0200\n"
+"POT-Creation-Date: 2016-08-11 01:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -151,13 +151,13 @@
#: src/info.cc:402 src/repos.cc:961 src/repos.cc:1094 src/repos.cc:2403
#: src/update.cc:383 src/update.cc:618 src/update.cc:753 src/Zypper.cc:5241
#: src/search.cc:67 src/search.cc:233 src/search.cc:325 src/search.cc:440
-#: src/search.cc:577 src/search.cc:639 src/locks.cc:104
+#: src/search.cc:577 src/search.cc:639 src/locks.cc:107
msgid "Name"
msgstr ""
#. translators: type (general header)
#: src/info.cc:402 src/repos.cc:999 src/repos.cc:1105 src/repos.cc:2412
-#: src/search.cc:69 src/search.cc:236 src/locks.cc:107
+#: src/search.cc:69 src/search.cc:236 src/locks.cc:110
msgid "Type"
msgstr ""
@@ -1276,7 +1276,7 @@
#. translators: help text for 'x' option in the 'Continue?' prompt
#. popts.setOptionHelp( 8, _("Explain why the packages are going to be installed.") );
#: src/callbacks/keyring.h:307 src/callbacks/keyring.h:315
-#: src/callbacks/rpm.h:138 src/callbacks/rpm.h:418 src/solve-commit.cc:663
+#: src/callbacks/rpm.h:132 src/callbacks/rpm.h:412 src/solve-commit.cc:663
msgid "Continue?"
msgstr ""
@@ -1328,62 +1328,62 @@
msgstr ""
#. TranslatorExplanation speaking of a script - "Running: script file name (package name, script dir)"
-#: src/callbacks/rpm.h:151
+#: src/callbacks/rpm.h:145
#, c-format, boost-format
msgid "Running: %s (%s, %s)"
msgstr ""
-#: src/callbacks/rpm.h:207
+#: src/callbacks/rpm.h:201
#, c-format, boost-format
msgid "Removing %s"
msgstr ""
#. translators: This text is a progress display label e.g. "Removing packagename-x.x.x [42%]"
-#: src/callbacks/rpm.h:211
+#: src/callbacks/rpm.h:205
#, c-format, boost-format
msgid "Removing %s-%s"
msgstr ""
-#: src/callbacks/rpm.h:234
+#: src/callbacks/rpm.h:228
#, c-format, boost-format
msgid "Removal of %s failed:"
msgstr ""
-#: src/callbacks/rpm.h:276
+#: src/callbacks/rpm.h:270
#, c-format, boost-format
msgid "Installing: %s"
msgstr ""
#. TranslatorExplanation This text is a progress display label e.g. "Installing: foo-1.1.2 [42%]"
-#: src/callbacks/rpm.h:280
+#: src/callbacks/rpm.h:274
#, c-format, boost-format
msgid "Installing: %s-%s"
msgstr ""
-#: src/callbacks/rpm.h:303
+#: src/callbacks/rpm.h:297
#, c-format, boost-format
msgid "Installation of %s failed:"
msgstr ""
#. what's actually needed here
-#: src/callbacks/rpm.h:304
+#: src/callbacks/rpm.h:298
#, c-format, boost-format
msgid "Installation of %s-%s failed:"
msgstr ""
#. TranslatorExplanation A progressbar label
-#: src/callbacks/rpm.h:350
+#: src/callbacks/rpm.h:344
msgid "Checking for file conflicts:"
msgstr ""
#. TranslatorExplanation %1%(commandline option)
-#: src/callbacks/rpm.h:384
+#: src/callbacks/rpm.h:378
#, boost-format
msgid "Checking for file conflicts requires not installed packages to be downloaded in advance in order to access their file lists. See option '%1%' in the zypper manual page for details."
msgstr ""
#. TranslatorExplanation %1%(number of packages); detailed list follows
-#: src/callbacks/rpm.h:391
+#: src/callbacks/rpm.h:385
#, boost-format
msgid "The following package had to be excluded from file conflicts check because it is not yet downloaded:"
msgid_plural "The following %1% packages had to be excluded from file conflicts check because they are not yet downloaded:"
@@ -1391,19 +1391,19 @@
msgstr[1] ""
#. TranslatorExplanation %1%(number of conflicts); detailed list follows
-#: src/callbacks/rpm.h:402
+#: src/callbacks/rpm.h:396
#, boost-format
msgid "Detected %1% file conflict:"
msgid_plural "Detected %1% file conflicts:"
msgstr[0] ""
msgstr[1] ""
-#: src/callbacks/rpm.h:410
+#: src/callbacks/rpm.h:404
msgid "Conflicting files will be replaced."
msgstr ""
#. TranslatorExplanation Problem description before asking whether to "Continue? [yes/no] (no):"
-#: src/callbacks/rpm.h:416
+#: src/callbacks/rpm.h:410
msgid "File conflicts happen when two packages attempt to install files with the same name but different contents. If you continue, conflicting files will be replaced losing the previous content."
msgstr ""
@@ -1598,11 +1598,11 @@
msgid "Invalid priority '%s'. Use a positive integer number. The greater the number, the lower the priority."
msgstr ""
-#: src/repos.cc:111 src/repos.cc:139 src/output/Out.h:33
+#: src/repos.cc:111 src/repos.cc:139 src/output/Out.h:25
msgid "Yes"
msgstr ""
-#: src/repos.cc:117 src/repos.cc:145 src/output/Out.h:33
+#: src/repos.cc:117 src/repos.cc:145 src/output/Out.h:25
msgid "No"
msgstr ""
@@ -2417,7 +2417,7 @@
#. translators: package's repository (header)
#: src/update.cc:382 src/update.cc:615 src/search.cc:75 src/search.cc:324
-#: src/search.cc:442 src/search.cc:576 src/search.cc:635 src/locks.cc:107
+#: src/search.cc:442 src/search.cc:576 src/search.cc:635 src/locks.cc:110
msgid "Repository"
msgstr ""
@@ -4681,64 +4681,64 @@
msgid "Problem installing source package %s-%s:"
msgstr ""
-#. translators: locks table value
-#: src/locks.cc:24 src/locks.cc:128
-msgid "(any)"
+#: src/locks.cc:109
+msgid "Matches"
msgstr ""
#. translators: locks table value
-#: src/locks.cc:26 src/locks.cc:125
+#: src/locks.cc:128 src/locks.cc:197
msgid "(multiple)"
msgstr ""
+#. translators: locks table value
+#: src/locks.cc:131 src/locks.cc:195
+msgid "(any)"
+msgstr ""
+
#. translators: property name; short; used like "Name: value"
-#: src/locks.cc:72
+#: src/locks.cc:169
msgid "Keep installed"
msgstr ""
#. translators: property name; short; used like "Name: value"
-#: src/locks.cc:80
+#: src/locks.cc:177
msgid "Do not install"
msgstr ""
-#: src/locks.cc:106
-msgid "Matches"
+#: src/locks.cc:226
+msgid "Error reading the locks file:"
msgstr ""
-#: src/locks.cc:159
+#: src/locks.cc:232
msgid "There are no package locks defined."
msgstr ""
-#: src/locks.cc:166
-msgid "Error reading the locks file:"
-msgstr ""
-
-#: src/locks.cc:226
+#: src/locks.cc:292
msgid "Specified lock has been successfully added."
msgid_plural "Specified locks have been successfully added."
msgstr[0] ""
msgstr[1] ""
-#: src/locks.cc:233
+#: src/locks.cc:299
msgid "Problem adding the package lock:"
msgstr ""
-#: src/locks.cc:257
+#: src/locks.cc:323
msgid "Specified lock has been successfully removed."
msgstr ""
-#: src/locks.cc:302
+#: src/locks.cc:368
msgid "No lock has been removed."
msgstr ""
-#: src/locks.cc:306
+#: src/locks.cc:372
#, c-format
msgid "%zu lock has been successfully removed."
msgid_plural "%zu locks have been successfully removed."
msgstr[0] ""
msgstr[1] ""
-#: src/locks.cc:313
+#: src/locks.cc:379
msgid "Problem removing the package lock:"
msgstr ""
