ref: refs/heads/master
commit 387842074011db7c1c005b7163e1aec6e47f5b96
Author: Ján Kupec
Date: Wed Nov 4 12:40:39 2009 +0100
english translations updated, too
---
po/en_GB.po | 2134 +++++++++++++++++++++++++++++++++++++----------------------
po/en_US.po | 2029 ++++++++++++++++++++++++++++++++++++--------------------
2 files changed, 2654 insertions(+), 1509 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
index a47cc48..6e78609 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-11 11:15+0100\n"
+"POT-Creation-Date: 2009-10-12 11:46+0200\n"
"PO-Revision-Date: 2008-11-24 16:50+0100\n"
"Last-Translator: Benjamin Weber \n"
"Language-Team: \n"
@@ -164,9 +164,11 @@ msgstr "Signature verification failed for %s with public key id %s, %s, fingerpr
msgid "No digest for file %s."
msgstr "No digest for file %s."
+#. 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:256 ../src/callbacks/keyring.h:266
#: ../src/callbacks/keyring.h:288 ../src/callbacks/rpm.h:61
-#: ../src/solve-commit.cc:1041 ../src/solve-commit.cc:1065
+#: ../src/solve-commit.cc:578
msgid "Continue?"
msgstr "Continue?"
@@ -197,18 +199,57 @@ msgstr ""
#. Try to check what answers does zypper accept (it always accepts y/n at least)
#. You can also have a look at the regular expressions used to check the answer here:
#. /usr/lib/locale//LC_MESSAGES/SYS_LC_MESSAGES
-#: ../src/callbacks/media.h:84
+#: ../src/callbacks/media.h:86
#, fuzzy, c-format
msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
-#: ../src/callbacks/media.h:228 ../src/callbacks/media.h:235
+#. translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt
+#. Translate the a/r/i part exactly as you did the a/r/i string.
+#. the 'u' reply means 'Change URI'.
+#: ../src/callbacks/media.h:106
+msgid "a/r/i/u"
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:108
+msgid "Skip retrieval of the file and abort current operation."
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:110
+msgid "Try to retrieve the file again."
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:112
+msgid "Skip retrieval of the file and try to continue with the operation without the file."
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:114
+msgid "Change current base URI and try retrieving the file again."
+msgstr ""
+
+#. translators: this is a prompt text
+#: ../src/callbacks/media.h:119 ../src/utils/prompt.cc:178
+#: ../src/utils/prompt.cc:266
+#, fuzzy
+msgid "Abort, retry, ignore?"
+msgstr "(A)bort, (R)etry, (I)gnore?"
+
+#. translators: this is a prompt label, will appear as "New URI: "
+#: ../src/callbacks/media.h:130
+msgid "New URI"
+msgstr ""
+
+#: ../src/callbacks/media.h:267 ../src/callbacks/media.h:274
#, fuzzy
msgid "User Name"
msgstr "User Name:"
# password dialog title
-#: ../src/callbacks/media.h:242
+#: ../src/callbacks/media.h:283
msgid "Password"
msgstr "Password"
@@ -244,137 +285,148 @@ msgstr "(%s unpacked)"
msgid "Running: %s (%s, %s)"
msgstr "Running: %s (%s, %s)"
-#: ../src/callbacks/rpm.h:139 ../src/callbacks/rpm.h:148
-#: ../src/callbacks/rpm.h:156 ../src/callbacks/rpm.h:163
-msgid "Reading installed packages"
-msgstr "Reading installed packages"
-
#. translators: This text is a progress display label e.g. "Removing packagename-x.x.x [42%]"
-#: ../src/callbacks/rpm.h:183
+#: ../src/callbacks/rpm.h:135
#, fuzzy, c-format
msgid "Removing %s-%s"
msgstr "Removing "
-#: ../src/callbacks/rpm.h:202
+#: ../src/callbacks/rpm.h:154
#, c-format
msgid "Removal of %s failed:"
msgstr "Removal of %s failed:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
#. ! \todo use format
-#: ../src/callbacks/rpm.h:224
+#: ../src/callbacks/rpm.h:183
msgid "(with --nodeps)"
msgstr "(with --nodeps)"
-#: ../src/callbacks/rpm.h:224
+#: ../src/callbacks/rpm.h:183
msgid "(with --nodeps --force)"
msgstr "(with --nodeps --force)"
#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
-#: ../src/callbacks/rpm.h:246
+#: ../src/callbacks/rpm.h:205
#, c-format
msgid "Installing: %s-%s"
msgstr "Installing: %s-%s"
-#: ../src/callbacks/rpm.h:272
+#: ../src/callbacks/rpm.h:231
#, fuzzy, c-format
msgid "Installation of %s-%s failed:"
msgstr "Installation of %s failed:"
-#: ../src/Command.cc:174
+#: ../src/Command.cc:176
#, c-format
msgid "Unknown command '%s'"
msgstr "Unknown command '%s'"
-#: ../src/info.cc:40
+#: ../src/Config.cc:73
+#, fuzzy, c-format
+#| msgid "Unknown command option"
+msgid "Unknown configuration option '%s'"
+msgstr "Unknown command option"
+
+#: ../src/info.cc:39
msgid "Name: "
msgstr "Name: "
-#: ../src/info.cc:41
+#: ../src/info.cc:40
msgid "Version: "
msgstr "Version: "
-#: ../src/info.cc:42
+#: ../src/info.cc:41
msgid "Arch: "
msgstr "Arch: "
-#: ../src/info.cc:43
+#: ../src/info.cc:42
#, fuzzy
msgid "Vendor: "
msgstr "Vendor:"
-#: ../src/info.cc:48
+#: ../src/info.cc:47
msgid "Summary: "
msgstr "Summary: "
-#: ../src/info.cc:49
+#: ../src/info.cc:48
msgid "Description: "
msgstr "Description: "
#. TranslatorExplanation E.g. "package 'zypper' not found."
#. ! \todo use a separate string for each kind so that it is translatable.
-#: ../src/info.cc:82
+#: ../src/info.cc:81
#, fuzzy, c-format
msgid "%s '%s' not found."
msgstr "%s '%s' not found"
-#: ../src/info.cc:94
+#: ../src/info.cc:93
#, c-format
msgid "Information for %s %s:"
msgstr "Information for %s %s:"
-#: ../src/info.cc:111
+#: ../src/info.cc:110
#, fuzzy, c-format
msgid "Info for type '%s' not implemented."
msgstr "not yet implemented"
-#: ../src/info.cc:117
+#: ../src/info.cc:116
msgid "None"
msgstr "None"
-#: ../src/info.cc:118
+#: ../src/info.cc:117
msgid "Requires"
msgstr "Requires"
-#: ../src/info.cc:119
+#: ../src/info.cc:118
msgid "Provides"
msgstr "Provides"
-#: ../src/info.cc:120
+#: ../src/info.cc:119
msgid "Conflicts"
msgstr "Conflicts"
-#: ../src/info.cc:121
+#: ../src/info.cc:120
msgid "Obsoletes"
msgstr "Obsoletes"
#. translators: package requirements table header
-#: ../src/info.cc:123
+#: ../src/info.cc:122
#, fuzzy
msgid "Requirement"
msgstr "Requires"
#. translators: package requirements table header
-#: ../src/info.cc:125
+#: ../src/info.cc:124
#, fuzzy
msgid "Provided By"
msgstr "Provider"
#. translators: package conflicts table header
-#: ../src/info.cc:127
+#: ../src/info.cc:126
#, fuzzy
msgid "Conflict"
msgstr "Conflicts"
-#: ../src/info.cc:161 ../src/info.cc:283 ../src/info.cc:354
+#: ../src/info.cc:132
+msgid "Requires:"
+msgstr "Requires:"
+
+#: ../src/info.cc:143
+#, fuzzy
+#| msgid "Recommends"
+msgid "Recommends:"
+msgstr "Recommends"
+
+#: ../src/info.cc:177 ../src/info.cc:321 ../src/info.cc:392
msgid "Catalog: "
msgstr "Catalogue: "
-#: ../src/info.cc:161 ../src/info.cc:283 ../src/info.cc:354
+#: ../src/info.cc:177 ../src/info.cc:321 ../src/info.cc:392
msgid "Repository: "
msgstr "Repository: "
-#: ../src/info.cc:166 ../src/info.cc:288
+#: ../src/info.cc:182 ../src/info.cc:326
msgid "Installed: "
msgstr "Installed: "
@@ -382,80 +434,85 @@ msgstr "Installed: "
#. autorefresh?
#. enabled?
#. autorefresh?
-#: ../src/info.cc:166 ../src/info.cc:223 ../src/info.cc:229 ../src/info.cc:231
-#: ../src/info.cc:288 ../src/repos.cc:735 ../src/repos.cc:737
-#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014
-#: ../src/repos.cc:2016 ../src/solve-commit.cc:855
+#. is base
+#: ../src/info.cc:182 ../src/info.cc:253 ../src/info.cc:259 ../src/info.cc:261
+#: ../src/info.cc:326 ../src/info.cc:399 ../src/info.cc:403
+#: ../src/repos.cc:736 ../src/repos.cc:738 ../src/repos.cc:818
+#: ../src/repos.cc:1410 ../src/repos.cc:1412 ../src/repos.cc:2088
+#: ../src/repos.cc:2090 ../src/search.cc:608 ../src/solve-commit.cc:258
msgid "Yes"
msgstr "Yes"
-#: ../src/info.cc:166 ../src/info.cc:223 ../src/info.cc:229 ../src/info.cc:231
-#: ../src/info.cc:288 ../src/repos.cc:735 ../src/repos.cc:737
-#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014
-#: ../src/repos.cc:2016 ../src/solve-commit.cc:855
+#: ../src/info.cc:182 ../src/info.cc:253 ../src/info.cc:259 ../src/info.cc:261
+#: ../src/info.cc:326 ../src/info.cc:399 ../src/info.cc:403
+#: ../src/repos.cc:736 ../src/repos.cc:738 ../src/repos.cc:818
+#: ../src/repos.cc:1410 ../src/repos.cc:1412 ../src/repos.cc:2088
+#: ../src/repos.cc:2090 ../src/search.cc:608 ../src/solve-commit.cc:258
msgid "No"
msgstr "No"
#. ! \todo fix this - arch?
-#: ../src/info.cc:169 ../src/info.cc:218
+#: ../src/info.cc:185 ../src/info.cc:248
msgid "Status: "
msgstr "Status: "
-#: ../src/info.cc:173
+#: ../src/info.cc:189
msgid "up-to-date"
msgstr "up-to-date"
-#: ../src/info.cc:177
+#: ../src/info.cc:193
#, fuzzy, c-format
msgid "out-of-date (version %s installed)"
msgstr "out-of-date (version "
-#: ../src/info.cc:182
+#: ../src/info.cc:198
msgid "not installed"
msgstr "not installed"
-#: ../src/info.cc:184
+#: ../src/info.cc:200
msgid "Installed Size: "
msgstr "Installed Size: "
-#: ../src/info.cc:221
+#: ../src/info.cc:251
msgid "Category: "
msgstr "Category: "
-#: ../src/info.cc:222
+#: ../src/info.cc:252
msgid "Created On: "
msgstr "Created On: "
-#: ../src/info.cc:223
+#: ../src/info.cc:253
msgid "Reboot Required: "
msgstr "Reboot Required: "
-#: ../src/info.cc:226
+#: ../src/info.cc:256
msgid "Package Manager Restart Required"
msgstr "Package Manager Restart Required"
-#: ../src/info.cc:228
+#: ../src/info.cc:258
msgid "Restart Required: "
msgstr "Restart Required: "
-#: ../src/info.cc:231
+#: ../src/info.cc:261
msgid "Interactive: "
msgstr "Interactive: "
-#: ../src/info.cc:235
+#: ../src/info.cc:265
msgid "Provides:"
msgstr "Provides:"
-#: ../src/info.cc:244
-msgid "Requires:"
-msgstr "Requires:"
+#: ../src/info.cc:272
+#, fuzzy
+#| msgid "Conflicts"
+msgid "Conflicts:"
+msgstr "Conflicts"
-#: ../src/info.cc:255 ../src/search.cc:327
+#: ../src/info.cc:293 ../src/search.cc:327
#, fuzzy
msgid "Recommended"
msgstr "Recommends"
-#: ../src/info.cc:257 ../src/search.cc:329
+#: ../src/info.cc:295 ../src/search.cc:329
#, fuzzy
msgid "Suggested"
msgstr "Suggests"
@@ -463,146 +520,143 @@ msgstr "Suggests"
#. translators: S for 'installed Status'
#. translators: S for installed Status
#. TranslatorExplanation S stands for Status
-#: ../src/info.cc:298 ../src/search.cc:38 ../src/search.cc:54
+#: ../src/info.cc:336 ../src/search.cc:38 ../src/search.cc:54
#: ../src/search.cc:218 ../src/search.cc:389 ../src/search.cc:445
-#: ../src/search.cc:537 ../src/update.cc:412
+#: ../src/search.cc:537 ../src/update.cc:438
msgid "S"
msgstr "S"
#. translators: name (general header)
-#: ../src/info.cc:298 ../src/locks.cc:39 ../src/repos.cc:655
-#: ../src/repos.cc:704 ../src/repos.cc:2081 ../src/search.cc:44
-#: ../src/search.cc:56 ../src/search.cc:219 ../src/search.cc:268
-#: ../src/search.cc:390 ../src/search.cc:451 ../src/search.cc:538
-#: ../src/update.cc:153 ../src/update.cc:420 ../src/Zypper.cc:4002
+#: ../src/info.cc:336 ../src/locks.cc:39 ../src/repos.cc:656
+#: ../src/repos.cc:705 ../src/repos.cc:815 ../src/repos.cc:2155
+#: ../src/search.cc:44 ../src/search.cc:56 ../src/search.cc:219
+#: ../src/search.cc:268 ../src/search.cc:390 ../src/search.cc:451
+#: ../src/search.cc:540 ../src/update.cc:193 ../src/update.cc:446
+#: ../src/update.cc:876 ../src/Zypper.cc:4150
msgid "Name"
msgstr "Name"
#. translators: type (general header)
-#. translators: product type (addon/base) (rug calls it Category)
-#: ../src/info.cc:298 ../src/locks.cc:43 ../src/repos.cc:655
-#: ../src/repos.cc:713 ../src/repos.cc:2089 ../src/search.cc:58
-#: ../src/search.cc:222 ../src/search.cc:545
+#: ../src/info.cc:336 ../src/locks.cc:43 ../src/repos.cc:656
+#: ../src/repos.cc:714 ../src/repos.cc:830 ../src/repos.cc:2163
+#: ../src/search.cc:58 ../src/search.cc:222
msgid "Type"
msgstr "Type"
-#: ../src/info.cc:298 ../src/search.cc:392
+#: ../src/info.cc:336 ../src/search.cc:392
#, fuzzy
msgid "Dependency"
msgstr "Dependencies"
-#: ../src/info.cc:316
+#: ../src/info.cc:354
msgid "Contents"
msgstr "Contents"
-#: ../src/info.cc:318
+#: ../src/info.cc:356
msgid "(empty)"
msgstr ""
-#. translators: patch category (recommended, security)
-#. translators: product category (the rug term)
-#: ../src/info.cc:360 ../src/search.cc:271 ../src/search.cc:542
-#: ../src/update.cc:153
-msgid "Category"
-msgstr "Category"
+#: ../src/info.cc:398 ../src/search.cc:548
+msgid "Is Base"
+msgstr ""
-#: ../src/info.cc:361
+#: ../src/info.cc:400
msgid "Flavor"
msgstr ""
-#: ../src/info.cc:362 ../src/utils/misc.cc:111
+#: ../src/info.cc:402 ../src/utils/misc.cc:140
msgid "Installed"
msgstr "Installed"
-#: ../src/info.cc:363
+#: ../src/info.cc:404
#, fuzzy
msgid "Short Name"
msgstr "Short names:"
#. translators: meaning a package %s or provider of capability %s
-#: ../src/install.cc:72 ../src/install.cc:186
+#: ../src/install.cc:70 ../src/install.cc:177
#, fuzzy, c-format
msgid "'%s' not found"
msgstr "%s '%s' not found"
#. translators: e.g. skipping package 'zypper' (the newest version already installed)
#. ! \todo capitalize the first letter
-#: ../src/install.cc:108
+#: ../src/install.cc:99
#, fuzzy, c-format
msgid "skipping %s '%s' (the newest version already installed)"
msgstr "skipping %s '%s' (already installed)"
#. translators: %s-%s.%s is name-version.arch
-#: ../src/install.cc:120
+#: ../src/install.cc:111
#, c-format
msgid "Package %s-%s.%s not found in repositories, cannot reinstall."
msgstr ""
-#: ../src/install.cc:133
+#: ../src/install.cc:124
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Failed to add '%s' to the list of packages to be installed."
-#: ../src/install.cc:156
+#: ../src/install.cc:147
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Failed to add '%s' to the list of packages to be removed."
-#: ../src/install.cc:378 ../src/install.cc:712
+#: ../src/install.cc:367 ../src/install.cc:724
#, fuzzy, c-format
msgid "'%s' is already installed."
msgstr "SCPM is already disabled."
#. translators: meaning a package %s or provider of capability %s
-#: ../src/install.cc:418 ../src/install.cc:726
+#: ../src/install.cc:413 ../src/install.cc:738
#, fuzzy, c-format
msgid "'%s' is not installed."
msgstr "not installed"
-#: ../src/install.cc:442
+#: ../src/install.cc:437
#, fuzzy
msgid "Cannot uninstall patches."
msgstr "Cannot install %s"
-#: ../src/install.cc:443
+#: ../src/install.cc:438
msgid ""
"Installed status of a patch is determined solely based on its dependencies.\n"
"Patches are not installed in sense of copied files, database records,\n"
"or similar."
msgstr ""
-#: ../src/install.cc:454
+#: ../src/install.cc:449
msgid "Uninstallation of a pattern is currently not defined and implemented."
msgstr ""
-#: ../src/install.cc:468
+#: ../src/install.cc:463
#, fuzzy, c-format
msgid "%s contradicts %s"
msgstr "%s conflicts with %s"
#. translators: meaning --force with --capability
-#: ../src/install.cc:477
+#: ../src/install.cc:472
#, c-format
msgid "%s cannot currently be used with %s"
msgstr ""
#. translators: meaning a package %s or provider of capability %s
-#: ../src/install.cc:524 ../src/install.cc:683
+#: ../src/install.cc:519 ../src/install.cc:695
#, fuzzy, c-format
msgid "'%s' not found."
msgstr "%s '%s' not found"
-#: ../src/install.cc:573
+#: ../src/install.cc:583
msgid "Specifying architecture when selecting packages by name is not implemented."
msgstr ""
-#: ../src/install.cc:608
+#: ../src/install.cc:620
#, fuzzy, c-format
msgid "'%s' is not a valid package or capability name."
msgstr "`%s' is not a valid netmask."
#. translators: %s are package names
-#: ../src/install.cc:716
+#: ../src/install.cc:728
#, fuzzy, c-format
msgid "'%s' providing '%s' is already installed."
msgstr "SCPM is already disabled."
@@ -620,7 +674,7 @@ msgstr ""
#. translators: catalog (rug's word for repository) (header)
#: ../src/locks.cc:41 ../src/search.cc:40 ../src/search.cc:267
-#: ../src/update.cc:152 ../src/update.cc:414
+#: ../src/update.cc:192 ../src/update.cc:440
msgid "Catalog"
msgstr "Catalogue"
@@ -631,7 +685,8 @@ msgstr " Important!"
#. translators: package's repository (header)
#: ../src/locks.cc:43 ../src/search.cc:64 ../src/search.cc:392
-#: ../src/search.cc:450 ../src/update.cc:152 ../src/update.cc:414
+#: ../src/search.cc:450 ../src/search.cc:539 ../src/update.cc:192
+#: ../src/update.cc:440
msgid "Repository"
msgstr "Repository"
@@ -685,119 +740,121 @@ msgid "OK OK! Exiting immediately..."
msgstr ""
#. TranslatorExplanation The first %s is name of the resolvable, the second is its kind (e.g. 'zypper package')
-#: ../src/misc.cc:136
+#: ../src/misc.cc:139
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatically agreeing with %s %s licence."
#. translators: the first %s is the name of the package, the second
#. is " (package-type)" if other than "package" (patch/product/pattern)
-#: ../src/misc.cc:157
+#: ../src/misc.cc:160
#, fuzzy, c-format
msgid "In order to install '%s'%s, you must agree to terms of the following license agreement:"
msgstr "In order to install this package, you must agree to terms of the above licence. Continue?"
#. lincense prompt
-#: ../src/misc.cc:174
+#: ../src/misc.cc:177
msgid "Do you agree with the terms of the license?"
msgstr ""
-#: ../src/misc.cc:183
+#: ../src/misc.cc:186
#, fuzzy
msgid "Aborting installation due to the need for license confirmation."
msgstr "Aborting installation due to the need for licence(s) confirmation."
#. translators: %sanslate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/misc.cc:188
+#: ../src/misc.cc:191
#, fuzzy, c-format
msgid "Please restart the operation in interactive mode and confirm your agreement with required licenses, or use the %s option."
msgstr "Please, restart the operation in interactive mode and confirm your agreement with required licence(s), or use the --auto-agree-with-licenses option."
#. translators: e.g. "... with flash package license."
#. ! \todo fix this to allow proper translation
-#: ../src/misc.cc:200
+#: ../src/misc.cc:203
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Aborting installation due to user disagreement with %s %s licence."
-#: ../src/misc.cc:247
+#: ../src/misc.cc:250
#, fuzzy
msgid "License"
msgstr "Licence: %1\n"
-#: ../src/misc.cc:265
+#: ../src/misc.cc:268
msgid "EULA"
msgstr ""
-#: ../src/misc.cc:283
+#: ../src/misc.cc:286
msgid "SUMMARY"
msgstr ""
-#: ../src/misc.cc:284
+#: ../src/misc.cc:287
#, fuzzy, c-format
msgid "Installed packages: %d"
msgstr "Reading installed packages"
-#: ../src/misc.cc:285
+#: ../src/misc.cc:288
#, c-format
msgid "Installed packages with counterparts in repositories: %d"
msgstr ""
-#: ../src/misc.cc:286
+#: ../src/misc.cc:289
#, fuzzy, c-format
msgid "Installed packages with EULAs: %d"
msgstr "Install Package with YaST"
-#: ../src/misc.cc:375 ../src/misc.cc:399
+#: ../src/misc.cc:378 ../src/misc.cc:402
#, c-format
msgid "Source package '%s' not found."
msgstr "Source package '%s' not found."
-#: ../src/misc.cc:409
+#: ../src/misc.cc:412
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installing source package %s-%s"
-#: ../src/misc.cc:418
+#: ../src/misc.cc:421
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Source package %s-%s successfully installed."
-#: ../src/misc.cc:425
+#: ../src/misc.cc:428
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem installing source package %s-%s:"
-#: ../src/output/OutNormal.cc:54
+#: ../src/output/OutNormal.cc:74
#, fuzzy
msgid "Warning: "
msgstr "Warning"
-#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:222
+#: ../src/output/OutNormal.cc:181 ../src/output/OutNormal.cc:263
+#: ../src/output/OutNormal.cc:268
msgid "error"
msgstr "error"
-#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:222
+#: ../src/output/OutNormal.cc:183 ../src/output/OutNormal.cc:265
+#: ../src/output/OutNormal.cc:268
msgid "done"
msgstr "done"
-#: ../src/output/OutNormal.cc:165 ../src/output/OutNormal.cc:189
-#: ../src/output/OutNormal.cc:215
+#: ../src/output/OutNormal.cc:201 ../src/output/OutNormal.cc:227
+#: ../src/output/OutNormal.cc:256
msgid "Retrieving:"
msgstr ""
# window title for kernel loading (see txt_load_kernel)
-#: ../src/output/OutNormal.cc:171
+#: ../src/output/OutNormal.cc:207
#, fuzzy
msgid "starting"
msgstr "Starting..."
-#: ../src/output/OutNormal.cc:248
+#: ../src/output/OutNormal.cc:302
msgid "No help available for this prompt."
msgstr ""
-#: ../src/output/OutNormal.cc:258
+#: ../src/output/OutNormal.cc:314
msgid "no help available for this option"
msgstr ""
@@ -830,8 +887,8 @@ msgstr "Retrieving repository '%s' data..."
msgid "Problem retrieving files from '%s'."
msgstr "Problem downloading files from '%s'."
-#: ../src/repos.cc:160 ../src/repos.cc:2861 ../src/solve-commit.cc:1117
-#: ../src/solve-commit.cc:1145 ../src/solve-commit.cc:1177
+#: ../src/repos.cc:160 ../src/repos.cc:2935 ../src/solve-commit.cc:690
+#: ../src/solve-commit.cc:719 ../src/solve-commit.cc:753
#, fuzzy
msgid "Please see the above error message for a hint."
msgstr "Please, see the above error message to for a hint."
@@ -879,8 +936,8 @@ msgstr "Error parsing metadata for '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
#: ../src/repos.cc:247
#, fuzzy
-msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper#Troubleshooting"
-msgstr "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper#Troubleshooting"
+msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper/Troubleshooting"
+msgstr "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper/Troubleshooting"
#: ../src/repos.cc:261
#, c-format
@@ -892,614 +949,669 @@ msgstr "Repository metadata for '%s' not found in local cache."
msgid "Error building the cache:"
msgstr "Error building the cache database:"
-#: ../src/repos.cc:422
+#: ../src/repos.cc:423
#, fuzzy, c-format
msgid "Repository '%s' not found by its alias, number, or URI."
msgstr "Repository '%s' not found by its alias or number."
-#: ../src/repos.cc:426
+#: ../src/repos.cc:427
#, fuzzy, c-format
msgid "Use '%s' to get the list of defined repositories."
msgstr "Use 'zypper repos' to get the list of defined repositories."
-#: ../src/repos.cc:490 ../src/repos.cc:497
+#: ../src/repos.cc:491 ../src/repos.cc:498
#, fuzzy, c-format
msgid "Ignoring repository '%s' because of '%s' option."
msgstr "Disabling repository '%s' because of the above error."
-#: ../src/repos.cc:527 ../src/repos.cc:563
+#: ../src/repos.cc:528 ../src/repos.cc:564
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Disabling repository '%s' because of the above error."
-#: ../src/repos.cc:545
+#: ../src/repos.cc:546
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
-#: ../src/repos.cc:580
+#: ../src/repos.cc:581
#, fuzzy, c-format
msgid "The metadata cache needs to be built for the '%s' repository. You can run 'zypper refresh' as root to do this."
msgstr "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
-#: ../src/repos.cc:587
+#: ../src/repos.cc:588
#, fuzzy, c-format
msgid "Disabling repository '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:624
+#: ../src/repos.cc:625
msgid "Initializing Target"
msgstr "Initialising Target"
-#: ../src/repos.cc:633
+#: ../src/repos.cc:634
#, fuzzy
msgid "Target initialization failed:"
msgstr "Initialisation failed"
-#: ../src/repos.cc:635 ../src/Zypper.cc:3372
+#: ../src/repos.cc:636 ../src/Zypper.cc:3480
msgid "Running 'zypper refresh' as root might resolve the problem."
msgstr ""
#. translators: patch status (installed, uninstalled, needed)
-#: ../src/repos.cc:655 ../src/search.cc:273 ../src/update.cc:153
+#: ../src/repos.cc:656 ../src/search.cc:273 ../src/update.cc:193
msgid "Status"
msgstr "Status"
#. status
#. rug's status (active, pending => active, disabled <= enabled, disabled)
#. this is probably the closest possible compatibility arrangement
-#: ../src/repos.cc:672
+#: ../src/repos.cc:673
msgid "Active"
msgstr "Active"
-#: ../src/repos.cc:672
+#: ../src/repos.cc:673
msgid "Disabled"
msgstr "Disabled"
-#: ../src/repos.cc:703 ../src/repos.cc:2080 ../src/Zypper.cc:4002
+#: ../src/repos.cc:704 ../src/repos.cc:814 ../src/repos.cc:2154
+#: ../src/Zypper.cc:4150
msgid "Alias"
msgstr ""
#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/repos.cc:705 ../src/repos.cc:1336 ../src/repos.cc:2082
+#: ../src/repos.cc:706 ../src/repos.cc:818 ../src/repos.cc:1410
+#: ../src/repos.cc:2156
msgid "Enabled"
msgstr "Enabled"
#. translators: 'zypper repos' column - whether autorefresh is enabled for the repository
-#: ../src/repos.cc:707 ../src/repos.cc:2084
+#: ../src/repos.cc:708 ../src/repos.cc:2158
msgid "Refresh"
msgstr "Refresh"
#. translators: repository priority (in zypper repos -p or -d)
-#: ../src/repos.cc:711 ../src/repos.cc:2088
+#: ../src/repos.cc:712 ../src/repos.cc:821 ../src/repos.cc:2162
msgid "Priority"
msgstr ""
-#: ../src/repos.cc:715 ../src/repos.cc:2091
+#: ../src/repos.cc:716 ../src/repos.cc:816 ../src/repos.cc:2165
msgid "URI"
msgstr ""
-#: ../src/repos.cc:717
+#. "/etc/init.d/ script that might be used to restart the command (guessed)
+#: ../src/repos.cc:718 ../src/utils/misc.cc:445
#, fuzzy
msgid "Service"
msgstr "ISDN service"
-#: ../src/repos.cc:761
+#: ../src/repos.cc:762
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
-#: ../src/repos.cc:837 ../src/repos.cc:909 ../src/repos.cc:1079
+#: ../src/repos.cc:824
+#, fuzzy
+#| msgid "Autorefresh"
+msgid "Auto-refresh"
+msgstr "Autorefresh"
+
+#: ../src/repos.cc:824 ../src/repos.cc:827 ../src/repos.cc:833
+msgid "On"
+msgstr "On"
+
+#: ../src/repos.cc:824 ../src/repos.cc:827 ../src/repos.cc:833
+msgid "Off"
+msgstr "Off"
+
+#: ../src/repos.cc:827
+#, fuzzy
+msgid "Keep Packages"
+msgstr "System area items"
+
+#: ../src/repos.cc:833
+#, fuzzy
+#| msgid "DNS Check"
+msgid "GPG Check"
+msgstr "DNS Check"
+
+#: ../src/repos.cc:836
+msgid "GPG Key URI"
+msgstr ""
+
+#: ../src/repos.cc:839
+#, fuzzy
+#| msgid "Dial Prefix"
+msgid "Path Prefix"
+msgstr "Dial Prefix"
+
+#: ../src/repos.cc:842
+#, fuzzy
+#| msgid "Print Server"
+msgid "Parent Service"
+msgstr "Print Server"
+
+#: ../src/repos.cc:845
+msgid "MD Cache Path"
+msgstr ""
+
+#: ../src/repos.cc:899 ../src/repos.cc:973 ../src/repos.cc:1143
msgid "Error reading repositories:"
msgstr "Error reading repositories:"
-#: ../src/repos.cc:865 ../src/repos.cc:2213
+#: ../src/repos.cc:927 ../src/repos.cc:2287
#, fuzzy, c-format
msgid "Can't open %s for writing."
msgstr "Cannot open file for writing."
-#: ../src/repos.cc:867 ../src/repos.cc:2215
+#: ../src/repos.cc:929 ../src/repos.cc:2289
#, fuzzy
msgid "Maybe you do not have write permissions?"
msgstr "Can't open %s for writing. Maybe you don't have write permissions?"
-#: ../src/repos.cc:874 ../src/repos.cc:2222
+#: ../src/repos.cc:936 ../src/repos.cc:2296
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Repositories have been successfully exported to %s."
-#: ../src/repos.cc:927 ../src/repos.cc:1097
+#: ../src/repos.cc:991 ../src/repos.cc:1161
#, fuzzy
msgid "Specified repositories: "
msgstr "Specified repositories have been refreshed."
-#: ../src/repos.cc:966
+#: ../src/repos.cc:1030
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:981
+#: ../src/repos.cc:1045
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Skipping repository '%s' because of the above error."
-#: ../src/repos.cc:996
+#: ../src/repos.cc:1060
#, fuzzy, c-format
msgid "Use '%s' or '%s' commands to add or enable repositories."
msgstr "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
-#: ../src/repos.cc:999
+#: ../src/repos.cc:1063
msgid "Specified repositories are not enabled or defined."
msgstr "Specified repositories are not enabled or defined."
-#: ../src/repos.cc:1001
+#: ../src/repos.cc:1065
msgid "There are no enabled repositories defined."
msgstr "There are no enabled repositories defined."
-#: ../src/repos.cc:1005
+#: ../src/repos.cc:1069
msgid "Could not refresh the repositories because of errors."
msgstr "Could not refresh the repositories because of errors."
-#: ../src/repos.cc:1011
+#: ../src/repos.cc:1075
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Some of the repositories have not been refreshed because of an error."
-#: ../src/repos.cc:1016
+#: ../src/repos.cc:1080
msgid "Specified repositories have been refreshed."
msgstr "Specified repositories have been refreshed."
-#: ../src/repos.cc:1018
+#: ../src/repos.cc:1082
msgid "All repositories have been refreshed."
msgstr "All repositories have been refreshed."
-#: ../src/repos.cc:1154
+#: ../src/repos.cc:1218
#, fuzzy, c-format
msgid "Cleaning metadata cache for '%s'."
msgstr "Error parsing metadata for '%s':"
-#: ../src/repos.cc:1161
+#: ../src/repos.cc:1228
#, fuzzy, c-format
msgid "Cleaning raw metadata cache for '%s'."
msgstr "Error parsing metadata for '%s':"
+#: ../src/repos.cc:1235
+#, fuzzy, c-format
+msgid "Keeping raw metadata cache for %s '%s'."
+msgstr "Error parsing metadata for '%s':"
+
#. translators: meaning the cached rpm files
-#: ../src/repos.cc:1169
+#: ../src/repos.cc:1243
#, fuzzy, c-format
msgid "Cleaning packages for '%s'."
msgstr "Reading packages from %s"
-#: ../src/repos.cc:1177
+#: ../src/repos.cc:1251
#, fuzzy, c-format
msgid "Cannot clean repository '%s' because of an error."
msgstr "Disabling repository '%s' because of the above error."
-#: ../src/repos.cc:1191
+#: ../src/repos.cc:1265
#, fuzzy
msgid "Cleaning installed packages cache."
msgstr "Reading installed packages"
-#: ../src/repos.cc:1199
+#: ../src/repos.cc:1273
#, fuzzy
msgid "Cannot clean installed packages cache because of an error."
msgstr "Disabling repository '%s' because of the above error."
-#: ../src/repos.cc:1207
+#: ../src/repos.cc:1281
#, fuzzy
msgid "Could not clean the repositories because of errors."
msgstr "Could not refresh the repositories because of errors."
-#: ../src/repos.cc:1214
+#: ../src/repos.cc:1288
#, fuzzy
msgid "Some of the repositories have not been cleaned up because of an error."
msgstr "Some of the repositories have not been refreshed because of an error."
-#: ../src/repos.cc:1219
+#: ../src/repos.cc:1293
#, fuzzy
msgid "Specified repositories have been cleaned up."
msgstr "Specified repositories have been refreshed."
-#: ../src/repos.cc:1221
+#: ../src/repos.cc:1295
#, fuzzy
msgid "All repositories have been cleaned up."
msgstr "All repositories have been refreshed."
-#: ../src/repos.cc:1261
+#: ../src/repos.cc:1335
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "This is a changeable read-only media (CD/DVD), disabling autorefresh."
-#: ../src/repos.cc:1282 ../src/repos.cc:1543
+#: ../src/repos.cc:1356 ../src/repos.cc:1617
#, fuzzy, c-format
msgid "Repository named '%s' already exists. Please use another alias."
msgstr "Repository named '%s' already exists. Please, use another alias."
-#: ../src/repos.cc:1293
+#: ../src/repos.cc:1367
#, fuzzy
msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:"
msgstr "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
-#: ../src/repos.cc:1300 ../src/Zypper.cc:2429
+#: ../src/repos.cc:1374 ../src/Zypper.cc:2535
msgid "Can't find a valid repository at given location:"
msgstr "Can't find a valid repository at given location:"
-#: ../src/repos.cc:1309
+#: ../src/repos.cc:1383
#, fuzzy
msgid "Problem transferring repository data from specified URI:"
msgstr "Problem transferring repository data from specified URL:"
-#: ../src/repos.cc:1310
+#: ../src/repos.cc:1384
#, fuzzy
msgid "Please check whether the specified URI is accessible."
msgstr "Please, check whether the specified URL is accessible."
-#: ../src/repos.cc:1318
+#: ../src/repos.cc:1392
msgid "Unknown problem when adding repository:"
msgstr "Unknown problem when adding repository:"
-#: ../src/repos.cc:1324
+#: ../src/repos.cc:1398
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Repository '%s' successfully added"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/repos.cc:1338
+#: ../src/repos.cc:1412
msgid "Autorefresh"
msgstr "Autorefresh"
-#: ../src/repos.cc:1353
+#: ../src/repos.cc:1427
#, c-format
msgid "Reading data from '%s' media"
msgstr "Reading data from '%s' media"
-#: ../src/repos.cc:1360
+#: ../src/repos.cc:1434
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Problem reading data from '%s' media"
-#: ../src/repos.cc:1361
+#: ../src/repos.cc:1435
#, fuzzy
msgid "Please check if your installation media is valid and readable."
msgstr "Please, check if your installation media is valid and readable."
-#: ../src/repos.cc:1426
+#: ../src/repos.cc:1500
#, fuzzy
msgid "Problem accessing the file at the specified URI"
msgstr "Problem transferring repository data from specified URL:"
-#: ../src/repos.cc:1427
+#: ../src/repos.cc:1501
#, fuzzy
msgid "Please check if the URI is valid and accessible."
msgstr "Please, check whether the specified URL is accessible."
-#: ../src/repos.cc:1435
+#: ../src/repos.cc:1509
#, fuzzy
msgid "Problem parsing the file at the specified URI"
msgstr "Problem transferring repository data from specified URL:"
#. TranslatorExplanation don't translate the URI if the URI itself is not translated.
#. Also don't translate the '.repo' string.
-#: ../src/repos.cc:1438
+#: ../src/repos.cc:1512
msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
msgstr ""
-#: ../src/repos.cc:1446
+#: ../src/repos.cc:1520
#, fuzzy
msgid "Problem encountered while trying to read the file at the specified URI"
msgstr "Problem transferring repository data from specified URL:"
-#: ../src/repos.cc:1460
+#: ../src/repos.cc:1534
#, fuzzy
msgid "Repository with no alias defined found in the file, skipping."
msgstr "Repository '%s' not found."
-#: ../src/repos.cc:1467
+#: ../src/repos.cc:1541
#, fuzzy, c-format
msgid "Repository '%s' has no URI defined, skipping."
msgstr "Repository '%s' not found."
-#: ../src/repos.cc:1507
+#: ../src/repos.cc:1581
#, fuzzy, c-format
msgid "Repository '%s' has been removed."
msgstr "Repository %s has been removed."
-#: ../src/repos.cc:1526
+#: ../src/repos.cc:1600
#, c-format
msgid "Cannot change alias of '%s' repository. The repository belongs to service '%s' which is responsible for setting its alias."
msgstr ""
-#: ../src/repos.cc:1537
+#: ../src/repos.cc:1611
#, fuzzy, c-format
msgid "Repository '%s' renamed to '%s'."
msgstr "Repository %s renamed to %s"
-#: ../src/repos.cc:1549 ../src/repos.cc:1769
+#: ../src/repos.cc:1623 ../src/repos.cc:1843
msgid "Error while modifying the repository:"
msgstr "Error while modifying the repository:"
-#: ../src/repos.cc:1550
+#: ../src/repos.cc:1624
#, fuzzy, c-format
msgid "Leaving repository '%s' unchanged."
msgstr "Leaving repository %s unchanged."
-#: ../src/repos.cc:1687
+#: ../src/repos.cc:1761
#, c-format
msgid "Invalid priority '%s'. Use a positive integer number. The greater the number, the lower the priority."
msgstr ""
-#: ../src/repos.cc:1695
+#: ../src/repos.cc:1769
#, fuzzy, c-format
msgid "Repository '%s' priority has been left unchanged (%d)"
msgstr "Repository %s has been removed."
-#: ../src/repos.cc:1721
-#, c-format
-msgid "Repository '%s' has been sucessfully enabled."
+#: ../src/repos.cc:1795
+#, fuzzy, c-format
+#| msgid "Repository '%s' has been sucessfully enabled."
+msgid "Repository '%s' has been successfully enabled."
msgstr "Repository '%s' has been successfully enabled."
-#: ../src/repos.cc:1724
-#, c-format
-msgid "Repository '%s' has been sucessfully disabled."
+#: ../src/repos.cc:1798
+#, fuzzy, c-format
+#| msgid "Repository '%s' has been sucessfully disabled."
+msgid "Repository '%s' has been successfully disabled."
msgstr "Repository '%s' has been successfully disabled."
-#: ../src/repos.cc:1731
+#: ../src/repos.cc:1805
#, c-format
msgid "Autorefresh has been enabled for repository '%s'."
msgstr ""
-#: ../src/repos.cc:1734
+#: ../src/repos.cc:1808
#, fuzzy, c-format
msgid "Autorefresh has been disabled for repository '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:1741
+#: ../src/repos.cc:1815
#, fuzzy, c-format
msgid "RPM files caching has been enabled for repository '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:1744
+#: ../src/repos.cc:1818
#, fuzzy, c-format
msgid "RPM files caching has been disabled for repository '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:1750
+#: ../src/repos.cc:1824
#, fuzzy, c-format
msgid "Repository '%s' priority has been set to %d."
msgstr "Repository %s has been removed."
-#: ../src/repos.cc:1756
+#: ../src/repos.cc:1830
#, fuzzy, c-format
msgid "Name of repository '%s' has been set to '%s'."
msgstr "Repository %s has been removed."
-#: ../src/repos.cc:1762
+#: ../src/repos.cc:1836
#, fuzzy, c-format
msgid "Nothing to change for repository '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:1770
+#: ../src/repos.cc:1844
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Leaving repository %s unchanged."
-#: ../src/repos.cc:1808
+#: ../src/repos.cc:1882
#, fuzzy
msgid "Error reading services:"
msgstr "Error reading repositories:"
-#: ../src/repos.cc:1897
+#: ../src/repos.cc:1971
#, fuzzy, c-format
msgid "Service '%s' not found by its alias, number, or URI."
msgstr "Repository '%s' not found by its alias or number."
-#: ../src/repos.cc:1901
+#: ../src/repos.cc:1975
#, fuzzy, c-format
msgid "Use '%s' to get the list of defined services."
msgstr "Use 'zypper repos' to get the list of defined repositories."
-#: ../src/repos.cc:2127
+#: ../src/repos.cc:2201
#, fuzzy, c-format
msgid "No services defined. Use the '%s' command to add one or more services."
msgstr "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
-#: ../src/repos.cc:2253
+#: ../src/repos.cc:2327
#, fuzzy, c-format
msgid "Service aliased '%s' already exists. Please use another alias."
msgstr "Repository named '%s' already exists. Please, use another alias."
-#: ../src/repos.cc:2263
+#: ../src/repos.cc:2337
#, fuzzy, c-format
msgid "Error occured while adding service '%s'."
msgstr "Error reading sector %u."
-#: ../src/repos.cc:2269
+#: ../src/repos.cc:2343
#, fuzzy, c-format
msgid "Service '%s' has been successfully added."
msgstr "Repository %s has been successfully modified."
-#: ../src/repos.cc:2308
+#: ../src/repos.cc:2382
#, fuzzy, c-format
msgid "Removing service '%s':"
msgstr "Removing repository '%s'"
-#: ../src/repos.cc:2311
+#: ../src/repos.cc:2385
#, fuzzy, c-format
msgid "Service '%s' has been removed."
msgstr "Repository %s has been removed."
-#: ../src/repos.cc:2327
+#: ../src/repos.cc:2401
#, fuzzy, c-format
msgid "Refreshing service '%s'."
msgstr "Refreshing '%s'"
-#: ../src/repos.cc:2336
+#: ../src/repos.cc:2410
#, fuzzy, c-format
msgid "Problem retrieving the repository index file for service '%s':"
msgstr "Error reading repository description file for '%s'."
-#: ../src/repos.cc:2338
+#: ../src/repos.cc:2412
#, fuzzy
msgid "Check if the URI is valid and accessible."
msgstr "Please, check whether the specified URL is accessible."
-#: ../src/repos.cc:2396
+#: ../src/repos.cc:2470
#, fuzzy, c-format
msgid "Skipping disabled service '%s'"
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2442
+#: ../src/repos.cc:2516
#, fuzzy, c-format
msgid "Skipping service '%s' because of the above error."
msgstr "Skipping repository '%s' because of the above error."
-#: ../src/repos.cc:2457
+#: ../src/repos.cc:2531
#, fuzzy, c-format
msgid "Use '%s' or '%s' commands to add or enable services."
msgstr "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
-#: ../src/repos.cc:2460
+#: ../src/repos.cc:2534
#, fuzzy
msgid "Specified services are not enabled or defined."
msgstr "Specified repositories are not enabled or defined."
-#: ../src/repos.cc:2462
+#: ../src/repos.cc:2536
#, fuzzy
msgid "There are no enabled services defined."
msgstr "There are no enabled repositories defined."
-#: ../src/repos.cc:2466
+#: ../src/repos.cc:2540
#, fuzzy
msgid "Could not refresh the services because of errors."
msgstr "Could not refresh the repositories because of errors."
-#: ../src/repos.cc:2472
+#: ../src/repos.cc:2546
#, fuzzy
msgid "Some of the services have not been refreshed because of an error."
msgstr "Some of the repositories have not been refreshed because of an error."
-#: ../src/repos.cc:2477
+#: ../src/repos.cc:2551
#, fuzzy
msgid "Specified services have been refreshed."
msgstr "Specified repositories have been refreshed."
-#: ../src/repos.cc:2479
+#: ../src/repos.cc:2553
#, fuzzy
msgid "All services have been refreshed."
msgstr "All repositories have been refreshed."
-#: ../src/repos.cc:2601
+#: ../src/repos.cc:2675
#, fuzzy, c-format
msgid "Service '%s' has been sucessfully enabled."
msgstr "Repository %s has been successfully modified."
-#: ../src/repos.cc:2604
+#: ../src/repos.cc:2678
#, fuzzy, c-format
msgid "Service '%s' has been sucessfully disabled."
msgstr "Repository %s has been successfully modified."
-#: ../src/repos.cc:2611
+#: ../src/repos.cc:2685
#, fuzzy, c-format
msgid "Autorefresh has been enabled for service '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2614
+#: ../src/repos.cc:2688
#, fuzzy, c-format
msgid "Autorefresh has been disabled for service '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2620
+#: ../src/repos.cc:2694
#, fuzzy, c-format
msgid "Name of service '%s' has been set to '%s'."
msgstr "Repository %s has been removed."
-#: ../src/repos.cc:2626
+#: ../src/repos.cc:2700
#, fuzzy, c-format
msgid "Repository '%s' has been added to enabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been added to enabled repositories of service '%s'"
msgstr[0] "Skipping disabled repository '%s'"
msgstr[1] "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2634
+#: ../src/repos.cc:2708
#, fuzzy, c-format
msgid "Repository '%s' has been added to disabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been added to disabled repositories of service '%s'"
msgstr[0] "Skipping disabled repository '%s'"
msgstr[1] "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2642
+#: ../src/repos.cc:2716
#, fuzzy, c-format
msgid "Repository '%s' has been removed from enabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been removed from enabled repositories of service '%s'"
msgstr[0] "Skipping disabled repository '%s'"
msgstr[1] "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2650
+#: ../src/repos.cc:2724
#, fuzzy, c-format
msgid "Repository '%s' has been removed from disabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been removed from disabled repositories of service '%s'"
msgstr[0] "Skipping disabled repository '%s'"
msgstr[1] "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2659
+#: ../src/repos.cc:2733
#, fuzzy, c-format
msgid "Nothing to change for service '%s'."
msgstr "Skipping disabled repository '%s'"
-#: ../src/repos.cc:2666
+#: ../src/repos.cc:2740
#, fuzzy
msgid "Error while modifying the service:"
msgstr "Error while modifying the repository:"
-#: ../src/repos.cc:2667
+#: ../src/repos.cc:2741
#, fuzzy, c-format
msgid "Leaving service %s unchanged."
msgstr "Leaving repository %s unchanged."
-#: ../src/repos.cc:2774
+#: ../src/repos.cc:2848
#, fuzzy
msgid "Loading repository data..."
msgstr "Retrieving repository '%s' data..."
-#: ../src/repos.cc:2792
+#: ../src/repos.cc:2866
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Retrieving repository '%s' data..."
-#: ../src/repos.cc:2799
+#: ../src/repos.cc:2873
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Repository '%s' not cached. Caching..."
-#: ../src/repos.cc:2806 ../src/repos.cc:2834
+#: ../src/repos.cc:2880 ../src/repos.cc:2908
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Problem loading data from '%s'"
-#: ../src/repos.cc:2807 ../src/repos.cc:2840
+#: ../src/repos.cc:2881 ../src/repos.cc:2914
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Resolvables from '%s' not loaded because of error."
-#: ../src/repos.cc:2823
+#: ../src/repos.cc:2897
#, c-format
msgid "Repository '%s' appears to outdated. Consider using a different mirror or server."
msgstr ""
#. translators: the first %s is 'zypper refresh' and the second 'zypper clean -m'
-#: ../src/repos.cc:2836
+#: ../src/repos.cc:2910
#, c-format
msgid "Try '%s', or even '%s' before doing so."
msgstr ""
-#: ../src/repos.cc:2849
+#: ../src/repos.cc:2923
#, fuzzy
msgid "Reading installed packages..."
msgstr "Reading installed packages"
-#: ../src/repos.cc:2860
+#: ../src/repos.cc:2934
#, fuzzy
msgid "Problem occured while reading the installed packages:"
msgstr "An error occurred while reading from the repository."
#. list name, exact match
-#: ../src/repos.cc:2875
+#: ../src/repos.cc:2949
#, fuzzy
msgid ""
"ZENworks Management Daemon is running.\n"
@@ -1511,20 +1623,20 @@ msgstr ""
"Use rug or yast2 for that.\n"
#. translators: Bundle is a term used in rug. See rug for how to translate it.
-#: ../src/search.cc:42 ../src/search.cc:448 ../src/update.cc:417
+#: ../src/search.cc:42 ../src/search.cc:448 ../src/update.cc:443
msgid "Bundle"
msgstr "Bundle"
#. translators: package version (header)
#: ../src/search.cc:46 ../src/search.cc:60 ../src/search.cc:269
-#: ../src/search.cc:390 ../src/search.cc:451 ../src/search.cc:539
-#: ../src/update.cc:153 ../src/update.cc:423
+#: ../src/search.cc:390 ../src/search.cc:451 ../src/search.cc:541
+#: ../src/update.cc:193 ../src/update.cc:876
msgid "Version"
msgstr "Version"
#. translators: package architecture (header)
#: ../src/search.cc:48 ../src/search.cc:62 ../src/search.cc:451
-#: ../src/update.cc:423
+#: ../src/search.cc:547 ../src/update.cc:452
msgid "Arch"
msgstr "Arch"
@@ -1534,10 +1646,17 @@ msgid "System Packages"
msgstr "System area items"
#. translators: package summary (header)
-#: ../src/search.cc:221
+#: ../src/search.cc:221 ../src/update.cc:876
msgid "Summary"
msgstr "Summary"
+#. translators: patch category (recommended, security)
+#. translators: product category (base/addon), the rug term
+#: ../src/search.cc:271 ../src/search.cc:544 ../src/update.cc:193
+#: ../src/update.cc:775 ../src/update.cc:876
+msgid "Category"
+msgstr "Category"
+
#: ../src/search.cc:351
msgid "No needed patches found."
msgstr "No needed patches found."
@@ -1547,33 +1666,33 @@ msgstr "No needed patches found."
msgid "No patterns found."
msgstr "No updates found."
-#: ../src/search.cc:501 ../src/Zypper.cc:3330
+#: ../src/search.cc:501 ../src/Zypper.cc:3438
#, fuzzy
msgid "No packages found."
msgstr "No updates found."
-#: ../src/search.cc:578
+#: ../src/search.cc:616
#, fuzzy
msgid "No products found."
msgstr "No updates found."
-#: ../src/search.cc:601
+#: ../src/search.cc:639
#, fuzzy, c-format
msgid "No providers of '%s' found."
msgstr "No matches found"
#. translators: meaning 'dependency problem' found during solving
-#: ../src/solve-commit.cc:44
+#: ../src/solve-commit.cc:43
msgid "Problem: "
msgstr "Problem: "
#. TranslatorExplanation %d is the solution number
-#: ../src/solve-commit.cc:57
+#: ../src/solve-commit.cc:56
#, c-format
msgid " Solution %d: "
msgstr " Solution %d: "
-#: ../src/solve-commit.cc:76
+#: ../src/solve-commit.cc:75
#, fuzzy
msgid "Choose the above solution using '1' or skip, retry or cancel"
msgid_plural "Choose from above solutions by number or skip, retry or cancel"
@@ -1582,7 +1701,7 @@ msgstr[1] "number, (r)etry or (c)ancel> "
#. translators: translate 'c' to whatever you translated the 'c' in
#. "c" and "s/r/c" strings
-#: ../src/solve-commit.cc:83
+#: ../src/solve-commit.cc:82
#, fuzzy
msgid "Choose the above solution using '1' or cancel using 'c'"
msgid_plural "Choose from above solutions by number or cancel"
@@ -1595,7 +1714,7 @@ msgstr[1] "number, (r)etry or (c)ancel> "
#. The anserws must be separated by slash characters '/' and must
#. correspond to skip/retry/cancel in that order.
#. The answers should be lower case letters.
-#: ../src/solve-commit.cc:102
+#: ../src/solve-commit.cc:101
msgid "s/r/c"
msgstr ""
@@ -1606,17 +1725,17 @@ msgstr ""
#. See the "s/r/c" comment for other details.
#. One letter string for translation can be tricky, so in case of problems,
#. please report a bug against zypper at bugzilla.novell.com, we'll try to solve it.
-#: ../src/solve-commit.cc:114
+#: ../src/solve-commit.cc:113
msgid "c"
msgstr "c"
#. continue with next problem
-#: ../src/solve-commit.cc:134
+#: ../src/solve-commit.cc:133
#, c-format
msgid "Applying solution %s"
msgstr "Applying solution %s"
-#: ../src/solve-commit.cc:158
+#: ../src/solve-commit.cc:157
#, fuzzy, c-format
msgid "%d Problem:"
msgid_plural "%d Problems:"
@@ -1624,389 +1743,545 @@ msgstr[0] "%s Problems:"
msgstr[1] "%s Problems:"
#. should not happen! If solve() failed at least one problem must be set!
-#: ../src/solve-commit.cc:162
+#: ../src/solve-commit.cc:161
msgid "Specified capability not found"
msgstr "Specified capability not found"
-#: ../src/solve-commit.cc:173
+#: ../src/solve-commit.cc:172
#, fuzzy, c-format
msgid "Problem: %s"
msgstr "Problem: "
-#: ../src/solve-commit.cc:188
+#: ../src/solve-commit.cc:187
msgid "Resolving dependencies..."
msgstr "Resolving dependencies..."
-#: ../src/solve-commit.cc:369
+#. translators: meaning --force-resolution and --no-force-resolution
+#: ../src/solve-commit.cc:232
+#, fuzzy, c-format
+msgid "%s conflicts with %s, will use the less aggressive %s"
+msgstr "%s conflicts with other resolvables"
+
+#: ../src/solve-commit.cc:258
+#, fuzzy
+msgid "Force resolution:"
+msgstr "Resolution"
+
+#: ../src/solve-commit.cc:319
+#, fuzzy
+msgid "Verifying dependencies..."
+msgstr "Resolving dependencies..."
+
+#. compute the upgrade
+#: ../src/solve-commit.cc:354
+msgid "Computing upgrade..."
+msgstr ""
+
+#: ../src/solve-commit.cc:370
+msgid "Generating solver test case..."
+msgstr "Generating solver test case..."
+
+#: ../src/solve-commit.cc:373
+#, fuzzy, c-format
+msgid "Solver test case generated successfully at %s."
+msgstr "Solver test case generated successfully."
+
+#: ../src/solve-commit.cc:377
+msgid "Error creating the solver test case."
+msgstr "Error creating the solver test case."
+
+#: ../src/solve-commit.cc:408 ../src/utils/misc.cc:419
+msgid "Checking for running processes using deleted libraries..."
+msgstr ""
+
+#: ../src/solve-commit.cc:417 ../src/utils/misc.cc:428
+#, fuzzy
+#| msgid "failed"
+msgid "Check failed:"
+msgstr "failed"
+
+#: ../src/solve-commit.cc:423
+#, c-format
+msgid "There are some running programs that use files deleted by recent upgrade. You may wish to restart some of them. Run '%s' to list these programs."
+msgstr ""
+
+#: ../src/solve-commit.cc:462
+msgid "Computing distribution upgrade..."
+msgstr ""
+
+#: ../src/solve-commit.cc:467
+#, fuzzy
+msgid "Resolving package dependencies..."
+msgstr "Resolving dependencies..."
+
+#: ../src/solve-commit.cc:518
+msgid "Some of the dependencies of installed packages are broken. In order to fix these dependencies, the following actions need to be taken:"
+msgstr ""
+
+#: ../src/solve-commit.cc:526
+#, fuzzy
+msgid "Root privileges are required to fix broken package dependencies."
+msgstr "Root privileges are required for updating packages."
+
+#. translators: These are the "Continue?" prompt options corresponding to
+#. "Yes / No / show Problems / Versions / Arch / Repository /
+#. vendor / Details / show in pager". This prompt will appear
+#. after install/update and similar command installation summary.
+#. Translate to whathever is suitable for your language
+#. The anserws must be separated by slash characters '/' and must
+#. correspond to the above options, in that exact order.
+#. The answers should be lower case letters, but in general, any UTF-8
+#. string will do.
+#. ! \todo add c for changelog and x for explain (show the dep tree)
+#: ../src/solve-commit.cc:553
+msgid "y/n/p/v/a/r/m/d/g"
+msgstr ""
+
+#. translators: help text for 'y' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:558
+#, fuzzy
+msgid "Yes, accept the summary and proceed with installation/removal of packages."
+msgstr "An error occurred during the installation."
+
+#. translators: help text for 'n' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:560
+msgid "No, cancel the operation."
+msgstr ""
+
+#. translators: help text for 'p' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:562
+msgid "Restart solver in no-force-resolution mode in order to show dependency problems."
+msgstr ""
+
+#. translators: help text for 'v' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:564
+msgid "Toggle display of package versions."
+msgstr ""
+
+#. translators: help text for 'a' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:566
+msgid "Toggle display of package architectures."
+msgstr ""
+
+#. translators: help text for 'r' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:568
+#, fuzzy
+#| msgid "The following packages will be installed:\n"
+msgid "Toggle display of repositories from which the packages will be installed."
+msgstr "The following packages will be installed:\n"
+
+#. translators: help text for 'm' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:570
+msgid "Toggle display of package vendor names."
+msgstr ""
+
+#. translators: help text for 'd' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:572
+msgid "Toggle between showing all details and as few details as possible."
+msgstr ""
+
+#. translators: help text for 'g' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:574
+msgid "View the summary in pager."
+msgstr ""
+
+#: ../src/solve-commit.cc:667
+msgid "committing"
+msgstr "committing"
+
+#: ../src/solve-commit.cc:669
+msgid "(dry run)"
+msgstr ""
+
+#: ../src/solve-commit.cc:689 ../src/solve-commit.cc:729
+#, fuzzy
+msgid "Problem retrieving the package file from the repository:"
+msgstr "Problem downloading files from '%s'."
+
+#. translators: the first %s is 'zypper refresh' and the second
+#. is repo allias
+#: ../src/solve-commit.cc:725
+#, fuzzy, c-format
+msgid "Repository '%s' is out of date. Running '%s' might help."
+msgstr "Repository '%s' is up to date."
+
+#: ../src/solve-commit.cc:738
+msgid ""
+"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
+"\n"
+"- just retry previous command\n"
+"- refresh the repositories using 'zypper refresh'\n"
+"- use another installation medium (if e.g. damaged)\n"
+"- use another repository"
+msgstr ""
+"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
+"\n"
+"- just retry previous command\n"
+"- refresh the repositories using 'zypper refresh'\n"
+"- use another installation medium (if e.g. damaged)\n"
+"- use another repository"
+
+#: ../src/solve-commit.cc:752
+#, fuzzy
+msgid "Problem occured during or after installation or removal of packages:"
+msgstr "An error occurred during the installation."
+
+#: ../src/solve-commit.cc:768
+#, fuzzy
+msgid "One of installed patches requires reboot of your machine. Reboot as soon as possible."
+msgstr "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
+
+#: ../src/solve-commit.cc:777
+#, fuzzy
+msgid "One of installed patches affects the package manager itself. Run this command once more to install any other needed patches."
+msgstr "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
+
+#: ../src/solve-commit.cc:794
+msgid "Dependencies of all installed packages are satisfied."
+msgstr ""
+
+#: ../src/solve-commit.cc:796
+msgid "Nothing to do."
+msgstr "Nothing to do."
+
+#: ../src/Summary.cc:356
+#, fuzzy
+msgid "The following NEW package is going to be installed:"
+msgid_plural "The following NEW packages are going to be installed:"
+msgstr[0] "The following packages will be installed:\n"
+msgstr[1] "The following packages will be installed:\n"
+
+#: ../src/Summary.cc:361
+#, fuzzy
+msgid "The following NEW patch is going to be installed:"
+msgid_plural "The following NEW patches are going to be installed:"
+msgstr[0] "The following packages will be installed:\n"
+msgstr[1] "The following packages will be installed:\n"
+
+#: ../src/Summary.cc:366
+#, fuzzy
+msgid "The following NEW pattern is going to be installed:"
+msgid_plural "The following NEW patterns are going to be installed:"
+msgstr[0] "The following packages will be installed:\n"
+msgstr[1] "The following packages will be installed:\n"
+
+#: ../src/Summary.cc:371
+#, fuzzy
+msgid "The following NEW product is going to be installed:"
+msgid_plural "The following NEW products are going to be installed:"
+msgstr[0] "The following packages will be installed:\n"
+msgstr[1] "The following packages will be installed:\n"
+
+#: ../src/Summary.cc:376
+#, fuzzy
+msgid "The following source package is going to be installed:"
+msgid_plural "The following source packages are going to be installed:"
+msgstr[0] "The following packages will be installed:\n"
+msgstr[1] "The following packages will be installed:\n"
+
+#: ../src/Summary.cc:396
+#, fuzzy
+msgid "The following package is going to be REMOVED:"
+msgid_plural "The following packages are going to be REMOVED:"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
+
+#: ../src/Summary.cc:401
+#, fuzzy
+msgid "The following patch is going to be REMOVED:"
+msgid_plural "The following patches are going to be REMOVED:"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
+
+#: ../src/Summary.cc:406
+#, fuzzy
+msgid "The following pattern is going to be REMOVED:"
+msgid_plural "The following patterns are going to be REMOVED:"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
+
+#: ../src/Summary.cc:411
+#, fuzzy
+msgid "The following product is going to be REMOVED:"
+msgid_plural "The following products are going to be REMOVED:"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
+
+#: ../src/Summary.cc:430
#, fuzzy
msgid "The following package is going to be upgraded:"
msgid_plural "The following packages are going to be upgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:374
+#: ../src/Summary.cc:435
#, fuzzy
msgid "The following patch is going to be upgraded:"
msgid_plural "The following patches are going to be upgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:379
+#: ../src/Summary.cc:440
#, fuzzy
msgid "The following pattern is going to be upgraded:"
msgid_plural "The following patterns are going to be upgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:384
+#: ../src/Summary.cc:445
#, fuzzy
msgid "The following product is going to be upgraded:"
msgid_plural "The following products are going to be upgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:391
+#: ../src/Summary.cc:463
#, fuzzy
msgid "The following package is going to be downgraded:"
msgid_plural "The following packages are going to be downgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:396
+#: ../src/Summary.cc:468
#, fuzzy
msgid "The following patch is going to be downgraded:"
msgid_plural "The following patches are going to be downgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:401
+#: ../src/Summary.cc:473
#, fuzzy
msgid "The following pattern is going to be downgraded:"
msgid_plural "The following patterns are going to be downgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:406
+#: ../src/Summary.cc:478
#, fuzzy
msgid "The following product is going to be downgraded:"
msgid_plural "The following products are going to be downgraded:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:413
-#, fuzzy
-msgid "The following NEW package is going to be installed:"
-msgid_plural "The following NEW packages are going to be installed:"
-msgstr[0] "The following packages will be installed:\n"
-msgstr[1] "The following packages will be installed:\n"
-
-#: ../src/solve-commit.cc:418
-#, fuzzy
-msgid "The following NEW patch is going to be installed:"
-msgid_plural "The following NEW patches are going to be installed:"
-msgstr[0] "The following packages will be installed:\n"
-msgstr[1] "The following packages will be installed:\n"
-
-#: ../src/solve-commit.cc:423
-#, fuzzy
-msgid "The following NEW pattern is going to be installed:"
-msgid_plural "The following NEW patterns are going to be installed:"
-msgstr[0] "The following packages will be installed:\n"
-msgstr[1] "The following packages will be installed:\n"
-
-#: ../src/solve-commit.cc:428
-#, fuzzy
-msgid "The following NEW product is going to be installed:"
-msgid_plural "The following NEW products are going to be installed:"
-msgstr[0] "The following packages will be installed:\n"
-msgstr[1] "The following packages will be installed:\n"
-
-#: ../src/solve-commit.cc:433
-#, fuzzy
-msgid "The following source package is going to be installed:"
-msgid_plural "The following source packages are going to be installed:"
-msgstr[0] "The following packages will be installed:\n"
-msgstr[1] "The following packages will be installed:\n"
-
-#: ../src/solve-commit.cc:440
+#: ../src/Summary.cc:496
#, fuzzy
msgid "The following package is going to be reinstalled:"
msgid_plural "The following packages are going to be reinstalled:"
msgstr[0] "The following packages will be installed:\n"
msgstr[1] "The following packages will be installed:\n"
-#: ../src/solve-commit.cc:445
+#: ../src/Summary.cc:501
#, fuzzy
msgid "The following patch is going to be reinstalled:"
msgid_plural "The following patches are going to be reinstalled:"
msgstr[0] "The following packages will be installed:\n"
msgstr[1] "The following packages will be installed:\n"
-#: ../src/solve-commit.cc:450
+#: ../src/Summary.cc:506
#, fuzzy
msgid "The following pattern is going to be reinstalled:"
msgid_plural "The following patterns are going to be reinstalled:"
msgstr[0] "The following packages will be installed:\n"
msgstr[1] "The following packages will be installed:\n"
-#: ../src/solve-commit.cc:455
+#: ../src/Summary.cc:511
#, fuzzy
msgid "The following product is going to be reinstalled:"
msgid_plural "The following products are going to be reinstalled:"
msgstr[0] "The following packages will be installed:\n"
msgstr[1] "The following packages will be installed:\n"
-#: ../src/solve-commit.cc:462
-#, fuzzy
-msgid "The following package is going to be REMOVED:"
-msgid_plural "The following packages are going to be REMOVED:"
-msgstr[0] "The following packages will be updated:\n"
-msgstr[1] "The following packages will be updated:\n"
-
-#: ../src/solve-commit.cc:467
-#, fuzzy
-msgid "The following patch is going to be REMOVED:"
-msgid_plural "The following patches are going to be REMOVED:"
-msgstr[0] "The following packages will be updated:\n"
-msgstr[1] "The following packages will be updated:\n"
-
-#: ../src/solve-commit.cc:472
-#, fuzzy
-msgid "The following pattern is going to be REMOVED:"
-msgid_plural "The following patterns are going to be REMOVED:"
-msgstr[0] "The following packages will be updated:\n"
-msgstr[1] "The following packages will be updated:\n"
-
-#: ../src/solve-commit.cc:477
-#, fuzzy
-msgid "The following product is going to be REMOVED:"
-msgid_plural "The following products are going to be REMOVED:"
-msgstr[0] "The following packages will be updated:\n"
-msgstr[1] "The following packages will be updated:\n"
-
-#: ../src/solve-commit.cc:484
+#: ../src/Summary.cc:557
#, fuzzy
msgid "The following package is going to change architecture:"
msgid_plural "The following packages are going to change architecture:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:489
+#: ../src/Summary.cc:562
#, fuzzy
msgid "The following patch is going to change architecture:"
msgid_plural "The following patches are going to change architecture:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:494
+#: ../src/Summary.cc:567
#, fuzzy
msgid "The following pattern is going to change architecture:"
msgid_plural "The following patterns are going to change architecture:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:499
+#: ../src/Summary.cc:572
#, fuzzy
msgid "The following product is going to change architecture:"
msgid_plural "The following products are going to change architecture:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:506
+#: ../src/Summary.cc:593
#, fuzzy
msgid "The following package is going to change vendor:"
msgid_plural "The following packages are going to change vendor:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:511
+#: ../src/Summary.cc:598
#, fuzzy
msgid "The following patch is going to change vendor:"
msgid_plural "The following patches are going to change vendor:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:516
+#: ../src/Summary.cc:603
#, fuzzy
msgid "The following pattern is going to change vendor:"
msgid_plural "The following patterns are going to change vendor:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:521
+#: ../src/Summary.cc:608
#, fuzzy
msgid "The following product is going to change vendor:"
msgid_plural "The following products are going to change vendor:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:529
+#: ../src/Summary.cc:628
#, fuzzy
msgid "The following package is not supported by its vendor:"
msgid_plural "The following packages are not supported by their vendor:"
msgstr[0] "The following packages will be updated:\n"
msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:603
-msgid "Dependencies of all installed packages are satisfied."
-msgstr ""
-
-#: ../src/solve-commit.cc:605
-msgid "Nothing to do."
-msgstr "Nothing to do."
-
-#: ../src/solve-commit.cc:610
-msgid "Some of the dependencies of installed packages are broken. In order to fix these dependencies, the following actions need to be taken:"
-msgstr ""
-
-#: ../src/solve-commit.cc:764
+#: ../src/Summary.cc:647
#, c-format
msgid "Overall download size: %s."
msgstr "Overall download size: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/solve-commit.cc:769
+#: ../src/Summary.cc:652
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "After the operation, additional %s will be used."
-#: ../src/solve-commit.cc:772
+#: ../src/Summary.cc:655
msgid "No additional space will be used or freed after the operation."
msgstr ""
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/solve-commit.cc:779
+#: ../src/Summary.cc:662
#, c-format
msgid "After the operation, %s will be freed."
msgstr "After the operation, %s will be freed."
-#. translators: meaning --force-resolution and --no-force-resolution
-#: ../src/solve-commit.cc:829
-#, fuzzy, c-format
-msgid "%s conflicts with %s, will use the less aggressive %s"
-msgstr "%s conflicts with other resolvables"
-
-#: ../src/solve-commit.cc:855
-#, fuzzy
-msgid "Force resolution:"
-msgstr "Resolution"
-
-#: ../src/solve-commit.cc:911
-#, fuzzy
-msgid "Verifying dependencies..."
-msgstr "Resolving dependencies..."
-
-#: ../src/solve-commit.cc:920
-msgid "Computing upgrade..."
-msgstr ""
-
-#: ../src/solve-commit.cc:936
-msgid "Generating solver test case..."
-msgstr "Generating solver test case..."
-
-#: ../src/solve-commit.cc:939
-#, fuzzy, c-format
-msgid "Solver test case generated successfully at %s."
-msgstr "Solver test case generated successfully."
-
-#: ../src/solve-commit.cc:943
-msgid "Error creating the solver test case."
-msgstr "Error creating the solver test case."
-
-#: ../src/solve-commit.cc:977
-msgid "Computing distribution upgrade..."
-msgstr ""
-
-#: ../src/solve-commit.cc:983
-#, fuzzy
-msgid "Resolving package dependencies..."
-msgstr "Resolving dependencies..."
-
-#: ../src/solve-commit.cc:1017
-#, fuzzy
-msgid "Root privileges are required to fix broken package dependencies."
-msgstr "Root privileges are required for updating packages."
-
-#. translators: Yes / No / show Problems. This prompt will appear
-#. after install/update command summary if there will be any package
-#. to-be-removed automatically to show why, if asked.
-#. Translate to whathever is suitable for your language
-#. The anserws must be separated by slash characters '/' and must
-#. correspond to yes/no/showproblems in that order.
-#. The answers should be lower case letters.
-#: ../src/solve-commit.cc:1034
-msgid "y/n/p"
-msgstr ""
-
-#. translators: help text for 'y' option in the y/n/p prompt
-#: ../src/solve-commit.cc:1036
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:685
#, fuzzy
-msgid "Accept the summary and proceed with installation/removal of packages."
-msgstr "An error occurred during the installation."
-
-#. translators: help text for 'n' option in the y/n/p prompt
-#: ../src/solve-commit.cc:1038
-msgid "Cancel the operation."
-msgstr ""
-
-#. translators: help text for 'p' option in the y/n/p prompt
-#: ../src/solve-commit.cc:1040
-msgid "Restart solver in no-force-resolution mode in order to show dependency problems."
-msgstr ""
-
-#: ../src/solve-commit.cc:1082
-msgid "committing"
-msgstr "committing"
-
-#: ../src/solve-commit.cc:1087
-msgid "(dry run)"
-msgstr ""
+msgid "package to upgrade"
+msgid_plural "packages to upgrade"
+msgstr[0] "No updates found."
+msgstr[1] "No updates found."
-#: ../src/solve-commit.cc:1116 ../src/solve-commit.cc:1155
-#, fuzzy
-msgid "Problem retrieving the package file from the repository:"
-msgstr "Problem downloading files from '%s'."
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:697
+msgid "to downgrade"
+msgid_plural "to downgrade"
+msgstr[0] ""
+msgstr[1] ""
-#. translators: the first %s is 'zypper refresh' and the second
-#. is repo allias
-#: ../src/solve-commit.cc:1151
-#, fuzzy, c-format
-msgid "Repository '%s' is out of date. Running '%s' might help."
-msgstr "Repository '%s' is up to date."
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:700
+msgid "package to downgrade"
+msgid_plural "packages to downgrade"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1163
-msgid ""
-"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
-"\n"
-"- just retry previous command\n"
-"- refresh the repositories using 'zypper refresh'\n"
-"- use another installation medium (if e.g. damaged)\n"
-"- use another repository"
-msgstr ""
-"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
-"\n"
-"- just retry previous command\n"
-"- refresh the repositories using 'zypper refresh'\n"
-"- use another installation medium (if e.g. damaged)\n"
-"- use another repository"
+#. translators: this text will be preceded by a number e.g. "5 new"
+#: ../src/Summary.cc:712
+#, fuzzy
+#| msgid "New"
+msgid "new"
+msgid_plural "new"
+msgstr[0] "New"
+msgstr[1] "New"
+
+#. translators: this text will be preceded by a number e.g. "5 new to install"
+#: ../src/Summary.cc:715
+#, fuzzy
+#| msgid "No need to install %s"
+msgid "new package to install"
+msgid_plural "new packages to install"
+msgstr[0] "No need to install %s"
+msgstr[1] "No need to install %s"
+
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:727
+#, fuzzy
+#| msgid "install"
+msgid "to reinstall"
+msgid_plural "to reinstall"
+msgstr[0] "install"
+msgstr[1] "install"
+
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:730
+#, fuzzy
+#| msgid "Package Installation"
+msgid "package to reinstall"
+msgid_plural "packages to reinstall"
+msgstr[0] "Package Installation"
+msgstr[1] "Package Installation"
+
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:742
+#, fuzzy
+#| msgid "%s remove ok"
+msgid "to remove"
+msgid_plural "to remove"
+msgstr[0] "%s remove ok"
+msgstr[1] "%s remove ok"
+
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:745
+#, fuzzy
+#| msgid "Unable to remove ^%s\n"
+msgid "package to remove"
+msgid_plural "packages to remove"
+msgstr[0] "Unable to remove ^%s\n"
+msgstr[1] "Unable to remove ^%s\n"
+
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:757
+msgid "to change vendor"
+msgid_plural " to change vendor"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1176
+#. translators: this text will be preceded by a number e.g. "5 packages ..."
+#: ../src/Summary.cc:760
#, fuzzy
-msgid "Problem occured during or after installation or removal of packages:"
-msgstr "An error occurred during the installation."
+msgid "package will change vendor"
+msgid_plural "packages will change vendor"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
-#: ../src/solve-commit.cc:1196
-#, fuzzy
-msgid "One of installed patches requires reboot of your machine. Reboot as soon as possible."
-msgstr "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:772
+msgid "to change arch"
+msgid_plural "to change arch"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1200
-#, fuzzy
-msgid "One of installed patches affects the package manager itself. Run this command once more to install any other needed patches."
-msgstr "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
+#. translators: this text will be preceded by a number e.g. "5 packages ..."
+#: ../src/Summary.cc:775
+msgid "package will change arch"
+msgid_plural "packages will change arch"
+msgstr[0] ""
+msgstr[1] ""
#. translators: %d is the number of needed patches
-#: ../src/update.cc:65
+#: ../src/update.cc:73
#, c-format
msgid "%d patch needed"
msgid_plural "%d patches needed"
@@ -2014,83 +2289,178 @@ msgstr[0] ""
msgstr[1] ""
#. translators: %d is the number of security patches
-#: ../src/update.cc:69
+#: ../src/update.cc:77
#, fuzzy, c-format
msgid "%d security patch"
msgid_plural "%d security patches"
msgstr[0] "%d patches needed (%d security patches)"
msgstr[1] "%d patches needed (%d security patches)"
-#: ../src/update.cc:175 ../src/utils/misc.cc:113
-msgid "Needed"
+#: ../src/update.cc:215
+#, fuzzy
+#| msgid "Needed"
+msgid "needed"
msgstr "Needed"
-#: ../src/update.cc:193
+#: ../src/update.cc:215
#, fuzzy
-msgid ""
-"These are only the updates affecting the updater itself.\n"
-"Other updates are available too.\n"
-msgstr ""
-"WARNING: These are only the updates affecting the updater itself.\n"
-"There are others available too.\n"
+#| msgid "Not Needed"
+msgid "not needed"
+msgstr "Not Needed"
+
+#: ../src/update.cc:233
+#, fuzzy
+#| msgid "The following packages will be installed:\n"
+msgid "The following software management updates will be installed first:"
+msgstr "The following packages will be installed:\n"
-#: ../src/update.cc:201 ../src/update.cc:464
+#: ../src/update.cc:242 ../src/update.cc:498
msgid "No updates found."
msgstr "No updates found."
-#: ../src/update.cc:338
+#: ../src/update.cc:248
+#, fuzzy
+#| msgid "New software updates are available."
+msgid "The following updates are also available:"
+msgstr "New software updates are available."
+
+#: ../src/update.cc:363
msgid "Package updates"
msgstr ""
-#: ../src/update.cc:340
+#: ../src/update.cc:365
msgid "Patches"
msgstr "Patches"
-#: ../src/update.cc:342
+#: ../src/update.cc:367
#, fuzzy
msgid "Pattern updates"
msgstr "Battery Status"
-#: ../src/update.cc:344
+#: ../src/update.cc:369
msgid "Product updates"
msgstr ""
-#: ../src/update.cc:528
+#: ../src/update.cc:451
+#, fuzzy
+#| msgid "Current Connection"
+msgid "Current Version"
+msgstr "Current Connection"
+
+#: ../src/update.cc:452
+#, fuzzy
+#| msgid "Available Memory"
+msgid "Available Version"
+msgstr "Available Memory"
+
+#: ../src/update.cc:562
#, fuzzy, c-format
msgid "Cannot parse '%s < %s'"
msgstr "Cannot open %s: %m"
#. translators: %s is the name of a patch
-#: ../src/update.cc:584
+#: ../src/update.cc:591
#, fuzzy, c-format
msgid "'%s' is interactive, skipping."
msgstr "WARNING: %s is interactive, skipped."
-#: ../src/update.cc:639
+#: ../src/update.cc:651
#, fuzzy, c-format
msgid "No patches matching '%s' found."
msgstr "No matches found"
-#: ../src/update.cc:642
+#: ../src/update.cc:654
#, fuzzy, c-format
msgid "Patch '%s' not found."
msgstr "%s '%s' not found"
-#: ../src/update.cc:710
+#: ../src/update.cc:721
#, fuzzy, c-format
msgid "No packages matching '%s' are installed."
msgstr "Skipping %s: already installed"
-#: ../src/update.cc:713
+#: ../src/update.cc:724
#, fuzzy, c-format
msgid "Package '%s' is not installed."
msgstr "Packages Are Being Installed..."
-#: ../src/update.cc:730
+#: ../src/update.cc:739
#, fuzzy, c-format
msgid "No update candidate for '%s'."
msgstr "No URLs defined for '%s'."
+#: ../src/update.cc:775
+msgid "Issue"
+msgstr ""
+
+#: ../src/update.cc:775
+#, fuzzy
+#| msgid "No"
+msgid "No."
+msgstr "No"
+
+#: ../src/update.cc:775
+msgid "Patch"
+msgstr "Patch"
+
+#: ../src/update.cc:804
+#, c-format
+msgid "Ignoring %s without argument because similar option with an argument has been specified."
+msgstr ""
+
+#: ../src/update.cc:909
+#, fuzzy
+#| msgid "No matches found"
+msgid "No matching issues found."
+msgstr "No matches found"
+
+#: ../src/update.cc:918
+#, fuzzy
+msgid "The following matches in issue numbers have been found:"
+msgstr "The following packages will be updated:\n"
+
+#: ../src/update.cc:929
+msgid "Matches in patch descriptions of the following patches have been found:"
+msgstr ""
+
+#: ../src/update.cc:1000
+#, c-format
+msgid "Fix for bugzilla issue number %s was not found or is not needed."
+msgstr ""
+
+#: ../src/update.cc:1004
+#, c-format
+msgid "Fix for CVE issue number %s was not found or is not needed."
+msgstr ""
+
+#: ../src/utils/Augeas.cc:26
+#, fuzzy
+#| msgid "Cannot copy the configuration template."
+msgid "Cannot initialize configuration file parser."
+msgstr "Cannot copy the configuration template."
+
+#: ../src/utils/Augeas.cc:43 ../src/utils/Augeas.cc:55
+msgid "Augeas error: setting config file to load failed."
+msgstr ""
+
+#: ../src/utils/Augeas.cc:61
+#, fuzzy
+#| msgid "Cannot parse the certificate."
+msgid "Could not parse the config files."
+msgstr "Cannot parse the certificate."
+
+#: ../src/utils/Augeas.cc:95
+#, fuzzy
+#| msgid "An idmapd configuration file is required."
+msgid "No configuration file exists or could be parsed."
+msgstr "An idmapd configuration file is required."
+
+#: ../src/utils/Augeas.cc:98
+#, fuzzy
+#| msgid "Error parsing the CRL."
+msgid "Error parsing zypper.conf:"
+msgstr "Error parsing the CRL."
+
#. For '-garbage' argument, with 'a', 'b', and 'e' as known options,
#. getopt_long reports 'a', 'b', and 'e' as known options.
#. The rest ends here and it is either the last one from previous argument
@@ -2118,11 +2488,11 @@ msgstr "Please file a bug report about this."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
#: ../src/utils/messages.cc:25
-msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
-msgstr "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
+msgid "See http://en.opensuse.org/Zypper/Troubleshooting for instructions."
+msgstr "See http://en.opensuse.org/Zypper/Troubleshooting for instructions."
#: ../src/utils/messages.cc:40 ../src/utils/messages.cc:50
-#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3706
+#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3823
#, fuzzy
msgid "Usage"
msgstr "Osage"
@@ -2132,7 +2502,7 @@ msgstr "Osage"
msgid "Too many arguments."
msgstr "%s: Too many arguments.\n"
-#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2715 ../src/Zypper.cc:3703
+#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2821 ../src/Zypper.cc:3820
msgid "Required argument missing."
msgstr "Required argument missing."
@@ -2146,35 +2516,35 @@ msgstr ""
msgid "You have chosen to ignore a problem with download or installation of a package which might lead to broken dependencies of other packages. It is recommended to run '%s' after the operation has finished."
msgstr ""
-#: ../src/utils/misc.cc:87
+#: ../src/utils/misc.cc:116
#, fuzzy
msgid "package"
msgid_plural "packages"
msgstr[0] "package"
msgstr[1] "package"
-#: ../src/utils/misc.cc:89
+#: ../src/utils/misc.cc:118
#, fuzzy
msgid "pattern"
msgid_plural "patterns"
msgstr[0] "pattern"
msgstr[1] "pattern"
-#: ../src/utils/misc.cc:91
+#: ../src/utils/misc.cc:120
#, fuzzy
msgid "product"
msgid_plural "product"
msgstr[0] "product"
msgstr[1] "product"
-#: ../src/utils/misc.cc:93
+#: ../src/utils/misc.cc:122
#, fuzzy
msgid "patch"
msgid_plural "patches"
msgstr[0] "patch"
msgstr[1] "patch"
-#: ../src/utils/misc.cc:95
+#: ../src/utils/misc.cc:124
#, fuzzy
msgid "srcpackage"
msgid_plural "srcpackages"
@@ -2182,54 +2552,112 @@ msgstr[0] "package"
msgstr[1] "package"
#. default
-#: ../src/utils/misc.cc:97
+#: ../src/utils/misc.cc:126
#, fuzzy
msgid "resolvable"
msgid_plural "resolvables"
msgstr[0] "Resolvable"
msgstr[1] "Resolvable"
-#: ../src/utils/misc.cc:106
+#: ../src/utils/misc.cc:135
msgid "Unknown"
msgstr "Unknown"
-#: ../src/utils/misc.cc:118
+#: ../src/utils/misc.cc:142
+msgid "Needed"
+msgstr "Needed"
+
+#: ../src/utils/misc.cc:147
msgid "Not Applicable"
msgstr "Not Applicable"
-#: ../src/utils/misc.cc:191
+#: ../src/utils/misc.cc:220
msgid "Specified local path does not exist or is not accessible."
msgstr ""
-#: ../src/utils/misc.cc:203
+#: ../src/utils/misc.cc:232
#, fuzzy
msgid "Given URI is invalid"
msgstr "Given URL is invalid."
-#: ../src/utils/misc.cc:254
+#: ../src/utils/misc.cc:283
#, fuzzy
msgid "Problem copying the specified RPM file to the cache directory."
msgstr "Problem downloading files from '%s'."
-#: ../src/utils/misc.cc:255
+#: ../src/utils/misc.cc:284
msgid "Perhaps you are running out of disk space."
msgstr ""
-#: ../src/utils/misc.cc:263
+#: ../src/utils/misc.cc:292
#, fuzzy
msgid "Problem retrieving the specified RPM file"
msgstr "Problem downloading files from '%s'."
-#: ../src/utils/misc.cc:264
+#: ../src/utils/misc.cc:293
#, fuzzy
msgid "Please check whether the file is accessible."
msgstr "Please, check whether the specified URL is accessible."
-#: ../src/utils/misc.cc:321
+#: ../src/utils/misc.cc:354
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Cannot parse capability '%s'."
+#. process ID
+#: ../src/utils/misc.cc:435
+#, fuzzy
+#| msgid "PCI"
+msgid "PID"
+msgstr "PCI"
+
+#. parent process ID
+#: ../src/utils/misc.cc:437
+msgid "PPID"
+msgstr ""
+
+#. process user ID
+#: ../src/utils/misc.cc:439
+msgid "UID"
+msgstr ""
+
+#. process login name
+#: ../src/utils/misc.cc:441
+msgid "Login"
+msgstr "Login"
+
+#. process command name
+#: ../src/utils/misc.cc:443
+msgid "Command"
+msgstr ""
+
+# menu item for selecting a file
+#. "list of deleted files or libraries accessed"
+#: ../src/utils/misc.cc:447
+#, fuzzy
+#| msgid "File"
+msgid "Files"
+msgstr "File"
+
+#: ../src/utils/misc.cc:467
+msgid "No processes using deleted files found."
+msgstr ""
+
+#: ../src/utils/misc.cc:471
+#, fuzzy
+#| msgid "The following resources are modified"
+msgid "The following running processes use deleted files:"
+msgstr "The following resources are modified"
+
+#: ../src/utils/misc.cc:474
+msgid "You may wish to restart these processes."
+msgstr ""
+
+#: ../src/utils/misc.cc:476
+#, c-format
+msgid "See '%s' for information about the meaning of values in the above table."
+msgstr ""
+
#: ../src/utils/pager.cc:37
#, fuzzy, c-format
msgid "Press '%c' to exit the pager."
@@ -2243,29 +2671,19 @@ msgstr ""
msgid "Use the Enter or Space key to scroll the text by lines or pages."
msgstr ""
-#. ----------------------------------------------------------------------------
-#: ../src/utils/prompt.cc:88
-#, fuzzy
-msgid "abort"
-msgstr "Abort"
-
-#: ../src/utils/prompt.cc:88
-msgid "retry"
-msgstr ""
-
-#: ../src/utils/prompt.cc:88
-#, fuzzy
-msgid "ignore"
-msgstr "Ignore"
+#: ../src/utils/prompt.cc:147 ../src/utils/prompt.cc:275
+#: ../src/utils/prompt.cc:345
+msgid "yes"
+msgstr "yes"
-#: ../src/utils/prompt.cc:100
-#, fuzzy
-msgid "Abort, retry, ignore?\n"
-msgstr "(A)bort, (R)etry, (I)gnore?"
+#: ../src/utils/prompt.cc:148 ../src/utils/prompt.cc:275
+#: ../src/utils/prompt.cc:345
+msgid "no"
+msgstr "no"
-#: ../src/utils/prompt.cc:135
+#: ../src/utils/prompt.cc:171 ../src/utils/prompt.cc:216
#, c-format
-msgid "autoselect %s after %u "
+msgid "Retrying in %u seconds..."
msgstr ""
#. translators: "a/r/i" are the answers to the
@@ -2274,38 +2692,35 @@ msgstr ""
#. the answers must be separated by slash characters '/' and must
#. correspond to abort/retry/ignore in that order.
#. The answers should be lower case letters.
-#: ../src/utils/prompt.cc:159
+#: ../src/utils/prompt.cc:177 ../src/utils/prompt.cc:265
msgid "a/r/i"
msgstr ""
-#: ../src/utils/prompt.cc:160
-#, fuzzy
-msgid "Abort, retry, ignore?"
-msgstr "(A)bort, (R)etry, (I)gnore?"
-
-#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:205
-#: ../src/utils/prompt.cc:261
-msgid "yes"
-msgstr "yes"
+#: ../src/utils/prompt.cc:228
+#, c-format
+msgid "Autoselecting '%s' after %u second."
+msgid_plural "Autoselecting '%s' after %u seconds."
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:206
-#: ../src/utils/prompt.cc:261
-msgid "no"
-msgstr "no"
+#: ../src/utils/prompt.cc:247
+#, fuzzy
+#| msgid "Preparing installation..."
+msgid "Trying again..."
+msgstr "Preparing installation..."
-#: ../src/utils/prompt.cc:253
+#: ../src/utils/prompt.cc:338
#, fuzzy, c-format
msgid "Invalid answer '%s'."
msgstr "Invalid serial %1."
-#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
-#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
-#: ../src/utils/prompt.cc:260
+#. translators: the %s are: 'y', 'yes' (translated), 'n', and 'no' (translated).
+#: ../src/utils/prompt.cc:344
#, c-format
-msgid "Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you."
+msgid "Enter '%s' for '%s' or '%s' for '%s' if nothing else works for you."
msgstr ""
-#: ../src/utils/prompt.cc:274
+#: ../src/utils/prompt.cc:358
#, c-format
msgid ""
"If you run zypper without a terminal, use '%s' global\n"
@@ -2313,19 +2728,19 @@ msgid ""
msgstr ""
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/utils/prompt.h:125
+#: ../src/utils/prompt.h:164
msgid "Not found"
msgstr "Not found"
-#: ../src/utils/prompt.h:125
+#: ../src/utils/prompt.h:164
msgid "I/O error"
msgstr "I/O error"
-#: ../src/utils/prompt.h:125
+#: ../src/utils/prompt.h:164
msgid "Invalid object"
msgstr "Invalid object"
-#: ../src/utils/prompt.h:132
+#: ../src/utils/prompt.h:171
msgid "Error"
msgstr "Error"
@@ -2335,6 +2750,7 @@ msgid ""
" Global Options:\n"
"\t--help, -h\t\tHelp.\n"
"\t--version, -V\t\tOutput the version number.\n"
+"\t--config, -c <file>\tUse specified config file instead of the default.\n"
"\t--quiet, -q\t\tSuppress normal output, print only error\n"
"\t\t\t\tmessages.\n"
"\t--verbose, -v\t\tIncrease verbosity.\n"
@@ -2361,7 +2777,7 @@ msgstr ""
"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
"\t--root, -R <dir>\tOperate on a different root directory.\n"
-#: ../src/Zypper.cc:171
+#: ../src/Zypper.cc:172
msgid ""
" Repository Options:\n"
"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
@@ -2371,13 +2787,13 @@ msgid ""
msgstr ""
#. translators: these belong to Repository Options main help text
-#: ../src/Zypper.cc:178
+#: ../src/Zypper.cc:179
msgid ""
"\t--no-cd\t\t\tIgnore CD/DVD repositories.\n"
"\t--no-remote\t\tIgnore remote repositories.\n"
msgstr ""
-#: ../src/Zypper.cc:182
+#: ../src/Zypper.cc:183
#, fuzzy
msgid ""
" Target Options:\n"
@@ -2388,14 +2804,14 @@ msgstr ""
" Target options:\n"
"\t--disable-system-resolvables, -T\t\tDo not read system installed resolvables\n"
-#: ../src/Zypper.cc:189
+#: ../src/Zypper.cc:190
msgid ""
" Commands:\n"
"\thelp, ?\t\t\tPrint help.\n"
"\tshell, sh\t\tAccept multiple commands at once.\n"
msgstr ""
-#: ../src/Zypper.cc:194
+#: ../src/Zypper.cc:195
msgid ""
" Repository Management:\n"
"\trepos, lr\t\tList all defined repositories.\n"
@@ -2407,7 +2823,7 @@ msgid ""
"\tclean\t\t\tClean local caches.\n"
msgstr ""
-#: ../src/Zypper.cc:204
+#: ../src/Zypper.cc:205
msgid ""
" Service Management:\n"
"\tservices, ls\t\tList all defined services.\n"
@@ -2417,7 +2833,7 @@ msgid ""
"\trefresh-services, refs\tRefresh all services.\n"
msgstr ""
-#: ../src/Zypper.cc:212
+#: ../src/Zypper.cc:213
msgid ""
" Software Management:\n"
"\tinstall, in\t\tInstall packages.\n"
@@ -2430,7 +2846,7 @@ msgid ""
"\t\t\t\tby installed packages.\n"
msgstr ""
-#: ../src/Zypper.cc:223
+#: ../src/Zypper.cc:224
msgid ""
" Update Management:\n"
"\tupdate, up\t\tUpdate installed packages with newer versions.\n"
@@ -2441,7 +2857,7 @@ msgid ""
"\tpatch-check, pchk\tCheck for patches.\n"
msgstr ""
-#: ../src/Zypper.cc:232
+#: ../src/Zypper.cc:233
msgid ""
" Querying:\n"
"\tsearch, se\t\tSearch for packages matching a pattern.\n"
@@ -2456,15 +2872,16 @@ msgid ""
"\twhat-provides, wp\tList packages providing specified capability.\n"
msgstr ""
-#: ../src/Zypper.cc:247
+#: ../src/Zypper.cc:248
msgid ""
" Package Locks:\n"
"\taddlock, al\t\tAdd a package lock.\n"
"\tremovelock, rl\t\tRemove a package lock.\n"
"\tlocks, ll\t\tList current package locks.\n"
+"\tcleanlocks, cl\t\tRemove unused locks.\n"
msgstr ""
-#: ../src/Zypper.cc:253
+#: ../src/Zypper.cc:255
msgid ""
" Other Commands:\n"
"\tversioncmp, vcmp\tCompare two version strings.\n"
@@ -2473,7 +2890,7 @@ msgid ""
"\t\t\t\tinstalled packages.\n"
msgstr ""
-#: ../src/Zypper.cc:261
+#: ../src/Zypper.cc:263
msgid ""
" Usage:\n"
"\tzypper [--global-options] <command> [--command-options] [arguments]\n"
@@ -2481,105 +2898,114 @@ msgstr ""
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: ../src/Zypper.cc:286
+#: ../src/Zypper.cc:288
#, c-format
msgid "Type '%s' to get a list of global options and commands."
msgstr ""
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: ../src/Zypper.cc:295
+#: ../src/Zypper.cc:297
#, c-format
msgid "Type '%s' to get command-specific help."
msgstr ""
-#: ../src/Zypper.cc:398
+#: ../src/Zypper.cc:409
#, c-format
msgid "Verbosity: %d"
msgstr "Verbosity: %d"
-#: ../src/Zypper.cc:412
+#: ../src/Zypper.cc:423
#, fuzzy, c-format
msgid "Invalid table style %d."
msgstr "Invalid table style "
-#: ../src/Zypper.cc:413
+#: ../src/Zypper.cc:424
#, c-format
msgid "Use an integer number from %d to %d"
msgstr ""
-#: ../src/Zypper.cc:444
+#: ../src/Zypper.cc:455
msgid "Entering non-interactive mode."
msgstr "Entering non-interactive mode."
-#: ../src/Zypper.cc:450
+#: ../src/Zypper.cc:461
#, fuzzy
msgid "Entering 'no-gpg-checks' mode."
msgstr "Entering no-gpg-checks mode."
-#: ../src/Zypper.cc:461
+#: ../src/Zypper.cc:472
msgid "The path specified in the --root option must be absolute."
msgstr ""
-#: ../src/Zypper.cc:490
+#: ../src/Zypper.cc:501
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Repositories disabled, using the database of installed packages only."
-#: ../src/Zypper.cc:502
+#: ../src/Zypper.cc:513
#, fuzzy
msgid "Autorefresh disabled."
msgstr "Autorefresh"
-#: ../src/Zypper.cc:509
+#: ../src/Zypper.cc:520
#, fuzzy
msgid "CD/DVD repositories disabled."
msgstr "Autorefresh"
-#: ../src/Zypper.cc:516
+#: ../src/Zypper.cc:527
#, fuzzy
msgid "Remote repositories disabled."
msgstr "Autorefresh"
-#: ../src/Zypper.cc:523
+#: ../src/Zypper.cc:534
#, fuzzy
msgid "Ignoring installed resolvables."
msgstr "Ignoring installed resolvables..."
#. TranslatorExplanation The %s is "--plus-repo"
-#: ../src/Zypper.cc:618
+#: ../src/Zypper.cc:645
#, c-format
msgid "The %s option has no effect here, ignoring."
msgstr ""
-#: ../src/Zypper.cc:795
+#: ../src/Zypper.cc:819
msgid "Unexpected exception."
msgstr "Unexpected exception."
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "package"
-#. ! \todo A capability is NAME[.ARCH][OP<VERSION>] now,
-#. ! the help text will be changed after release
-#: ../src/Zypper.cc:884
+#: ../src/Zypper.cc:913
#, fuzzy, c-format
msgid ""
"install (in) [options] ...\n"
"\n"
-"Install packages with specified capabilities or RPM files with specified location. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n"
+"Install packages with specified capabilities or RPM files with specified\n"
+"location. A capability is NAME[.ARCH][OP<VERSION>], where OP is one\n"
+"of <, <=, =, >=, >.\n"
"\n"
" Command options:\n"
-"-r, --repo Install packages only from the specified repository.\n"
-"-t, --type <type> Type of package (%s).\n"
-" Default: %s.\n"
-"-n, --name Select packages by plain name, not by capability.\n"
-"-C, --capability Select packages by capability.\n"
-"-f, --force Install even if the item is already installed (reinstall).\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n"
-" See 'man zypper' for more details.\n"
-" --debug-solver Create solver test case for debugging.\n"
-" --no-recommends Do not install recommended packages, only required.\n"
-"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
-" --force-resolution Force the solver to find a solution (even an agressive).\n"
-"-D, --dry-run Test the installation, do not actually install.\n"
+" --from Select packages from the specified repository.\n"
+"-r, --repo Load only the specified repository.\n"
+"-t, --type <type> Type of package (%s).\n"
+" Default: %s.\n"
+"-n, --name Select packages by plain name, not by capability.\n"
+"-C, --capability Select packages by capability.\n"
+"-f, --force Reinstall the package if the exact version is\n"
+" available in repositories.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See 'man zypper' for more details.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+" --no-force-resolution Do not force the solver to find solution,\n"
+" let it ask.\n"
+"-R, --force-resolution Force the solver to find a solution (even\n"
+" an agressive).\n"
+"-D, --dry-run Test the installation, do not actually install.\n"
+"-d, --download-only Only download the packages, do not install.\n"
msgstr ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -2593,19 +3019,16 @@ msgstr ""
" See 'man zypper' for more details.\n"
" --debug-solver Create solver test case for debugging\n"
-#. translators: this option belongs to 'install' command
-#: ../src/Zypper.cc:906
-msgid " --from Select packages only from specified repository.\n"
-msgstr ""
-
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "package"
-#: ../src/Zypper.cc:935
+#: ../src/Zypper.cc:971
#, fuzzy, c-format
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
-"Remove packages with specified capabilities. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n"
+"Remove packages with specified capabilities.\n"
+"A capability is NAME[.ARCH][OP<VERSION>], where OP is one\n"
+"of <, <=, =, >=, >.\n"
"\n"
" Command options:\n"
"-r, --repo Operate only with packages from the specified repository.\n"
@@ -2628,7 +3051,7 @@ msgstr ""
"-n, --name Select resolvables by plain name, not by capability\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/Zypper.cc:965
+#: ../src/Zypper.cc:1002
msgid ""
"source-install (si) [options] <name> ...\n"
"\n"
@@ -2640,19 +3063,37 @@ msgid ""
"-r, --repo Install packages only from specified repositories.\n"
msgstr ""
-#: ../src/Zypper.cc:993
+#: ../src/Zypper.cc:1031
+#, fuzzy
msgid ""
"verify (ve) [options]\n"
"\n"
"Check whether dependencies of installed packages are satisfied and repair eventual dependency problems.\n"
"\n"
" Command options:\n"
-" --no-recommends Do not install recommended packages, only required.\n"
-"-D, --dry-run Test the repair, do not actually do anything to the system.\n"
-"-r, --repo Use only specified repositories to install missing packages.\n"
+"-r, --repo Load only the specified repository.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-D, --dry-run Test the repair, do not actually do anything to\n"
+" the system.\n"
+"-d, --download-only Only download needed packages, do not install.\n"
msgstr ""
+"update (up) [options]\n"
+"\n"
+"Update all installed resolvables with newer versions, where applicable.\n"
+"\n"
+" Command options:\n"
+"\n"
+"-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: patch)\n"
+"-r, --repo <alias> Limit updates to the repository specified by the alias.\n"
+" --skip-interactive Skip interactive updates\n"
+"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n"
+" See man zypper for more details.\n"
+" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n"
+" --debug-solver Create solver test case for debugging\n"
-#: ../src/Zypper.cc:1017
+#: ../src/Zypper.cc:1060
msgid ""
"install-new-recommends (inr) [options]\n"
"\n"
@@ -2661,12 +3102,12 @@ msgid ""
" Command options:\n"
"-r, --repo Use only specified repositories to install packages.\n"
"-D, --dry-run Test the installation, do not actually install anything.\n"
+"-d, --download-only Only download the packages, do not install.\n"
" --debug-solver Create solver test case for debugging.\n"
msgstr ""
#. translators: the %s = "ris" (the only service type currently supported)
-#. ! \todo s/--name/--name <name> after 11.1 release.
-#: ../src/Zypper.cc:1045
+#: ../src/Zypper.cc:1087
#, c-format
msgid ""
"addservice (as) [options] <URI> <alias>\n"
@@ -2674,14 +3115,13 @@ msgid ""
"Add a repository index service to the system.\n"
"\n"
" Command options:\n"
-"-t, --type <TYPE> Type of the service (%s).\n"
+"-t, --type <type> Type of the service (%s).\n"
"-d, --disable Add the service as disabled.\n"
-"-n, --name Specify descriptive name for the service.\n"
+"-n, --name <alias> Specify descriptive name for the service.\n"
msgstr ""
#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
-#. TODO
-#: ../src/Zypper.cc:1069
+#: ../src/Zypper.cc:1110
#, fuzzy
msgid ""
"removeservice (rs) [options] \n"
@@ -2701,7 +3141,7 @@ msgstr ""
" --loose-query\tIgnore query string in the URL\n"
#. translators: %s is "--all" and "--all"
-#: ../src/Zypper.cc:1105
+#: ../src/Zypper.cc:1146
#, fuzzy, c-format
msgid ""
"modifyservice (ms) <options> \n"
@@ -2739,7 +3179,7 @@ msgstr ""
"-a, --enable-autorefresh Enable auto-refresh of the repository\n"
" --disable-autorefresh Disable auto-refresh of the repository\n"
-#: ../src/Zypper.cc:1153
+#: ../src/Zypper.cc:1194
msgid ""
"services (ls) [options]\n"
"\n"
@@ -2755,7 +3195,7 @@ msgid ""
"-N, --sort-by-name Sort the list by name.\n"
msgstr ""
-#: ../src/Zypper.cc:1179
+#: ../src/Zypper.cc:1220
msgid ""
"refresh-services (refs) [options]\n"
"\n"
@@ -2766,22 +3206,21 @@ msgid ""
msgstr ""
#. translators: the %s = "yast2, rpm-md, plaindir"
-#. ! \todo s/--name/--name <name> after 11.1 release.
-#: ../src/Zypper.cc:1208
+#: ../src/Zypper.cc:1248
#, fuzzy, c-format
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
-"addrepo (ar) [options] \n"
+"addrepo (ar) [options] \n"
"\n"
"Add a repository to the sytem. The repository can be specified by its URI or can be read from specified .repo file (even remote).\n"
"\n"
" Command options:\n"
-"-r, --repo Just another means to specify a .repo file to read.\n"
-"-t, --type <TYPE> Type of repository (%s).\n"
+"-r, --repo Just another means to specify a .repo file to read.\n"
+"-t, --type <type> Type of repository (%s).\n"
"-d, --disable Add the repository as disabled.\n"
"-c, --check Probe URI.\n"
"-C, --no-check Don't probe URI, probe later during refresh.\n"
-"-n, --name Specify descriptive name for the repository.\n"
+"-n, --name <name> Specify descriptive name for the repository.\n"
"-k, --keep-packages Enable RPM files caching.\n"
"-K, --no-keep-packages Disable RPM files caching.\n"
"-f, --refresh Enable autorefresh of the repository.\n"
@@ -2798,14 +3237,15 @@ msgstr ""
#. translators: this is just a rug compatiblity command
#. translators: this is just a rug-compatiblity command
-#: ../src/Zypper.cc:1257 ../src/Zypper.cc:2136
+#: ../src/Zypper.cc:1297 ../src/Zypper.cc:2237
msgid ""
"list-resolvables (lr)\n"
"\n"
"List available resolvable types.\n"
msgstr ""
-#: ../src/Zypper.cc:1265
+#. FIXME it's 'repos (lr) [options] [repo] ...' now. Fix after 11.2
+#: ../src/Zypper.cc:1306
msgid ""
"repos (lr) [options]\n"
"\n"
@@ -2823,11 +3263,12 @@ msgid ""
msgstr ""
#. translators: this option belongs to 'lr' command help
-#: ../src/Zypper.cc:1280
+#. FIXME add this to the rest after 11.2
+#: ../src/Zypper.cc:1322
msgid "-s, --service Show also alias of parent service.\n"
msgstr ""
-#: ../src/Zypper.cc:1295
+#: ../src/Zypper.cc:1337
#, fuzzy
msgid ""
"removerepo (rr) [options] \n"
@@ -2846,7 +3287,7 @@ msgstr ""
" --loose-auth\tIgnore user authentication data in the URL\n"
" --loose-query\tIgnore query string in the URL\n"
-#: ../src/Zypper.cc:1314
+#: ../src/Zypper.cc:1356
#, fuzzy
msgid ""
"renamerepo (nr) [options] <new-alias>\n"
@@ -2863,11 +3304,10 @@ msgstr ""
#. translators: %s is "--all|--remote|--local|--medium-type"
#. and "--all, --remote, --local, --medium-type"
-#. ! \todo s/<1-99>/<#> after 11.1 release.
-#: ../src/Zypper.cc:1346
+#: ../src/Zypper.cc:1387
#, fuzzy, c-format
msgid ""
-"modifyrepo (mr) <options> \n"
+"modifyrepo (mr) <options> ...\n"
"modifyrepo (mr) <options> <%s>\n"
"\n"
"Modify properties of repositories specified by alias, number, or URI, or by the\n"
@@ -2879,7 +3319,7 @@ msgid ""
"-r, --refresh Enable auto-refresh of the repository.\n"
"-R, --no-refresh Disable auto-refresh of the repository.\n"
"-n, --name Set a descriptive name for the repository.\n"
-"-p, --priority <1-99> Set priority of the repository.\n"
+"-p, --priority <integer> Set priority of the repository.\n"
"-k, --keep-packages Enable RPM files caching.\n"
"-K, --no-keep-packages Disable RPM files caching.\n"
"\n"
@@ -2898,7 +3338,7 @@ msgstr ""
"-a, --enable-autorefresh Enable auto-refresh of the repository\n"
" --disable-autorefresh Disable auto-refresh of the repository\n"
-#: ../src/Zypper.cc:1386
+#: ../src/Zypper.cc:1427
#, fuzzy
msgid ""
"refresh (ref) [alias|#|URI] ...\n"
@@ -2925,9 +3365,9 @@ msgstr ""
"-B, --build-only Only build the database, don't download metadata.\n"
"-D, --download-only Only download raw metadata, don't build the database\n"
-#: ../src/Zypper.cc:1415
+#: ../src/Zypper.cc:1456
msgid ""
-"clean [alias|#|URI] ...\n"
+"clean (cc) [alias|#|URI] ...\n"
"\n"
"Clean local caches.\n"
"\n"
@@ -2940,7 +3380,7 @@ msgstr ""
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "patch"
-#: ../src/Zypper.cc:1444
+#: ../src/Zypper.cc:1485
#, fuzzy, c-format
msgid ""
"list-updates (lu) [options]\n"
@@ -2969,30 +3409,58 @@ msgstr ""
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "patch"
-#: ../src/Zypper.cc:1495
-#, c-format
+#: ../src/Zypper.cc:1537
+#, fuzzy, c-format
+#| msgid ""
+#| "update (up) [options] ...\n"
+#| "\n"
+#| "Update all or specified installed packages with newer versions, if possible.\n"
+#| "\n"
+#| " Command options:\n"
+#| "\n"
+#| "-t, --type <type> Type of package (%s).\n"
+#| " Default: %s.\n"
+#| "-r, --repo Limit updates to the specified repository.\n"
+#| " --skip-interactive Skip interactive updates.\n"
+#| "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+#| " confirmation prompt.\n"
+#| " See man zypper for more details.\n"
+#| " --best-effort Do a 'best effort' approach to update. Updates\n"
+#| " to a lower than the latest version are\n"
+#| " also acceptable.\n"
+#| " --debug-solver Create solver test case for debugging.\n"
+#| " --no-recommends Do not install recommended packages, only required.\n"
+#| "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
+#| " --force-resolution Force the solver to find a solution (even an agressive).\n"
+#| "-D, --dry-run Test the update, do not actually update.\n"
msgid ""
-"update (up) [options] ...\n"
+"update (up) [options] [packagename] ...\n"
"\n"
"Update all or specified installed packages with newer versions, if possible.\n"
"\n"
" Command options:\n"
"\n"
-"-t, --type <type> Type of package (%s).\n"
-" Default: %s.\n"
-"-r, --repo Limit updates to the specified repository.\n"
-" --skip-interactive Skip interactive updates.\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
-" confirmation prompt.\n"
-" See man zypper for more details.\n"
-" --best-effort Do a 'best effort' approach to update. Updates\n"
-" to a lower than the latest version are\n"
-" also acceptable.\n"
-" --debug-solver Create solver test case for debugging.\n"
-" --no-recommends Do not install recommended packages, only required.\n"
-"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
-" --force-resolution Force the solver to find a solution (even an agressive).\n"
-"-D, --dry-run Test the update, do not actually update.\n"
+"-t, --type <type> Type of package (%s).\n"
+" Default: %s.\n"
+"-r, --repo Load only the specified repository.\n"
+" --skip-interactive Skip interactive updates.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+" --best-effort Do a 'best effort' approach to update. Updates\n"
+" to a lower than the latest version are\n"
+" also acceptable.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-R, --no-force-resolution Do not force the solver to find solution,\n"
+" let it ask.\n"
+" --force-resolution Force the solver to find a solution (even\n"
+" an agressive).\n"
+"-D, --dry-run Test the update, do not actually update.\n"
+"-d, --download-only Only download the packages, do not install.\n"
msgstr ""
"update (up) [options] [packagename] ...\n"
"\n"
@@ -3016,7 +3484,7 @@ msgstr ""
" --force-resolution Force the solver to find a solution (even an agressive).\n"
"-D, --dry-run Test the update, do not actually update.\n"
-#: ../src/Zypper.cc:1534
+#: ../src/Zypper.cc:1587
#, fuzzy
msgid ""
"patch [options]\n"
@@ -3025,13 +3493,20 @@ msgid ""
"\n"
" Command options:\n"
"\n"
-"-r, --repo Work only with specified repository.\n"
-" --skip-interactive Skip interactive patches.\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
-" confirmation prompt.\n"
-" See man zypper for more details.\n"
-" --debug-solver Create solver test case for debugging.\n"
-"-D, --dry-run Test the update, do not actually update.\n"
+" --skip-interactive Skip interactive patches.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+"-b, --bugzilla # Install patch fixing the specified bugzilla issue.\n"
+" --cve # Install patch fixing the specified CVE issue.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-r, --repo Load only the specified repository.\n"
+"-D, --dry-run Test the update, do not actually update.\n"
+"-d, --download-only Only download the packages, do not install.\n"
msgstr ""
"update (up) [options]\n"
"\n"
@@ -3047,25 +3522,21 @@ msgstr ""
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/Zypper.cc:1560
-#, fuzzy
+#: ../src/Zypper.cc:1625
msgid ""
"list-patches (lp) [options]\n"
"\n"
"List all available needed patches.\n"
"\n"
" Command options:\n"
-"-r, --repo List only patches from the specified repository.\n"
+"-b, --bugzilla[=#] List needed patches for Bugzilla issues.\n"
+" --cve[=#] List needed patches for CVE issues.\n"
+" --issues[=string] Look for issues matching the specified string.\n"
+"-a, --all List all patches, not only the needed ones.\n"
+"-r, --repo List only patches from the specified repository.\n"
msgstr ""
-"patch-check\n"
-"\n"
-"Check for available patches\n"
-"\n"
-" Command options:\n"
-"\n"
-"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/Zypper.cc:1585
+#: ../src/Zypper.cc:1657
#, fuzzy
msgid ""
"dist-upgrade (dup) [options]\n"
@@ -3074,12 +3545,17 @@ msgid ""
"\n"
" Command options:\n"
"\n"
-"-r, --repo Limit the upgrade to the specified repository.\n"
-" --no-recommends Do not install recommended packages, only required.\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n"
-" See man zypper for more details.\n"
-" --debug-solver Create solver test case for debugging\n"
-"-D, --dry-run Test the upgrade, do not actually upgrade\n"
+"-r, --repo Load only the specified repository.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+" --debug-solver Create solver test case for debugging\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-D, --dry-run Test the upgrade, do not actually upgrade\n"
+"-d, --download-only Only download the packages, do not install.\n"
msgstr ""
"update (up) [options]\n"
"\n"
@@ -3095,7 +3571,12 @@ msgstr ""
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/Zypper.cc:1627
+#. FIXME: add to the rest of the strings after 11.2 release
+#: ../src/Zypper.cc:1675
+msgid " --from Restrict upgrade to specified repository.\n"
+msgstr ""
+
+#: ../src/Zypper.cc:1705
#, fuzzy
msgid ""
"search (se) [options] [querystring] ...\n"
@@ -3142,7 +3623,7 @@ msgstr ""
"\n"
"* and ? wildcards can also be used within search strings.\n"
-#: ../src/Zypper.cc:1664
+#: ../src/Zypper.cc:1742
#, fuzzy
msgid ""
"patch-check (pchk) [options]\n"
@@ -3161,7 +3642,7 @@ msgstr ""
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/Zypper.cc:1686
+#: ../src/Zypper.cc:1764
#, fuzzy
msgid ""
"patches (pch) [repository] ...\n"
@@ -3180,7 +3661,7 @@ msgstr ""
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/Zypper.cc:1713
+#: ../src/Zypper.cc:1791
#, fuzzy
msgid ""
"packages (pa) [options] [repository] ...\n"
@@ -3207,7 +3688,7 @@ msgstr ""
"-N, --sort-by-name Sort the list by package name.\n"
"-R, --sort-by-repo Sort the list by repository.\n"
-#: ../src/Zypper.cc:1741
+#: ../src/Zypper.cc:1819
#, fuzzy
msgid ""
"patterns (pt) [options] [repository] ...\n"
@@ -3230,7 +3711,7 @@ msgstr ""
"-i, --installed-only Show only installed patterns.\n"
"-u, --uninstalled-only Show only patterns which are not installed.\n"
-#: ../src/Zypper.cc:1767
+#: ../src/Zypper.cc:1845
#, fuzzy
msgid ""
"products (pd) [options] [repository] ...\n"
@@ -3253,7 +3734,7 @@ msgstr ""
"-i, --installed-only Show only installed products.\n"
"-u, --uninstalled-only Show only products which are not installed.\n"
-#: ../src/Zypper.cc:1792
+#: ../src/Zypper.cc:1872
#, c-format
msgid ""
"info (if) [options] <name> ...\n"
@@ -3263,10 +3744,12 @@ msgid ""
" Command options:\n"
"-r, --repo Work only with the specified repository.\n"
"-t, --type <type> Type of package (%s).\n"
-" Default: %s."
+" Default: %s.\n"
+" --requires Show also requires and prerequires.\n"
+" --recommends Show also recommends."
msgstr ""
-#: ../src/Zypper.cc:1815
+#: ../src/Zypper.cc:1897
#, fuzzy, c-format
msgid ""
"patch-info <patchname> ...\n"
@@ -3281,7 +3764,7 @@ msgstr ""
"\n"
"This is a rug compatibility alias for 'zypper info -t patch'\n"
-#: ../src/Zypper.cc:1834
+#: ../src/Zypper.cc:1916
#, fuzzy, c-format
msgid ""
"pattern-info ...\n"
@@ -3296,7 +3779,7 @@ msgstr ""
"\n"
"This is a rug compatibility alias for 'zypper info -t patch'\n"
-#: ../src/Zypper.cc:1853
+#: ../src/Zypper.cc:1935
#, fuzzy, c-format
msgid ""
"product-info ...\n"
@@ -3311,7 +3794,7 @@ msgstr ""
"\n"
"This is a rug compatibility alias for 'zypper info -t patch'\n"
-#: ../src/Zypper.cc:1870
+#: ../src/Zypper.cc:1952
#, fuzzy
msgid ""
"what-provides (wp) <capability>\n"
@@ -3326,7 +3809,7 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:1921
+#: ../src/Zypper.cc:2003
#, fuzzy
msgid ""
"moo\n"
@@ -3341,7 +3824,7 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:1943
+#: ../src/Zypper.cc:2025
#, c-format
msgid ""
"addlock (al) [options] <packagename> ...\n"
@@ -3354,7 +3837,7 @@ msgid ""
" Default: %s.\n"
msgstr ""
-#: ../src/Zypper.cc:1969
+#: ../src/Zypper.cc:2051
#, c-format
msgid ""
"removelock (rl) [options] ...\n"
@@ -3365,7 +3848,7 @@ msgid ""
"-r, --repo Remove only locks with specified repository.\n"
msgstr ""
-#: ../src/Zypper.cc:1989
+#: ../src/Zypper.cc:2071
#, fuzzy
msgid ""
"locks (ll)\n"
@@ -3380,7 +3863,18 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:2029
+#: ../src/Zypper.cc:2091
+msgid ""
+"cleanlocks (cl)\n"
+"\n"
+"Remove useless locks.\n"
+"\n"
+" Command options:\n"
+"-d, --only-duplicates Clean only duplicate locks.\n"
+"-e, --only-empty Clean only locks which doesn't lock anything.\n"
+msgstr ""
+
+#: ../src/Zypper.cc:2111
#, fuzzy
msgid ""
"targetos (tos)\n"
@@ -3395,7 +3889,7 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:2048
+#: ../src/Zypper.cc:2130
#, fuzzy
msgid ""
"versioncmp (vcmp) <version1> <version2>\n"
@@ -3411,12 +3905,12 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:2068
+#: ../src/Zypper.cc:2149
#, fuzzy
msgid ""
"licenses\n"
"\n"
-"Report Licenses and EULA of currently installed software packages.\n"
+"Report licenses and EULAs of currently installed software packages.\n"
"\n"
"This command has no additional options.\n"
msgstr ""
@@ -3426,7 +3920,22 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:2085
+#: ../src/Zypper.cc:2168
+#, fuzzy
+msgid ""
+"ps\n"
+"\n"
+"List running processes which use files deleted by recent upgrades.\n"
+"\n"
+"This command has no additional options.\n"
+msgstr ""
+"moo\n"
+"\n"
+"Show an animal\n"
+"\n"
+"This command has no additional options.\n"
+
+#: ../src/Zypper.cc:2186
#, fuzzy
msgid ""
"quit (exit, ^D)\n"
@@ -3441,7 +3950,7 @@ msgstr ""
"\n"
"This command has no additional options.\n"
-#: ../src/Zypper.cc:2102
+#: ../src/Zypper.cc:2203
#, fuzzy
msgid ""
"shell (sh)\n"
@@ -3457,7 +3966,7 @@ msgstr ""
"This command has no additional options.\n"
#. translators: this is just a rug-compatiblity command
-#: ../src/Zypper.cc:2120
+#: ../src/Zypper.cc:2221
msgid ""
"service-types (st)\n"
"\n"
@@ -3467,7 +3976,7 @@ msgstr ""
#. trunslators: this is a rug-compatibility command (equivalent of
#. 'zypper addrepo -t plaindir URI'). You can refer to rug's translations
#. for how to translate specific terms like channel or service if in doubt.
-#: ../src/Zypper.cc:2158
+#: ../src/Zypper.cc:2259
msgid ""
"mount\n"
"\n"
@@ -3479,7 +3988,7 @@ msgid ""
"-r, --recurse Dive into subdirectories.\n"
msgstr ""
-#: ../src/Zypper.cc:2189
+#: ../src/Zypper.cc:2290
#, c-format
msgid ""
"patch-search [options] [querystring...]\n"
@@ -3488,7 +3997,7 @@ msgid ""
msgstr ""
#. translators: this is just a rug-compatiblity command
-#: ../src/Zypper.cc:2207
+#: ../src/Zypper.cc:2308
msgid ""
"ping [options]\n"
"\n"
@@ -3496,17 +4005,17 @@ msgid ""
"It is provided for compatibility with rug.\n"
msgstr ""
-#: ../src/Zypper.cc:2221 ../src/Zypper.cc:3988
+#: ../src/Zypper.cc:2322 ../src/Zypper.cc:4136
#, fuzzy
msgid "Unexpected program flow."
msgstr "Unexpected exception."
-#: ../src/Zypper.cc:2245
+#: ../src/Zypper.cc:2349
msgid "Non-option program arguments: "
msgstr "Non-option programme arguments: "
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/Zypper.cc:2307
+#: ../src/Zypper.cc:2413
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -3516,27 +4025,27 @@ msgstr ""
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/Zypper.cc:2334
+#: ../src/Zypper.cc:2440
#, fuzzy
msgid "Root privileges are required for refreshing services."
msgstr "Root privileges are required for refreshing system repositories."
-#: ../src/Zypper.cc:2361 ../src/Zypper.cc:2481 ../src/Zypper.cc:2708
+#: ../src/Zypper.cc:2467 ../src/Zypper.cc:2587 ../src/Zypper.cc:2814
#, fuzzy
msgid "Root privileges are required for modifying system services."
msgstr "Root privileges are required for modifying system repositories."
-#: ../src/Zypper.cc:2430
+#: ../src/Zypper.cc:2536
#, fuzzy
msgid "Could not determine the type of the repository. Check if the specified URI points to a valid repository."
msgstr "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
-#: ../src/Zypper.cc:2462
+#: ../src/Zypper.cc:2568
#, fuzzy, c-format
msgid "'%s' is not a valid service type."
msgstr "`%s' is not a valid netmask."
-#: ../src/Zypper.cc:2464
+#: ../src/Zypper.cc:2570
#, fuzzy, c-format
msgid "See '%s' or '%s' to get a list of known service types."
msgstr "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
@@ -3545,211 +4054,263 @@ msgstr "See 'zypper -h addrepo' or man zypper to get a list of known repository
#. followed by ms command help text which will explain it
#. translators: aggregate option is e.g. "--all". This message will be
#. followed by mr command help text which will explain it
-#: ../src/Zypper.cc:2493 ../src/Zypper.cc:2861
+#: ../src/Zypper.cc:2599 ../src/Zypper.cc:2968
#, fuzzy
msgid "Alias or an aggregate option is required."
msgstr "The export option is required."
-#: ../src/Zypper.cc:2527
+#: ../src/Zypper.cc:2633
#, fuzzy, c-format
msgid "Service '%s' not found."
msgstr "%s '%s' not found"
-#: ../src/Zypper.cc:2563 ../src/Zypper.cc:2707 ../src/Zypper.cc:2793
-#: ../src/Zypper.cc:2849
+#: ../src/Zypper.cc:2669 ../src/Zypper.cc:2813 ../src/Zypper.cc:2899
+#: ../src/Zypper.cc:2955
msgid "Root privileges are required for modifying system repositories."
msgstr "Root privileges are required for modifying system repositories."
-#: ../src/Zypper.cc:2612 ../src/Zypper.cc:2970
+#: ../src/Zypper.cc:2718 ../src/Zypper.cc:3081
#, fuzzy
msgid "Too few arguments."
msgstr "%s: Too many arguments.\n"
-#: ../src/Zypper.cc:2636
+#: ../src/Zypper.cc:2742
msgid "If only one argument is used, it must be a URI pointing to a .repo file."
msgstr ""
-#: ../src/Zypper.cc:2662
+#: ../src/Zypper.cc:2768
#, c-format
msgid "Cannot use %s together with %s. Using the %s setting."
msgstr ""
-#: ../src/Zypper.cc:2685
+#: ../src/Zypper.cc:2791
msgid "Specified type is not a valid repository type:"
msgstr "Specified type is not a valid repository type:"
-#: ../src/Zypper.cc:2687
+#: ../src/Zypper.cc:2793
#, fuzzy, c-format
msgid "See '%s' or '%s' to get a list of known repository types."
msgstr "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
#. translators: %s is the supplied command line argument which
#. for which no repository counterpart was found
-#: ../src/Zypper.cc:2743
+#: ../src/Zypper.cc:2849
#, fuzzy, c-format
msgid "Repository '%s' not found by alias, number or URI."
msgstr "Repository '%s' not found by its alias or number."
#. translators: %s is the supplied command line argument which
#. for which no service counterpart was found
-#: ../src/Zypper.cc:2766
+#: ../src/Zypper.cc:2872
#, fuzzy, c-format
msgid "Service '%s' not found by alias, number or URI."
msgstr "Repository '%s' not found by its alias or number."
-#: ../src/Zypper.cc:2800
+#: ../src/Zypper.cc:2906
#, fuzzy
msgid "Too few arguments. At least URI and alias are required."
msgstr "Too few arguments. At least URL and alias are required."
-#: ../src/Zypper.cc:2825
+#: ../src/Zypper.cc:2931
#, fuzzy, c-format
msgid "Repository '%s' not found."
msgstr "Repository %s not found."
-#: ../src/Zypper.cc:2891
+#: ../src/Zypper.cc:3001
#, c-format
msgid "Repository %s not found."
msgstr "Repository %s not found."
-#: ../src/Zypper.cc:2909
+#: ../src/Zypper.cc:3020
msgid "Root privileges are required for refreshing system repositories."
msgstr "Root privileges are required for refreshing system repositories."
-#: ../src/Zypper.cc:2916
+#: ../src/Zypper.cc:3027
#, c-format
msgid "The '%s' global option has no effect here."
msgstr ""
-#: ../src/Zypper.cc:2924
+#: ../src/Zypper.cc:3035
#, c-format
msgid "Arguments are not allowed if '%s' is used."
msgstr ""
-#: ../src/Zypper.cc:2950
+#: ../src/Zypper.cc:3061
#, fuzzy
msgid "Root privileges are required for cleaning local caches."
msgstr "Root privileges are required for updating packages."
-#: ../src/Zypper.cc:2971
+#: ../src/Zypper.cc:3082
#, fuzzy
msgid "At least one package name is required."
msgstr "Source package name is a required argument."
-#: ../src/Zypper.cc:2985
+#: ../src/Zypper.cc:3092
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Root privileges are required for installing or uninstalling packages."
#. translators: rug related message, shown if
#. 'zypper in --entire-catalog foorepo someargument' is specified
-#: ../src/Zypper.cc:3002
+#: ../src/Zypper.cc:3109
msgid "Ignoring arguments, marking the entire repository."
msgstr ""
-#: ../src/Zypper.cc:3012
+#: ../src/Zypper.cc:3119
#, fuzzy, c-format
msgid "Unknown package type: %s"
msgstr "Unknown resolvable type: %s"
-#: ../src/Zypper.cc:3032
+#: ../src/Zypper.cc:3139
#, c-format
msgid "'%s' looks like an RPM file. Will try to download it."
msgstr ""
-#: ../src/Zypper.cc:3045
+#: ../src/Zypper.cc:3152
#, c-format
msgid "Problem with the RPM file specified as '%s', skipping."
msgstr ""
-#: ../src/Zypper.cc:3068
+#: ../src/Zypper.cc:3176
#, c-format
msgid "Problem reading the RPM header of %s. Is it an RPM file?"
msgstr ""
-#: ../src/Zypper.cc:3093
+#: ../src/Zypper.cc:3201
msgid "Plain RPM files cache"
msgstr ""
-#: ../src/Zypper.cc:3114
+#: ../src/Zypper.cc:3222
#, fuzzy
msgid "No valid arguments specified."
msgstr "No valid request file specified."
-#: ../src/Zypper.cc:3128 ../src/Zypper.cc:3207
+#: ../src/Zypper.cc:3236 ../src/Zypper.cc:3315
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
-#: ../src/Zypper.cc:3157
+#: ../src/Zypper.cc:3265
msgid "Source package name is a required argument."
msgstr "Source package name is a required argument."
-#: ../src/Zypper.cc:3264 ../src/Zypper.cc:3524 ../src/Zypper.cc:3608
-#: ../src/Zypper.cc:3731 ../src/Zypper.cc:3799
+#: ../src/Zypper.cc:3372 ../src/Zypper.cc:3632 ../src/Zypper.cc:3725
+#: ../src/Zypper.cc:3848 ../src/Zypper.cc:3928
#, fuzzy, c-format
msgid "Unknown package type '%s'."
msgstr "Unknown resolvable type: %s"
-#: ../src/Zypper.cc:3370
+#: ../src/Zypper.cc:3478
msgid "Problem occurred initializing or executing the search query"
msgstr ""
-#: ../src/Zypper.cc:3371
+#: ../src/Zypper.cc:3479
#, fuzzy
msgid "See the above message for a hint."
msgstr "Please, see the above error message to for a hint."
#. translators: Running as 'rug', cannot use 'best-effort' option.
-#: ../src/Zypper.cc:3543 ../src/Zypper.cc:3626
+#: ../src/Zypper.cc:3653 ../src/Zypper.cc:3743
#, fuzzy, c-format
msgid "Running as '%s', cannot use '%s' option."
msgstr "Running as 'rug', can't do 'best-effort' approach to update."
-#: ../src/Zypper.cc:3571
+#: ../src/Zypper.cc:3661
+#, fuzzy, c-format
+#| msgid "Cannot open %s for reading: %s"
+msgid "Cannot use %s together with %s."
+msgstr "Cannot open %s for reading: %s"
+
+#: ../src/Zypper.cc:3694
msgid "Root privileges are required for updating packages."
msgstr "Root privileges are required for updating packages."
-#: ../src/Zypper.cc:3664
+#: ../src/Zypper.cc:3784
#, fuzzy
msgid "Root privileges are required for performing a distribution upgrade."
msgstr "Root privileges are required for refreshing system repositories."
-#: ../src/Zypper.cc:3761 ../src/Zypper.cc:3822
+#: ../src/Zypper.cc:3860
+#, fuzzy, c-format
+#| msgid "'%1' does not exist."
+msgid "Type '%s' does not support %s."
+msgstr "'%1' does not exist."
+
+#: ../src/Zypper.cc:3890 ../src/Zypper.cc:3951
#, fuzzy
msgid "Root privileges are required for adding of package locks."
msgstr "Root privileges are required for updating packages."
-#: ../src/Zypper.cc:3930
+#: ../src/Zypper.cc:4060
#, fuzzy, c-format
msgid "%s matches %s"
msgstr "%s obsoletes %s"
-#: ../src/Zypper.cc:3932
+#: ../src/Zypper.cc:4062
#, fuzzy, c-format
msgid "%s is newer than %s"
msgstr "%s is needed by %s"
-#: ../src/Zypper.cc:3934
+#: ../src/Zypper.cc:4064
#, c-format
msgid "%s is older than %s"
msgstr ""
-#: ../src/Zypper.cc:3973
+#: ../src/Zypper.cc:4121
msgid "This command only makes sense in the zypper shell."
msgstr ""
-#: ../src/Zypper.cc:3985
+#: ../src/Zypper.cc:4133
msgid "You already are running zypper's shell."
msgstr "You already are running zypper's shell."
-#: ../src/Zypper.cc:4002
+#: ../src/Zypper.cc:4150
msgid "Description"
msgstr "Description"
-#: ../src/Zypper.cc:4066
+#: ../src/Zypper.cc:4213
#, fuzzy
msgid "Resolvable Type"
msgstr "Resolvable"
+#~ msgid "Reading installed packages"
+#~ msgstr "Reading installed packages"
+
+#, fuzzy
+#~ msgid ""
+#~ "These are only the updates affecting the updater itself.\n"
+#~ "Other updates are available too.\n"
+#~ msgstr ""
+#~ "WARNING: These are only the updates affecting the updater itself.\n"
+#~ "There are others available too.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "list-patches (lp) [options]\n"
+#~ "\n"
+#~ "List all available needed patches.\n"
+#~ "\n"
+#~ " Command options:\n"
+#~ "-r, --repo List only patches from the specified repository.\n"
+#~ msgstr ""
+#~ "patch-check\n"
+#~ "\n"
+#~ "Check for available patches\n"
+#~ "\n"
+#~ " Command options:\n"
+#~ "\n"
+#~ "-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
+
+#, fuzzy
+#~ msgid "abort"
+#~ msgstr "Abort"
+
+#, fuzzy
+#~ msgid "ignore"
+#~ msgstr "Ignore"
+
+#, fuzzy
+#~ msgid "Abort, retry, ignore?\n"
+#~ msgstr "(A)bort, (R)etry, (I)gnore?"
+
#, fuzzy
#~ msgid "Root privileges are required for modifying services."
#~ msgstr "Root privileges are required for modifying system repositories."
@@ -4017,9 +4578,6 @@ msgstr "Resolvable"
#~ msgid "Applied"
#~ msgstr "Applied"
-#~ msgid "Not Needed"
-#~ msgstr "Not Needed"
-
#, fuzzy
#~ msgid "Invalid value '%s' of the %s parameter"
#~ msgstr "Invalid value for keyUsage."
diff --git a/po/en_US.po b/po/en_US.po
index cf19450..7bc1318 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-11 11:15+0100\n"
+"POT-Creation-Date: 2009-10-12 11:46+0200\n"
"PO-Revision-Date: 2008-11-24 16:51+0100\n"
"Last-Translator: Steve Beattie \n"
"Language-Team: English\n"
@@ -158,9 +158,11 @@ msgstr ""
msgid "No digest for file %s."
msgstr ""
+#. 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:256 ../src/callbacks/keyring.h:266
#: ../src/callbacks/keyring.h:288 ../src/callbacks/rpm.h:61
-#: ../src/solve-commit.cc:1041 ../src/solve-commit.cc:1065
+#: ../src/solve-commit.cc:578
msgid "Continue?"
msgstr ""
@@ -191,16 +193,54 @@ msgstr ""
#. Try to check what answers does zypper accept (it always accepts y/n at least)
#. You can also have a look at the regular expressions used to check the answer here:
#. /usr/lib/locale//LC_MESSAGES/SYS_LC_MESSAGES
-#: ../src/callbacks/media.h:84
+#: ../src/callbacks/media.h:86
#, c-format
msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."
msgstr ""
-#: ../src/callbacks/media.h:228 ../src/callbacks/media.h:235
+#. translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt
+#. Translate the a/r/i part exactly as you did the a/r/i string.
+#. the 'u' reply means 'Change URI'.
+#: ../src/callbacks/media.h:106
+msgid "a/r/i/u"
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:108
+msgid "Skip retrieval of the file and abort current operation."
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:110
+msgid "Try to retrieve the file again."
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:112
+msgid "Skip retrieval of the file and try to continue with the operation without the file."
+msgstr ""
+
+#. help text for the "Abort, retry, ignore?" prompt for media errors
+#: ../src/callbacks/media.h:114
+msgid "Change current base URI and try retrieving the file again."
+msgstr ""
+
+#. translators: this is a prompt text
+#: ../src/callbacks/media.h:119 ../src/utils/prompt.cc:178
+#: ../src/utils/prompt.cc:266
+msgid "Abort, retry, ignore?"
+msgstr ""
+
+#. translators: this is a prompt label, will appear as "New URI: "
+#: ../src/callbacks/media.h:130
+msgid "New URI"
+msgstr ""
+
+#: ../src/callbacks/media.h:267 ../src/callbacks/media.h:274
msgid "User Name"
msgstr ""
-#: ../src/callbacks/media.h:242
+#: ../src/callbacks/media.h:283
msgid "Password"
msgstr ""
@@ -234,133 +274,141 @@ msgstr ""
msgid "Running: %s (%s, %s)"
msgstr ""
-#: ../src/callbacks/rpm.h:139 ../src/callbacks/rpm.h:148
-#: ../src/callbacks/rpm.h:156 ../src/callbacks/rpm.h:163
-msgid "Reading installed packages"
-msgstr ""
-
#. translators: This text is a progress display label e.g. "Removing packagename-x.x.x [42%]"
-#: ../src/callbacks/rpm.h:183
+#: ../src/callbacks/rpm.h:135
#, c-format
msgid "Removing %s-%s"
msgstr ""
-#: ../src/callbacks/rpm.h:202
+#: ../src/callbacks/rpm.h:154
#, c-format
msgid "Removal of %s failed:"
msgstr ""
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
#. ! \todo use format
-#: ../src/callbacks/rpm.h:224
+#: ../src/callbacks/rpm.h:183
msgid "(with --nodeps)"
msgstr ""
-#: ../src/callbacks/rpm.h:224
+#: ../src/callbacks/rpm.h:183
msgid "(with --nodeps --force)"
msgstr ""
#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
-#: ../src/callbacks/rpm.h:246
+#: ../src/callbacks/rpm.h:205
#, c-format
msgid "Installing: %s-%s"
msgstr ""
-#: ../src/callbacks/rpm.h:272
+#: ../src/callbacks/rpm.h:231
#, c-format
msgid "Installation of %s-%s failed:"
msgstr ""
-#: ../src/Command.cc:174
+#: ../src/Command.cc:176
#, c-format
msgid "Unknown command '%s'"
msgstr ""
-#: ../src/info.cc:40
+#: ../src/Config.cc:73
+#, c-format
+msgid "Unknown configuration option '%s'"
+msgstr ""
+
+#: ../src/info.cc:39
msgid "Name: "
msgstr "Name: "
-#: ../src/info.cc:41
+#: ../src/info.cc:40
msgid "Version: "
msgstr "Version: "
-#: ../src/info.cc:42
+#: ../src/info.cc:41
msgid "Arch: "
msgstr "Arch: "
-#: ../src/info.cc:43
+#: ../src/info.cc:42
msgid "Vendor: "
msgstr ""
-#: ../src/info.cc:48
+#: ../src/info.cc:47
msgid "Summary: "
msgstr "Summary: "
-#: ../src/info.cc:49
+#: ../src/info.cc:48
msgid "Description: "
msgstr "Description: "
#. TranslatorExplanation E.g. "package 'zypper' not found."
#. ! \todo use a separate string for each kind so that it is translatable.
-#: ../src/info.cc:82
+#: ../src/info.cc:81
#, c-format
msgid "%s '%s' not found."
msgstr ""
-#: ../src/info.cc:94
+#: ../src/info.cc:93
#, c-format
msgid "Information for %s %s:"
msgstr ""
-#: ../src/info.cc:111
+#: ../src/info.cc:110
#, c-format
msgid "Info for type '%s' not implemented."
msgstr ""
-#: ../src/info.cc:117
+#: ../src/info.cc:116
msgid "None"
msgstr ""
-#: ../src/info.cc:118
+#: ../src/info.cc:117
msgid "Requires"
msgstr ""
-#: ../src/info.cc:119
+#: ../src/info.cc:118
msgid "Provides"
msgstr ""
-#: ../src/info.cc:120
+#: ../src/info.cc:119
msgid "Conflicts"
msgstr ""
-#: ../src/info.cc:121
+#: ../src/info.cc:120
msgid "Obsoletes"
msgstr "Obsoletes"
#. translators: package requirements table header
-#: ../src/info.cc:123
+#: ../src/info.cc:122
msgid "Requirement"
msgstr "Requirement"
#. translators: package requirements table header
-#: ../src/info.cc:125
+#: ../src/info.cc:124
msgid "Provided By"
msgstr "Provided By"
#. translators: package conflicts table header
-#: ../src/info.cc:127
+#: ../src/info.cc:126
msgid "Conflict"
msgstr ""
-#: ../src/info.cc:161 ../src/info.cc:283 ../src/info.cc:354
+#: ../src/info.cc:132
+msgid "Requires:"
+msgstr ""
+
+#: ../src/info.cc:143
+msgid "Recommends:"
+msgstr ""
+
+#: ../src/info.cc:177 ../src/info.cc:321 ../src/info.cc:392
msgid "Catalog: "
msgstr "Catalog: "
-#: ../src/info.cc:161 ../src/info.cc:283 ../src/info.cc:354
+#: ../src/info.cc:177 ../src/info.cc:321 ../src/info.cc:392
msgid "Repository: "
msgstr ""
-#: ../src/info.cc:166 ../src/info.cc:288
+#: ../src/info.cc:182 ../src/info.cc:326
msgid "Installed: "
msgstr "Installed: "
@@ -368,222 +416,222 @@ msgstr "Installed: "
#. autorefresh?
#. enabled?
#. autorefresh?
-#: ../src/info.cc:166 ../src/info.cc:223 ../src/info.cc:229 ../src/info.cc:231
-#: ../src/info.cc:288 ../src/repos.cc:735 ../src/repos.cc:737
-#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014
-#: ../src/repos.cc:2016 ../src/solve-commit.cc:855
+#. is base
+#: ../src/info.cc:182 ../src/info.cc:253 ../src/info.cc:259 ../src/info.cc:261
+#: ../src/info.cc:326 ../src/info.cc:399 ../src/info.cc:403
+#: ../src/repos.cc:736 ../src/repos.cc:738 ../src/repos.cc:818
+#: ../src/repos.cc:1410 ../src/repos.cc:1412 ../src/repos.cc:2088
+#: ../src/repos.cc:2090 ../src/search.cc:608 ../src/solve-commit.cc:258
msgid "Yes"
msgstr "Yes"
-#: ../src/info.cc:166 ../src/info.cc:223 ../src/info.cc:229 ../src/info.cc:231
-#: ../src/info.cc:288 ../src/repos.cc:735 ../src/repos.cc:737
-#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014
-#: ../src/repos.cc:2016 ../src/solve-commit.cc:855
+#: ../src/info.cc:182 ../src/info.cc:253 ../src/info.cc:259 ../src/info.cc:261
+#: ../src/info.cc:326 ../src/info.cc:399 ../src/info.cc:403
+#: ../src/repos.cc:736 ../src/repos.cc:738 ../src/repos.cc:818
+#: ../src/repos.cc:1410 ../src/repos.cc:1412 ../src/repos.cc:2088
+#: ../src/repos.cc:2090 ../src/search.cc:608 ../src/solve-commit.cc:258
msgid "No"
msgstr "No"
#. ! \todo fix this - arch?
-#: ../src/info.cc:169 ../src/info.cc:218
+#: ../src/info.cc:185 ../src/info.cc:248
msgid "Status: "
msgstr "Status: "
-#: ../src/info.cc:173
+#: ../src/info.cc:189
msgid "up-to-date"
msgstr "up-to-date"
-#: ../src/info.cc:177
+#: ../src/info.cc:193
#, c-format
msgid "out-of-date (version %s installed)"
msgstr ""
-#: ../src/info.cc:182
+#: ../src/info.cc:198
msgid "not installed"
msgstr ""
-#: ../src/info.cc:184
+#: ../src/info.cc:200
msgid "Installed Size: "
msgstr "Installed Size: "
-#: ../src/info.cc:221
+#: ../src/info.cc:251
msgid "Category: "
msgstr ""
-#: ../src/info.cc:222
+#: ../src/info.cc:252
msgid "Created On: "
msgstr ""
-#: ../src/info.cc:223
+#: ../src/info.cc:253
msgid "Reboot Required: "
msgstr ""
-#: ../src/info.cc:226
+#: ../src/info.cc:256
msgid "Package Manager Restart Required"
msgstr ""
-#: ../src/info.cc:228
+#: ../src/info.cc:258
msgid "Restart Required: "
msgstr ""
-#: ../src/info.cc:231
+#: ../src/info.cc:261
msgid "Interactive: "
msgstr ""
-#: ../src/info.cc:235
+#: ../src/info.cc:265
msgid "Provides:"
msgstr ""
-#: ../src/info.cc:244
-msgid "Requires:"
+#: ../src/info.cc:272
+msgid "Conflicts:"
msgstr ""
-#: ../src/info.cc:255 ../src/search.cc:327
+#: ../src/info.cc:293 ../src/search.cc:327
msgid "Recommended"
msgstr ""
-#: ../src/info.cc:257 ../src/search.cc:329
+#: ../src/info.cc:295 ../src/search.cc:329
msgid "Suggested"
msgstr ""
#. translators: S for 'installed Status'
#. translators: S for installed Status
#. TranslatorExplanation S stands for Status
-#: ../src/info.cc:298 ../src/search.cc:38 ../src/search.cc:54
+#: ../src/info.cc:336 ../src/search.cc:38 ../src/search.cc:54
#: ../src/search.cc:218 ../src/search.cc:389 ../src/search.cc:445
-#: ../src/search.cc:537 ../src/update.cc:412
+#: ../src/search.cc:537 ../src/update.cc:438
msgid "S"
msgstr ""
#. translators: name (general header)
-#: ../src/info.cc:298 ../src/locks.cc:39 ../src/repos.cc:655
-#: ../src/repos.cc:704 ../src/repos.cc:2081 ../src/search.cc:44
-#: ../src/search.cc:56 ../src/search.cc:219 ../src/search.cc:268
-#: ../src/search.cc:390 ../src/search.cc:451 ../src/search.cc:538
-#: ../src/update.cc:153 ../src/update.cc:420 ../src/Zypper.cc:4002
+#: ../src/info.cc:336 ../src/locks.cc:39 ../src/repos.cc:656
+#: ../src/repos.cc:705 ../src/repos.cc:815 ../src/repos.cc:2155
+#: ../src/search.cc:44 ../src/search.cc:56 ../src/search.cc:219
+#: ../src/search.cc:268 ../src/search.cc:390 ../src/search.cc:451
+#: ../src/search.cc:540 ../src/update.cc:193 ../src/update.cc:446
+#: ../src/update.cc:876 ../src/Zypper.cc:4150
msgid "Name"
msgstr "Name"
#. translators: type (general header)
-#. translators: product type (addon/base) (rug calls it Category)
-#: ../src/info.cc:298 ../src/locks.cc:43 ../src/repos.cc:655
-#: ../src/repos.cc:713 ../src/repos.cc:2089 ../src/search.cc:58
-#: ../src/search.cc:222 ../src/search.cc:545
+#: ../src/info.cc:336 ../src/locks.cc:43 ../src/repos.cc:656
+#: ../src/repos.cc:714 ../src/repos.cc:830 ../src/repos.cc:2163
+#: ../src/search.cc:58 ../src/search.cc:222
msgid "Type"
msgstr "Type"
-#: ../src/info.cc:298 ../src/search.cc:392
+#: ../src/info.cc:336 ../src/search.cc:392
msgid "Dependency"
msgstr ""
-#: ../src/info.cc:316
+#: ../src/info.cc:354
msgid "Contents"
msgstr ""
-#: ../src/info.cc:318
+#: ../src/info.cc:356
msgid "(empty)"
msgstr ""
-#. translators: patch category (recommended, security)
-#. translators: product category (the rug term)
-#: ../src/info.cc:360 ../src/search.cc:271 ../src/search.cc:542
-#: ../src/update.cc:153
-msgid "Category"
+#: ../src/info.cc:398 ../src/search.cc:548
+msgid "Is Base"
msgstr ""
-#: ../src/info.cc:361
+#: ../src/info.cc:400
msgid "Flavor"
msgstr ""
-#: ../src/info.cc:362 ../src/utils/misc.cc:111
+#: ../src/info.cc:402 ../src/utils/misc.cc:140
msgid "Installed"
msgstr ""
-#: ../src/info.cc:363
+#: ../src/info.cc:404
msgid "Short Name"
msgstr ""
#. translators: meaning a package %s or provider of capability %s
-#: ../src/install.cc:72 ../src/install.cc:186
+#: ../src/install.cc:70 ../src/install.cc:177
#, c-format
msgid "'%s' not found"
msgstr ""
#. translators: e.g. skipping package 'zypper' (the newest version already installed)
#. ! \todo capitalize the first letter
-#: ../src/install.cc:108
+#: ../src/install.cc:99
#, c-format
msgid "skipping %s '%s' (the newest version already installed)"
msgstr ""
#. translators: %s-%s.%s is name-version.arch
-#: ../src/install.cc:120
+#: ../src/install.cc:111
#, c-format
msgid "Package %s-%s.%s not found in repositories, cannot reinstall."
msgstr ""
-#: ../src/install.cc:133
+#: ../src/install.cc:124
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr ""
-#: ../src/install.cc:156
+#: ../src/install.cc:147
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr ""
-#: ../src/install.cc:378 ../src/install.cc:712
+#: ../src/install.cc:367 ../src/install.cc:724
#, c-format
msgid "'%s' is already installed."
msgstr ""
#. translators: meaning a package %s or provider of capability %s
-#: ../src/install.cc:418 ../src/install.cc:726
+#: ../src/install.cc:413 ../src/install.cc:738
#, c-format
msgid "'%s' is not installed."
msgstr ""
-#: ../src/install.cc:442
+#: ../src/install.cc:437
msgid "Cannot uninstall patches."
msgstr ""
-#: ../src/install.cc:443
+#: ../src/install.cc:438
msgid ""
"Installed status of a patch is determined solely based on its dependencies.\n"
"Patches are not installed in sense of copied files, database records,\n"
"or similar."
msgstr ""
-#: ../src/install.cc:454
+#: ../src/install.cc:449
msgid "Uninstallation of a pattern is currently not defined and implemented."
msgstr ""
-#: ../src/install.cc:468
+#: ../src/install.cc:463
#, c-format
msgid "%s contradicts %s"
msgstr ""
#. translators: meaning --force with --capability
-#: ../src/install.cc:477
+#: ../src/install.cc:472
#, c-format
msgid "%s cannot currently be used with %s"
msgstr ""
#. translators: meaning a package %s or provider of capability %s
-#: ../src/install.cc:524 ../src/install.cc:683
+#: ../src/install.cc:519 ../src/install.cc:695
#, c-format
msgid "'%s' not found."
msgstr ""
-#: ../src/install.cc:573
+#: ../src/install.cc:583
msgid "Specifying architecture when selecting packages by name is not implemented."
msgstr ""
-#: ../src/install.cc:608
+#: ../src/install.cc:620
#, fuzzy, c-format
msgid "'%s' is not a valid package or capability name."
msgstr "`%s' is not a valid netmask."
#. translators: %s are package names
-#: ../src/install.cc:716
+#: ../src/install.cc:728
#, c-format
msgid "'%s' providing '%s' is already installed."
msgstr ""
@@ -601,7 +649,7 @@ msgstr ""
#. translators: catalog (rug's word for repository) (header)
#: ../src/locks.cc:41 ../src/search.cc:40 ../src/search.cc:267
-#: ../src/update.cc:152 ../src/update.cc:414
+#: ../src/update.cc:192 ../src/update.cc:440
msgid "Catalog"
msgstr "Catalog"
@@ -611,7 +659,8 @@ msgstr ""
#. translators: package's repository (header)
#: ../src/locks.cc:43 ../src/search.cc:64 ../src/search.cc:392
-#: ../src/search.cc:450 ../src/update.cc:152 ../src/update.cc:414
+#: ../src/search.cc:450 ../src/search.cc:539 ../src/update.cc:192
+#: ../src/update.cc:440
msgid "Repository"
msgstr ""
@@ -658,114 +707,116 @@ msgid "OK OK! Exiting immediately..."
msgstr ""
#. TranslatorExplanation The first %s is name of the resolvable, the second is its kind (e.g. 'zypper package')
-#: ../src/misc.cc:136
+#: ../src/misc.cc:139
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr ""
#. translators: the first %s is the name of the package, the second
#. is " (package-type)" if other than "package" (patch/product/pattern)
-#: ../src/misc.cc:157
+#: ../src/misc.cc:160
#, c-format
msgid "In order to install '%s'%s, you must agree to terms of the following license agreement:"
msgstr ""
#. lincense prompt
-#: ../src/misc.cc:174
+#: ../src/misc.cc:177
msgid "Do you agree with the terms of the license?"
msgstr ""
-#: ../src/misc.cc:183
+#: ../src/misc.cc:186
msgid "Aborting installation due to the need for license confirmation."
msgstr ""
#. translators: %sanslate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/misc.cc:188
+#: ../src/misc.cc:191
#, c-format
msgid "Please restart the operation in interactive mode and confirm your agreement with required licenses, or use the %s option."
msgstr ""
#. translators: e.g. "... with flash package license."
#. ! \todo fix this to allow proper translation
-#: ../src/misc.cc:200
+#: ../src/misc.cc:203
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr ""
-#: ../src/misc.cc:247
+#: ../src/misc.cc:250
msgid "License"
msgstr ""
-#: ../src/misc.cc:265
+#: ../src/misc.cc:268
msgid "EULA"
msgstr ""
-#: ../src/misc.cc:283
+#: ../src/misc.cc:286
msgid "SUMMARY"
msgstr ""
-#: ../src/misc.cc:284
+#: ../src/misc.cc:287
#, fuzzy, c-format
msgid "Installed packages: %d"
msgstr "Installed Size: "
-#: ../src/misc.cc:285
+#: ../src/misc.cc:288
#, c-format
msgid "Installed packages with counterparts in repositories: %d"
msgstr ""
-#: ../src/misc.cc:286
+#: ../src/misc.cc:289
#, c-format
msgid "Installed packages with EULAs: %d"
msgstr ""
-#: ../src/misc.cc:375 ../src/misc.cc:399
+#: ../src/misc.cc:378 ../src/misc.cc:402
#, c-format
msgid "Source package '%s' not found."
msgstr ""
-#: ../src/misc.cc:409
+#: ../src/misc.cc:412
#, c-format
msgid "Installing source package %s-%s"
msgstr ""
-#: ../src/misc.cc:418
+#: ../src/misc.cc:421
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr ""
-#: ../src/misc.cc:425
+#: ../src/misc.cc:428
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr ""
-#: ../src/output/OutNormal.cc:54
+#: ../src/output/OutNormal.cc:74
msgid "Warning: "
msgstr ""
-#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:222
+#: ../src/output/OutNormal.cc:181 ../src/output/OutNormal.cc:263
+#: ../src/output/OutNormal.cc:268
msgid "error"
msgstr ""
-#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:222
+#: ../src/output/OutNormal.cc:183 ../src/output/OutNormal.cc:265
+#: ../src/output/OutNormal.cc:268
msgid "done"
msgstr ""
-#: ../src/output/OutNormal.cc:165 ../src/output/OutNormal.cc:189
-#: ../src/output/OutNormal.cc:215
+#: ../src/output/OutNormal.cc:201 ../src/output/OutNormal.cc:227
+#: ../src/output/OutNormal.cc:256
msgid "Retrieving:"
msgstr ""
-#: ../src/output/OutNormal.cc:171
+#: ../src/output/OutNormal.cc:207
msgid "starting"
msgstr ""
-#: ../src/output/OutNormal.cc:248
+#: ../src/output/OutNormal.cc:302
msgid "No help available for this prompt."
msgstr ""
-#: ../src/output/OutNormal.cc:258
+#: ../src/output/OutNormal.cc:314
msgid "no help available for this option"
msgstr ""
@@ -798,8 +849,8 @@ msgstr ""
msgid "Problem retrieving files from '%s'."
msgstr ""
-#: ../src/repos.cc:160 ../src/repos.cc:2861 ../src/solve-commit.cc:1117
-#: ../src/solve-commit.cc:1145 ../src/solve-commit.cc:1177
+#: ../src/repos.cc:160 ../src/repos.cc:2935 ../src/solve-commit.cc:690
+#: ../src/solve-commit.cc:719 ../src/solve-commit.cc:753
msgid "Please see the above error message for a hint."
msgstr ""
@@ -843,7 +894,7 @@ msgstr ""
#. TranslatorExplanation Don't translate the URL unless it is translated, too
#: ../src/repos.cc:247
-msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper#Troubleshooting"
+msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper/Troubleshooting"
msgstr ""
#: ../src/repos.cc:261
@@ -855,584 +906,633 @@ msgstr ""
msgid "Error building the cache:"
msgstr ""
-#: ../src/repos.cc:422
+#: ../src/repos.cc:423
#, c-format
msgid "Repository '%s' not found by its alias, number, or URI."
msgstr ""
-#: ../src/repos.cc:426
+#: ../src/repos.cc:427
#, c-format
msgid "Use '%s' to get the list of defined repositories."
msgstr ""
-#: ../src/repos.cc:490 ../src/repos.cc:497
+#: ../src/repos.cc:491 ../src/repos.cc:498
#, c-format
msgid "Ignoring repository '%s' because of '%s' option."
msgstr ""
-#: ../src/repos.cc:527 ../src/repos.cc:563
+#: ../src/repos.cc:528 ../src/repos.cc:564
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr ""
-#: ../src/repos.cc:545
+#: ../src/repos.cc:546
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr ""
-#: ../src/repos.cc:580
+#: ../src/repos.cc:581
#, c-format
msgid "The metadata cache needs to be built for the '%s' repository. You can run 'zypper refresh' as root to do this."
msgstr ""
-#: ../src/repos.cc:587
+#: ../src/repos.cc:588
#, c-format
msgid "Disabling repository '%s'."
msgstr ""
-#: ../src/repos.cc:624
+#: ../src/repos.cc:625
msgid "Initializing Target"
msgstr ""
-#: ../src/repos.cc:633
+#: ../src/repos.cc:634
msgid "Target initialization failed:"
msgstr ""
-#: ../src/repos.cc:635 ../src/Zypper.cc:3372
+#: ../src/repos.cc:636 ../src/Zypper.cc:3480
msgid "Running 'zypper refresh' as root might resolve the problem."
msgstr ""
#. translators: patch status (installed, uninstalled, needed)
-#: ../src/repos.cc:655 ../src/search.cc:273 ../src/update.cc:153
+#: ../src/repos.cc:656 ../src/search.cc:273 ../src/update.cc:193
msgid "Status"
msgstr "Status"
#. status
#. rug's status (active, pending => active, disabled <= enabled, disabled)
#. this is probably the closest possible compatibility arrangement
-#: ../src/repos.cc:672
+#: ../src/repos.cc:673
msgid "Active"
msgstr ""
-#: ../src/repos.cc:672
+#: ../src/repos.cc:673
msgid "Disabled"
msgstr ""
-#: ../src/repos.cc:703 ../src/repos.cc:2080 ../src/Zypper.cc:4002
+#: ../src/repos.cc:704 ../src/repos.cc:814 ../src/repos.cc:2154
+#: ../src/Zypper.cc:4150
msgid "Alias"
msgstr "Alias"
#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/repos.cc:705 ../src/repos.cc:1336 ../src/repos.cc:2082
+#: ../src/repos.cc:706 ../src/repos.cc:818 ../src/repos.cc:1410
+#: ../src/repos.cc:2156
msgid "Enabled"
msgstr ""
#. translators: 'zypper repos' column - whether autorefresh is enabled for the repository
-#: ../src/repos.cc:707 ../src/repos.cc:2084
+#: ../src/repos.cc:708 ../src/repos.cc:2158
msgid "Refresh"
msgstr ""
#. translators: repository priority (in zypper repos -p or -d)
-#: ../src/repos.cc:711 ../src/repos.cc:2088
+#: ../src/repos.cc:712 ../src/repos.cc:821 ../src/repos.cc:2162
msgid "Priority"
msgstr ""
-#: ../src/repos.cc:715 ../src/repos.cc:2091
+#: ../src/repos.cc:716 ../src/repos.cc:816 ../src/repos.cc:2165
msgid "URI"
msgstr ""
-#: ../src/repos.cc:717
+#. "/etc/init.d/ script that might be used to restart the command (guessed)
+#: ../src/repos.cc:718 ../src/utils/misc.cc:445
#, fuzzy
msgid "Service"
msgstr "Server"
-#: ../src/repos.cc:761
+#: ../src/repos.cc:762
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr ""
-#: ../src/repos.cc:837 ../src/repos.cc:909 ../src/repos.cc:1079
+#: ../src/repos.cc:824
+#, fuzzy
+#| msgid "Auto refresh"
+msgid "Auto-refresh"
+msgstr "Auto refresh"
+
+#: ../src/repos.cc:824 ../src/repos.cc:827 ../src/repos.cc:833
+msgid "On"
+msgstr ""
+
+#: ../src/repos.cc:824 ../src/repos.cc:827 ../src/repos.cc:833
+msgid "Off"
+msgstr ""
+
+#: ../src/repos.cc:827
+msgid "Keep Packages"
+msgstr ""
+
+#: ../src/repos.cc:833
+msgid "GPG Check"
+msgstr ""
+
+#: ../src/repos.cc:836
+msgid "GPG Key URI"
+msgstr ""
+
+#: ../src/repos.cc:839
+msgid "Path Prefix"
+msgstr ""
+
+#: ../src/repos.cc:842
+#, fuzzy
+msgid "Parent Service"
+msgstr "Server"
+
+#: ../src/repos.cc:845
+msgid "MD Cache Path"
+msgstr ""
+
+#: ../src/repos.cc:899 ../src/repos.cc:973 ../src/repos.cc:1143
msgid "Error reading repositories:"
msgstr ""
-#: ../src/repos.cc:865 ../src/repos.cc:2213
+#: ../src/repos.cc:927 ../src/repos.cc:2287
#, c-format
msgid "Can't open %s for writing."
msgstr ""
-#: ../src/repos.cc:867 ../src/repos.cc:2215
+#: ../src/repos.cc:929 ../src/repos.cc:2289
msgid "Maybe you do not have write permissions?"
msgstr ""
-#: ../src/repos.cc:874 ../src/repos.cc:2222
+#: ../src/repos.cc:936 ../src/repos.cc:2296
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr ""
-#: ../src/repos.cc:927 ../src/repos.cc:1097
+#: ../src/repos.cc:991 ../src/repos.cc:1161
msgid "Specified repositories: "
msgstr ""
-#: ../src/repos.cc:966
+#: ../src/repos.cc:1030
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr ""
-#: ../src/repos.cc:981
+#: ../src/repos.cc:1045
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr ""
-#: ../src/repos.cc:996
+#: ../src/repos.cc:1060
#, c-format
msgid "Use '%s' or '%s' commands to add or enable repositories."
msgstr ""
-#: ../src/repos.cc:999
+#: ../src/repos.cc:1063
msgid "Specified repositories are not enabled or defined."
msgstr ""
-#: ../src/repos.cc:1001
+#: ../src/repos.cc:1065
msgid "There are no enabled repositories defined."
msgstr ""
-#: ../src/repos.cc:1005
+#: ../src/repos.cc:1069
msgid "Could not refresh the repositories because of errors."
msgstr ""
-#: ../src/repos.cc:1011
+#: ../src/repos.cc:1075
msgid "Some of the repositories have not been refreshed because of an error."
msgstr ""
-#: ../src/repos.cc:1016
+#: ../src/repos.cc:1080
msgid "Specified repositories have been refreshed."
msgstr ""
-#: ../src/repos.cc:1018
+#: ../src/repos.cc:1082
msgid "All repositories have been refreshed."
msgstr ""
-#: ../src/repos.cc:1154
+#: ../src/repos.cc:1218
#, c-format
msgid "Cleaning metadata cache for '%s'."
msgstr ""
-#: ../src/repos.cc:1161
+#: ../src/repos.cc:1228
#, c-format
msgid "Cleaning raw metadata cache for '%s'."
msgstr ""
+#: ../src/repos.cc:1235
+#, c-format
+msgid "Keeping raw metadata cache for %s '%s'."
+msgstr ""
+
#. translators: meaning the cached rpm files
-#: ../src/repos.cc:1169
+#: ../src/repos.cc:1243
#, c-format
msgid "Cleaning packages for '%s'."
msgstr ""
-#: ../src/repos.cc:1177
+#: ../src/repos.cc:1251
#, c-format
msgid "Cannot clean repository '%s' because of an error."
msgstr ""
-#: ../src/repos.cc:1191
+#: ../src/repos.cc:1265
msgid "Cleaning installed packages cache."
msgstr ""
-#: ../src/repos.cc:1199
+#: ../src/repos.cc:1273
msgid "Cannot clean installed packages cache because of an error."
msgstr ""
-#: ../src/repos.cc:1207
+#: ../src/repos.cc:1281
msgid "Could not clean the repositories because of errors."
msgstr ""
-#: ../src/repos.cc:1214
+#: ../src/repos.cc:1288
msgid "Some of the repositories have not been cleaned up because of an error."
msgstr ""
-#: ../src/repos.cc:1219
+#: ../src/repos.cc:1293
msgid "Specified repositories have been cleaned up."
msgstr ""
-#: ../src/repos.cc:1221
+#: ../src/repos.cc:1295
msgid "All repositories have been cleaned up."
msgstr ""
-#: ../src/repos.cc:1261
+#: ../src/repos.cc:1335
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr ""
-#: ../src/repos.cc:1282 ../src/repos.cc:1543
+#: ../src/repos.cc:1356 ../src/repos.cc:1617
#, c-format
msgid "Repository named '%s' already exists. Please use another alias."
msgstr ""
-#: ../src/repos.cc:1293
+#: ../src/repos.cc:1367
msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:"
msgstr ""
-#: ../src/repos.cc:1300 ../src/Zypper.cc:2429
+#: ../src/repos.cc:1374 ../src/Zypper.cc:2535
msgid "Can't find a valid repository at given location:"
msgstr ""
-#: ../src/repos.cc:1309
+#: ../src/repos.cc:1383
msgid "Problem transferring repository data from specified URI:"
msgstr ""
-#: ../src/repos.cc:1310
+#: ../src/repos.cc:1384
msgid "Please check whether the specified URI is accessible."
msgstr ""
-#: ../src/repos.cc:1318
+#: ../src/repos.cc:1392
msgid "Unknown problem when adding repository:"
msgstr ""
-#: ../src/repos.cc:1324
+#: ../src/repos.cc:1398
#, c-format
msgid "Repository '%s' successfully added"
msgstr ""
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/repos.cc:1338
+#: ../src/repos.cc:1412
msgid "Autorefresh"
msgstr ""
-#: ../src/repos.cc:1353
+#: ../src/repos.cc:1427
#, c-format
msgid "Reading data from '%s' media"
msgstr ""
-#: ../src/repos.cc:1360
+#: ../src/repos.cc:1434
#, c-format
msgid "Problem reading data from '%s' media"
msgstr ""
-#: ../src/repos.cc:1361
+#: ../src/repos.cc:1435
msgid "Please check if your installation media is valid and readable."
msgstr ""
-#: ../src/repos.cc:1426
+#: ../src/repos.cc:1500
msgid "Problem accessing the file at the specified URI"
msgstr ""
-#: ../src/repos.cc:1427
+#: ../src/repos.cc:1501
msgid "Please check if the URI is valid and accessible."
msgstr ""
-#: ../src/repos.cc:1435
+#: ../src/repos.cc:1509
msgid "Problem parsing the file at the specified URI"
msgstr ""
#. TranslatorExplanation don't translate the URI if the URI itself is not translated.
#. Also don't translate the '.repo' string.
-#: ../src/repos.cc:1438
+#: ../src/repos.cc:1512
msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
msgstr ""
-#: ../src/repos.cc:1446
+#: ../src/repos.cc:1520
msgid "Problem encountered while trying to read the file at the specified URI"
msgstr ""
-#: ../src/repos.cc:1460
+#: ../src/repos.cc:1534
msgid "Repository with no alias defined found in the file, skipping."
msgstr ""
-#: ../src/repos.cc:1467
+#: ../src/repos.cc:1541
#, c-format
msgid "Repository '%s' has no URI defined, skipping."
msgstr ""
-#: ../src/repos.cc:1507
+#: ../src/repos.cc:1581
#, c-format
msgid "Repository '%s' has been removed."
msgstr ""
-#: ../src/repos.cc:1526
+#: ../src/repos.cc:1600
#, c-format
msgid "Cannot change alias of '%s' repository. The repository belongs to service '%s' which is responsible for setting its alias."
msgstr ""
-#: ../src/repos.cc:1537
+#: ../src/repos.cc:1611
#, c-format
msgid "Repository '%s' renamed to '%s'."
msgstr ""
-#: ../src/repos.cc:1549 ../src/repos.cc:1769
+#: ../src/repos.cc:1623 ../src/repos.cc:1843
msgid "Error while modifying the repository:"
msgstr ""
-#: ../src/repos.cc:1550
+#: ../src/repos.cc:1624
#, c-format
msgid "Leaving repository '%s' unchanged."
msgstr ""
-#: ../src/repos.cc:1687
+#: ../src/repos.cc:1761
#, c-format
msgid "Invalid priority '%s'. Use a positive integer number. The greater the number, the lower the priority."
msgstr ""
-#: ../src/repos.cc:1695
+#: ../src/repos.cc:1769
#, c-format
msgid "Repository '%s' priority has been left unchanged (%d)"
msgstr ""
-#: ../src/repos.cc:1721
-#, c-format
-msgid "Repository '%s' has been sucessfully enabled."
+#: ../src/repos.cc:1795
+#, fuzzy, c-format
+#| msgid "Repository '%s' has been sucessfully enabled."
+msgid "Repository '%s' has been successfully enabled."
msgstr "Repository '%s' has been successfully enabled."
-#: ../src/repos.cc:1724
-#, c-format
-msgid "Repository '%s' has been sucessfully disabled."
+#: ../src/repos.cc:1798
+#, fuzzy, c-format
+#| msgid "Repository '%s' has been sucessfully disabled."
+msgid "Repository '%s' has been successfully disabled."
msgstr "Repository '%s' has been successfully disabled."
-#: ../src/repos.cc:1731
+#: ../src/repos.cc:1805
#, c-format
msgid "Autorefresh has been enabled for repository '%s'."
msgstr ""
-#: ../src/repos.cc:1734
+#: ../src/repos.cc:1808
#, c-format
msgid "Autorefresh has been disabled for repository '%s'."
msgstr ""
-#: ../src/repos.cc:1741
+#: ../src/repos.cc:1815
#, c-format
msgid "RPM files caching has been enabled for repository '%s'."
msgstr ""
-#: ../src/repos.cc:1744
+#: ../src/repos.cc:1818
#, c-format
msgid "RPM files caching has been disabled for repository '%s'."
msgstr ""
-#: ../src/repos.cc:1750
+#: ../src/repos.cc:1824
#, c-format
msgid "Repository '%s' priority has been set to %d."
msgstr ""
-#: ../src/repos.cc:1756
+#: ../src/repos.cc:1830
#, c-format
msgid "Name of repository '%s' has been set to '%s'."
msgstr ""
-#: ../src/repos.cc:1762
+#: ../src/repos.cc:1836
#, c-format
msgid "Nothing to change for repository '%s'."
msgstr ""
-#: ../src/repos.cc:1770
+#: ../src/repos.cc:1844
#, c-format
msgid "Leaving repository %s unchanged."
msgstr ""
-#: ../src/repos.cc:1808
+#: ../src/repos.cc:1882
msgid "Error reading services:"
msgstr ""
-#: ../src/repos.cc:1897
+#: ../src/repos.cc:1971
#, c-format
msgid "Service '%s' not found by its alias, number, or URI."
msgstr ""
-#: ../src/repos.cc:1901
+#: ../src/repos.cc:1975
#, c-format
msgid "Use '%s' to get the list of defined services."
msgstr ""
-#: ../src/repos.cc:2127
+#: ../src/repos.cc:2201
#, c-format
msgid "No services defined. Use the '%s' command to add one or more services."
msgstr ""
-#: ../src/repos.cc:2253
+#: ../src/repos.cc:2327
#, c-format
msgid "Service aliased '%s' already exists. Please use another alias."
msgstr ""
-#: ../src/repos.cc:2263
+#: ../src/repos.cc:2337
#, c-format
msgid "Error occured while adding service '%s'."
msgstr ""
-#: ../src/repos.cc:2269
+#: ../src/repos.cc:2343
#, c-format
msgid "Service '%s' has been successfully added."
msgstr ""
-#: ../src/repos.cc:2308
+#: ../src/repos.cc:2382
#, c-format
msgid "Removing service '%s':"
msgstr ""
-#: ../src/repos.cc:2311
+#: ../src/repos.cc:2385
#, c-format
msgid "Service '%s' has been removed."
msgstr ""
-#: ../src/repos.cc:2327
+#: ../src/repos.cc:2401
#, c-format
msgid "Refreshing service '%s'."
msgstr ""
-#: ../src/repos.cc:2336
+#: ../src/repos.cc:2410
#, c-format
msgid "Problem retrieving the repository index file for service '%s':"
msgstr ""
-#: ../src/repos.cc:2338
+#: ../src/repos.cc:2412
msgid "Check if the URI is valid and accessible."
msgstr ""
-#: ../src/repos.cc:2396
+#: ../src/repos.cc:2470
#, c-format
msgid "Skipping disabled service '%s'"
msgstr ""
-#: ../src/repos.cc:2442
+#: ../src/repos.cc:2516
#, c-format
msgid "Skipping service '%s' because of the above error."
msgstr ""
-#: ../src/repos.cc:2457
+#: ../src/repos.cc:2531
#, c-format
msgid "Use '%s' or '%s' commands to add or enable services."
msgstr ""
-#: ../src/repos.cc:2460
+#: ../src/repos.cc:2534
msgid "Specified services are not enabled or defined."
msgstr ""
-#: ../src/repos.cc:2462
+#: ../src/repos.cc:2536
msgid "There are no enabled services defined."
msgstr ""
-#: ../src/repos.cc:2466
+#: ../src/repos.cc:2540
msgid "Could not refresh the services because of errors."
msgstr ""
-#: ../src/repos.cc:2472
+#: ../src/repos.cc:2546
msgid "Some of the services have not been refreshed because of an error."
msgstr ""
-#: ../src/repos.cc:2477
+#: ../src/repos.cc:2551
msgid "Specified services have been refreshed."
msgstr ""
-#: ../src/repos.cc:2479
+#: ../src/repos.cc:2553
msgid "All services have been refreshed."
msgstr ""
-#: ../src/repos.cc:2601
+#: ../src/repos.cc:2675
#, c-format
msgid "Service '%s' has been sucessfully enabled."
msgstr ""
-#: ../src/repos.cc:2604
+#: ../src/repos.cc:2678
#, c-format
msgid "Service '%s' has been sucessfully disabled."
msgstr ""
-#: ../src/repos.cc:2611
+#: ../src/repos.cc:2685
#, c-format
msgid "Autorefresh has been enabled for service '%s'."
msgstr ""
-#: ../src/repos.cc:2614
+#: ../src/repos.cc:2688
#, c-format
msgid "Autorefresh has been disabled for service '%s'."
msgstr ""
-#: ../src/repos.cc:2620
+#: ../src/repos.cc:2694
#, c-format
msgid "Name of service '%s' has been set to '%s'."
msgstr ""
-#: ../src/repos.cc:2626
+#: ../src/repos.cc:2700
#, c-format
msgid "Repository '%s' has been added to enabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been added to enabled repositories of service '%s'"
msgstr[0] ""
msgstr[1] ""
-#: ../src/repos.cc:2634
+#: ../src/repos.cc:2708
#, c-format
msgid "Repository '%s' has been added to disabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been added to disabled repositories of service '%s'"
msgstr[0] ""
msgstr[1] ""
-#: ../src/repos.cc:2642
+#: ../src/repos.cc:2716
#, c-format
msgid "Repository '%s' has been removed from enabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been removed from enabled repositories of service '%s'"
msgstr[0] ""
msgstr[1] ""
-#: ../src/repos.cc:2650
+#: ../src/repos.cc:2724
#, c-format
msgid "Repository '%s' has been removed from disabled repositories of service '%s'"
msgid_plural "Repositories '%s' have been removed from disabled repositories of service '%s'"
msgstr[0] ""
msgstr[1] ""
-#: ../src/repos.cc:2659
+#: ../src/repos.cc:2733
#, c-format
msgid "Nothing to change for service '%s'."
msgstr ""
-#: ../src/repos.cc:2666
+#: ../src/repos.cc:2740
msgid "Error while modifying the service:"
msgstr ""
-#: ../src/repos.cc:2667
+#: ../src/repos.cc:2741
#, c-format
msgid "Leaving service %s unchanged."
msgstr ""
-#: ../src/repos.cc:2774
+#: ../src/repos.cc:2848
msgid "Loading repository data..."
msgstr ""
-#: ../src/repos.cc:2792
+#: ../src/repos.cc:2866
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr ""
-#: ../src/repos.cc:2799
+#: ../src/repos.cc:2873
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr ""
-#: ../src/repos.cc:2806 ../src/repos.cc:2834
+#: ../src/repos.cc:2880 ../src/repos.cc:2908
#, c-format
msgid "Problem loading data from '%s'"
msgstr ""
-#: ../src/repos.cc:2807 ../src/repos.cc:2840
+#: ../src/repos.cc:2881 ../src/repos.cc:2914
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr ""
-#: ../src/repos.cc:2823
+#: ../src/repos.cc:2897
#, c-format
msgid "Repository '%s' appears to outdated. Consider using a different mirror or server."
msgstr ""
#. translators: the first %s is 'zypper refresh' and the second 'zypper clean -m'
-#: ../src/repos.cc:2836
+#: ../src/repos.cc:2910
#, c-format
msgid "Try '%s', or even '%s' before doing so."
msgstr ""
-#: ../src/repos.cc:2849
+#: ../src/repos.cc:2923
msgid "Reading installed packages..."
msgstr ""
-#: ../src/repos.cc:2860
+#: ../src/repos.cc:2934
msgid "Problem occured while reading the installed packages:"
msgstr ""
#. list name, exact match
-#: ../src/repos.cc:2875
+#: ../src/repos.cc:2949
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -1440,20 +1540,20 @@ msgid ""
msgstr ""
#. translators: Bundle is a term used in rug. See rug for how to translate it.
-#: ../src/search.cc:42 ../src/search.cc:448 ../src/update.cc:417
+#: ../src/search.cc:42 ../src/search.cc:448 ../src/update.cc:443
msgid "Bundle"
msgstr "Bundle"
#. translators: package version (header)
#: ../src/search.cc:46 ../src/search.cc:60 ../src/search.cc:269
-#: ../src/search.cc:390 ../src/search.cc:451 ../src/search.cc:539
-#: ../src/update.cc:153 ../src/update.cc:423
+#: ../src/search.cc:390 ../src/search.cc:451 ../src/search.cc:541
+#: ../src/update.cc:193 ../src/update.cc:876
msgid "Version"
msgstr "Version"
#. translators: package architecture (header)
#: ../src/search.cc:48 ../src/search.cc:62 ../src/search.cc:451
-#: ../src/update.cc:423
+#: ../src/search.cc:547 ../src/update.cc:452
msgid "Arch"
msgstr "Arch"
@@ -1462,10 +1562,17 @@ msgid "System Packages"
msgstr ""
#. translators: package summary (header)
-#: ../src/search.cc:221
+#: ../src/search.cc:221 ../src/update.cc:876
msgid "Summary"
msgstr ""
+#. translators: patch category (recommended, security)
+#. translators: product category (base/addon), the rug term
+#: ../src/search.cc:271 ../src/search.cc:544 ../src/update.cc:193
+#: ../src/update.cc:775 ../src/update.cc:876
+msgid "Category"
+msgstr ""
+
#: ../src/search.cc:351
msgid "No needed patches found."
msgstr ""
@@ -1474,31 +1581,31 @@ msgstr ""
msgid "No patterns found."
msgstr ""
-#: ../src/search.cc:501 ../src/Zypper.cc:3330
+#: ../src/search.cc:501 ../src/Zypper.cc:3438
msgid "No packages found."
msgstr ""
-#: ../src/search.cc:578
+#: ../src/search.cc:616
msgid "No products found."
msgstr ""
-#: ../src/search.cc:601
+#: ../src/search.cc:639
#, c-format
msgid "No providers of '%s' found."
msgstr ""
#. translators: meaning 'dependency problem' found during solving
-#: ../src/solve-commit.cc:44
+#: ../src/solve-commit.cc:43
msgid "Problem: "
msgstr ""
#. TranslatorExplanation %d is the solution number
-#: ../src/solve-commit.cc:57
+#: ../src/solve-commit.cc:56
#, c-format
msgid " Solution %d: "
msgstr ""
-#: ../src/solve-commit.cc:76
+#: ../src/solve-commit.cc:75
msgid "Choose the above solution using '1' or skip, retry or cancel"
msgid_plural "Choose from above solutions by number or skip, retry or cancel"
msgstr[0] ""
@@ -1506,7 +1613,7 @@ msgstr[1] ""
#. translators: translate 'c' to whatever you translated the 'c' in
#. "c" and "s/r/c" strings
-#: ../src/solve-commit.cc:83
+#: ../src/solve-commit.cc:82
msgid "Choose the above solution using '1' or cancel using 'c'"
msgid_plural "Choose from above solutions by number or cancel"
msgstr[0] ""
@@ -1518,7 +1625,7 @@ msgstr[1] ""
#. The anserws must be separated by slash characters '/' and must
#. correspond to skip/retry/cancel in that order.
#. The answers should be lower case letters.
-#: ../src/solve-commit.cc:102
+#: ../src/solve-commit.cc:101
msgid "s/r/c"
msgstr ""
@@ -1529,17 +1636,17 @@ msgstr ""
#. See the "s/r/c" comment for other details.
#. One letter string for translation can be tricky, so in case of problems,
#. please report a bug against zypper at bugzilla.novell.com, we'll try to solve it.
-#: ../src/solve-commit.cc:114
+#: ../src/solve-commit.cc:113
msgid "c"
msgstr ""
#. continue with next problem
-#: ../src/solve-commit.cc:134
+#: ../src/solve-commit.cc:133
#, c-format
msgid "Applying solution %s"
msgstr ""
-#: ../src/solve-commit.cc:158
+#: ../src/solve-commit.cc:157
#, c-format
msgid "%d Problem:"
msgid_plural "%d Problems:"
@@ -1547,344 +1654,482 @@ msgstr[0] ""
msgstr[1] ""
#. should not happen! If solve() failed at least one problem must be set!
-#: ../src/solve-commit.cc:162
+#: ../src/solve-commit.cc:161
msgid "Specified capability not found"
msgstr ""
-#: ../src/solve-commit.cc:173
+#: ../src/solve-commit.cc:172
#, c-format
msgid "Problem: %s"
msgstr ""
-#: ../src/solve-commit.cc:188
+#: ../src/solve-commit.cc:187
msgid "Resolving dependencies..."
msgstr ""
-#: ../src/solve-commit.cc:369
-msgid "The following package is going to be upgraded:"
-msgid_plural "The following packages are going to be upgraded:"
+#. translators: meaning --force-resolution and --no-force-resolution
+#: ../src/solve-commit.cc:232
+#, c-format
+msgid "%s conflicts with %s, will use the less aggressive %s"
+msgstr ""
+
+#: ../src/solve-commit.cc:258
+msgid "Force resolution:"
+msgstr ""
+
+#: ../src/solve-commit.cc:319
+msgid "Verifying dependencies..."
+msgstr ""
+
+#. compute the upgrade
+#: ../src/solve-commit.cc:354
+msgid "Computing upgrade..."
+msgstr ""
+
+#: ../src/solve-commit.cc:370
+msgid "Generating solver test case..."
+msgstr ""
+
+#: ../src/solve-commit.cc:373
+#, c-format
+msgid "Solver test case generated successfully at %s."
+msgstr ""
+
+#: ../src/solve-commit.cc:377
+msgid "Error creating the solver test case."
+msgstr ""
+
+#: ../src/solve-commit.cc:408 ../src/utils/misc.cc:419
+msgid "Checking for running processes using deleted libraries..."
+msgstr ""
+
+#: ../src/solve-commit.cc:417 ../src/utils/misc.cc:428
+msgid "Check failed:"
+msgstr ""
+
+#: ../src/solve-commit.cc:423
+#, c-format
+msgid "There are some running programs that use files deleted by recent upgrade. You may wish to restart some of them. Run '%s' to list these programs."
+msgstr ""
+
+#: ../src/solve-commit.cc:462
+msgid "Computing distribution upgrade..."
+msgstr ""
+
+#: ../src/solve-commit.cc:467
+msgid "Resolving package dependencies..."
+msgstr ""
+
+#: ../src/solve-commit.cc:518
+msgid "Some of the dependencies of installed packages are broken. In order to fix these dependencies, the following actions need to be taken:"
+msgstr ""
+
+#: ../src/solve-commit.cc:526
+msgid "Root privileges are required to fix broken package dependencies."
+msgstr ""
+
+#. translators: These are the "Continue?" prompt options corresponding to
+#. "Yes / No / show Problems / Versions / Arch / Repository /
+#. vendor / Details / show in pager". This prompt will appear
+#. after install/update and similar command installation summary.
+#. Translate to whathever is suitable for your language
+#. The anserws must be separated by slash characters '/' and must
+#. correspond to the above options, in that exact order.
+#. The answers should be lower case letters, but in general, any UTF-8
+#. string will do.
+#. ! \todo add c for changelog and x for explain (show the dep tree)
+#: ../src/solve-commit.cc:553
+msgid "y/n/p/v/a/r/m/d/g"
+msgstr ""
+
+#. translators: help text for 'y' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:558
+msgid "Yes, accept the summary and proceed with installation/removal of packages."
+msgstr ""
+
+#. translators: help text for 'n' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:560
+msgid "No, cancel the operation."
+msgstr ""
+
+#. translators: help text for 'p' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:562
+msgid "Restart solver in no-force-resolution mode in order to show dependency problems."
+msgstr ""
+
+#. translators: help text for 'v' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:564
+msgid "Toggle display of package versions."
+msgstr ""
+
+#. translators: help text for 'a' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:566
+msgid "Toggle display of package architectures."
+msgstr ""
+
+#. translators: help text for 'r' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:568
+msgid "Toggle display of repositories from which the packages will be installed."
+msgstr ""
+
+#. translators: help text for 'm' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:570
+msgid "Toggle display of package vendor names."
+msgstr ""
+
+#. translators: help text for 'd' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:572
+msgid "Toggle between showing all details and as few details as possible."
+msgstr ""
+
+#. translators: help text for 'g' option in the 'Continue?' prompt
+#: ../src/solve-commit.cc:574
+msgid "View the summary in pager."
+msgstr ""
+
+#: ../src/solve-commit.cc:667
+msgid "committing"
+msgstr ""
+
+#: ../src/solve-commit.cc:669
+msgid "(dry run)"
+msgstr ""
+
+#: ../src/solve-commit.cc:689 ../src/solve-commit.cc:729
+msgid "Problem retrieving the package file from the repository:"
+msgstr ""
+
+#. translators: the first %s is 'zypper refresh' and the second
+#. is repo allias
+#: ../src/solve-commit.cc:725
+#, c-format
+msgid "Repository '%s' is out of date. Running '%s' might help."
+msgstr ""
+
+#: ../src/solve-commit.cc:738
+msgid ""
+"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
+"\n"
+"- just retry previous command\n"
+"- refresh the repositories using 'zypper refresh'\n"
+"- use another installation medium (if e.g. damaged)\n"
+"- use another repository"
+msgstr ""
+
+#: ../src/solve-commit.cc:752
+msgid "Problem occured during or after installation or removal of packages:"
+msgstr ""
+
+#: ../src/solve-commit.cc:768
+msgid "One of installed patches requires reboot of your machine. Reboot as soon as possible."
+msgstr ""
+
+#: ../src/solve-commit.cc:777
+msgid "One of installed patches affects the package manager itself. Run this command once more to install any other needed patches."
+msgstr ""
+
+#: ../src/solve-commit.cc:794
+msgid "Dependencies of all installed packages are satisfied."
+msgstr ""
+
+#: ../src/solve-commit.cc:796
+msgid "Nothing to do."
+msgstr ""
+
+#: ../src/Summary.cc:356
+msgid "The following NEW package is going to be installed:"
+msgid_plural "The following NEW packages are going to be installed:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:374
-msgid "The following patch is going to be upgraded:"
-msgid_plural "The following patches are going to be upgraded:"
+#: ../src/Summary.cc:361
+msgid "The following NEW patch is going to be installed:"
+msgid_plural "The following NEW patches are going to be installed:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:379
-msgid "The following pattern is going to be upgraded:"
-msgid_plural "The following patterns are going to be upgraded:"
+#: ../src/Summary.cc:366
+msgid "The following NEW pattern is going to be installed:"
+msgid_plural "The following NEW patterns are going to be installed:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:384
-msgid "The following product is going to be upgraded:"
-msgid_plural "The following products are going to be upgraded:"
+#: ../src/Summary.cc:371
+msgid "The following NEW product is going to be installed:"
+msgid_plural "The following NEW products are going to be installed:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:391
-msgid "The following package is going to be downgraded:"
-msgid_plural "The following packages are going to be downgraded:"
+#: ../src/Summary.cc:376
+msgid "The following source package is going to be installed:"
+msgid_plural "The following source packages are going to be installed:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:396
-msgid "The following patch is going to be downgraded:"
-msgid_plural "The following patches are going to be downgraded:"
+#: ../src/Summary.cc:396
+msgid "The following package is going to be REMOVED:"
+msgid_plural "The following packages are going to be REMOVED:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:401
-msgid "The following pattern is going to be downgraded:"
-msgid_plural "The following patterns are going to be downgraded:"
+#: ../src/Summary.cc:401
+msgid "The following patch is going to be REMOVED:"
+msgid_plural "The following patches are going to be REMOVED:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:406
-msgid "The following product is going to be downgraded:"
-msgid_plural "The following products are going to be downgraded:"
+#: ../src/Summary.cc:406
+msgid "The following pattern is going to be REMOVED:"
+msgid_plural "The following patterns are going to be REMOVED:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:413
-msgid "The following NEW package is going to be installed:"
-msgid_plural "The following NEW packages are going to be installed:"
+#: ../src/Summary.cc:411
+msgid "The following product is going to be REMOVED:"
+msgid_plural "The following products are going to be REMOVED:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:418
-msgid "The following NEW patch is going to be installed:"
-msgid_plural "The following NEW patches are going to be installed:"
+#: ../src/Summary.cc:430
+msgid "The following package is going to be upgraded:"
+msgid_plural "The following packages are going to be upgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:423
-msgid "The following NEW pattern is going to be installed:"
-msgid_plural "The following NEW patterns are going to be installed:"
+#: ../src/Summary.cc:435
+msgid "The following patch is going to be upgraded:"
+msgid_plural "The following patches are going to be upgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:428
-msgid "The following NEW product is going to be installed:"
-msgid_plural "The following NEW products are going to be installed:"
+#: ../src/Summary.cc:440
+msgid "The following pattern is going to be upgraded:"
+msgid_plural "The following patterns are going to be upgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:433
-msgid "The following source package is going to be installed:"
-msgid_plural "The following source packages are going to be installed:"
+#: ../src/Summary.cc:445
+msgid "The following product is going to be upgraded:"
+msgid_plural "The following products are going to be upgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:440
-msgid "The following package is going to be reinstalled:"
-msgid_plural "The following packages are going to be reinstalled:"
+#: ../src/Summary.cc:463
+msgid "The following package is going to be downgraded:"
+msgid_plural "The following packages are going to be downgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:445
-msgid "The following patch is going to be reinstalled:"
-msgid_plural "The following patches are going to be reinstalled:"
+#: ../src/Summary.cc:468
+msgid "The following patch is going to be downgraded:"
+msgid_plural "The following patches are going to be downgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:450
-msgid "The following pattern is going to be reinstalled:"
-msgid_plural "The following patterns are going to be reinstalled:"
+#: ../src/Summary.cc:473
+msgid "The following pattern is going to be downgraded:"
+msgid_plural "The following patterns are going to be downgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:455
-msgid "The following product is going to be reinstalled:"
-msgid_plural "The following products are going to be reinstalled:"
+#: ../src/Summary.cc:478
+msgid "The following product is going to be downgraded:"
+msgid_plural "The following products are going to be downgraded:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:462
-msgid "The following package is going to be REMOVED:"
-msgid_plural "The following packages are going to be REMOVED:"
+#: ../src/Summary.cc:496
+msgid "The following package is going to be reinstalled:"
+msgid_plural "The following packages are going to be reinstalled:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:467
-msgid "The following patch is going to be REMOVED:"
-msgid_plural "The following patches are going to be REMOVED:"
+#: ../src/Summary.cc:501
+msgid "The following patch is going to be reinstalled:"
+msgid_plural "The following patches are going to be reinstalled:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:472
-msgid "The following pattern is going to be REMOVED:"
-msgid_plural "The following patterns are going to be REMOVED:"
+#: ../src/Summary.cc:506
+msgid "The following pattern is going to be reinstalled:"
+msgid_plural "The following patterns are going to be reinstalled:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:477
-msgid "The following product is going to be REMOVED:"
-msgid_plural "The following products are going to be REMOVED:"
+#: ../src/Summary.cc:511
+msgid "The following product is going to be reinstalled:"
+msgid_plural "The following products are going to be reinstalled:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:484
+#: ../src/Summary.cc:557
msgid "The following package is going to change architecture:"
msgid_plural "The following packages are going to change architecture:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:489
+#: ../src/Summary.cc:562
msgid "The following patch is going to change architecture:"
msgid_plural "The following patches are going to change architecture:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:494
+#: ../src/Summary.cc:567
msgid "The following pattern is going to change architecture:"
msgid_plural "The following patterns are going to change architecture:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:499
+#: ../src/Summary.cc:572
msgid "The following product is going to change architecture:"
msgid_plural "The following products are going to change architecture:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:506
+#: ../src/Summary.cc:593
msgid "The following package is going to change vendor:"
msgid_plural "The following packages are going to change vendor:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:511
+#: ../src/Summary.cc:598
msgid "The following patch is going to change vendor:"
msgid_plural "The following patches are going to change vendor:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:516
+#: ../src/Summary.cc:603
msgid "The following pattern is going to change vendor:"
msgid_plural "The following patterns are going to change vendor:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:521
+#: ../src/Summary.cc:608
msgid "The following product is going to change vendor:"
msgid_plural "The following products are going to change vendor:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:529
+#: ../src/Summary.cc:628
msgid "The following package is not supported by its vendor:"
msgid_plural "The following packages are not supported by their vendor:"
msgstr[0] ""
msgstr[1] ""
-#: ../src/solve-commit.cc:603
-msgid "Dependencies of all installed packages are satisfied."
-msgstr ""
-
-#: ../src/solve-commit.cc:605
-msgid "Nothing to do."
-msgstr ""
-
-#: ../src/solve-commit.cc:610
-msgid "Some of the dependencies of installed packages are broken. In order to fix these dependencies, the following actions need to be taken:"
-msgstr ""
-
-#: ../src/solve-commit.cc:764
+#: ../src/Summary.cc:647
#, c-format
msgid "Overall download size: %s."
msgstr ""
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/solve-commit.cc:769
+#: ../src/Summary.cc:652
#, c-format
msgid "After the operation, additional %s will be used."
msgstr ""
-#: ../src/solve-commit.cc:772
+#: ../src/Summary.cc:655
msgid "No additional space will be used or freed after the operation."
msgstr ""
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/solve-commit.cc:779
+#: ../src/Summary.cc:662
#, c-format
msgid "After the operation, %s will be freed."
msgstr ""
-#. translators: meaning --force-resolution and --no-force-resolution
-#: ../src/solve-commit.cc:829
-#, c-format
-msgid "%s conflicts with %s, will use the less aggressive %s"
-msgstr ""
-
-#: ../src/solve-commit.cc:855
-msgid "Force resolution:"
-msgstr ""
-
-#: ../src/solve-commit.cc:911
-msgid "Verifying dependencies..."
-msgstr ""
-
-#: ../src/solve-commit.cc:920
-msgid "Computing upgrade..."
-msgstr ""
-
-#: ../src/solve-commit.cc:936
-msgid "Generating solver test case..."
-msgstr ""
-
-#: ../src/solve-commit.cc:939
-#, c-format
-msgid "Solver test case generated successfully at %s."
-msgstr ""
-
-#: ../src/solve-commit.cc:943
-msgid "Error creating the solver test case."
-msgstr ""
-
-#: ../src/solve-commit.cc:977
-msgid "Computing distribution upgrade..."
-msgstr ""
-
-#: ../src/solve-commit.cc:983
-msgid "Resolving package dependencies..."
-msgstr ""
-
-#: ../src/solve-commit.cc:1017
-msgid "Root privileges are required to fix broken package dependencies."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:685
+msgid "package to upgrade"
+msgid_plural "packages to upgrade"
+msgstr[0] ""
+msgstr[1] ""
-#. translators: Yes / No / show Problems. This prompt will appear
-#. after install/update command summary if there will be any package
-#. to-be-removed automatically to show why, if asked.
-#. Translate to whathever is suitable for your language
-#. The anserws must be separated by slash characters '/' and must
-#. correspond to yes/no/showproblems in that order.
-#. The answers should be lower case letters.
-#: ../src/solve-commit.cc:1034
-msgid "y/n/p"
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:697
+msgid "to downgrade"
+msgid_plural "to downgrade"
+msgstr[0] ""
+msgstr[1] ""
-#. translators: help text for 'y' option in the y/n/p prompt
-#: ../src/solve-commit.cc:1036
-msgid "Accept the summary and proceed with installation/removal of packages."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:700
+msgid "package to downgrade"
+msgid_plural "packages to downgrade"
+msgstr[0] ""
+msgstr[1] ""
-#. translators: help text for 'n' option in the y/n/p prompt
-#: ../src/solve-commit.cc:1038
-msgid "Cancel the operation."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 new"
+#: ../src/Summary.cc:712
+msgid "new"
+msgid_plural "new"
+msgstr[0] ""
+msgstr[1] ""
-#. translators: help text for 'p' option in the y/n/p prompt
-#: ../src/solve-commit.cc:1040
-msgid "Restart solver in no-force-resolution mode in order to show dependency problems."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 new to install"
+#: ../src/Summary.cc:715
+msgid "new package to install"
+msgid_plural "new packages to install"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1082
-msgid "committing"
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:727
+msgid "to reinstall"
+msgid_plural "to reinstall"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1087
-msgid "(dry run)"
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:730
+msgid "package to reinstall"
+msgid_plural "packages to reinstall"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1116 ../src/solve-commit.cc:1155
-msgid "Problem retrieving the package file from the repository:"
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:742
+msgid "to remove"
+msgid_plural "to remove"
+msgstr[0] ""
+msgstr[1] ""
-#. translators: the first %s is 'zypper refresh' and the second
-#. is repo allias
-#: ../src/solve-commit.cc:1151
-#, c-format
-msgid "Repository '%s' is out of date. Running '%s' might help."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: ../src/Summary.cc:745
+msgid "package to remove"
+msgid_plural "packages to remove"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1163
-msgid ""
-"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
-"\n"
-"- just retry previous command\n"
-"- refresh the repositories using 'zypper refresh'\n"
-"- use another installation medium (if e.g. damaged)\n"
-"- use another repository"
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:757
+msgid "to change vendor"
+msgid_plural " to change vendor"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1176
-msgid "Problem occured during or after installation or removal of packages:"
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 packages ..."
+#: ../src/Summary.cc:760
+msgid "package will change vendor"
+msgid_plural "packages will change vendor"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1196
-msgid "One of installed patches requires reboot of your machine. Reboot as soon as possible."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: ../src/Summary.cc:772
+msgid "to change arch"
+msgid_plural "to change arch"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/solve-commit.cc:1200
-msgid "One of installed patches affects the package manager itself. Run this command once more to install any other needed patches."
-msgstr ""
+#. translators: this text will be preceded by a number e.g. "5 packages ..."
+#: ../src/Summary.cc:775
+msgid "package will change arch"
+msgid_plural "packages will change arch"
+msgstr[0] ""
+msgstr[1] ""
#. translators: %d is the number of needed patches
-#: ../src/update.cc:65
+#: ../src/update.cc:73
#, c-format
msgid "%d patch needed"
msgid_plural "%d patches needed"
@@ -1892,79 +2137,158 @@ msgstr[0] ""
msgstr[1] ""
#. translators: %d is the number of security patches
-#: ../src/update.cc:69
+#: ../src/update.cc:77
#, c-format
msgid "%d security patch"
msgid_plural "%d security patches"
msgstr[0] ""
msgstr[1] ""
-#: ../src/update.cc:175 ../src/utils/misc.cc:113
-msgid "Needed"
+#: ../src/update.cc:215
+msgid "needed"
msgstr ""
-#: ../src/update.cc:193
-msgid ""
-"These are only the updates affecting the updater itself.\n"
-"Other updates are available too.\n"
+#: ../src/update.cc:215
+msgid "not needed"
+msgstr ""
+
+#: ../src/update.cc:233
+msgid "The following software management updates will be installed first:"
msgstr ""
-#: ../src/update.cc:201 ../src/update.cc:464
+#: ../src/update.cc:242 ../src/update.cc:498
msgid "No updates found."
msgstr ""
-#: ../src/update.cc:338
+#: ../src/update.cc:248
+msgid "The following updates are also available:"
+msgstr ""
+
+#: ../src/update.cc:363
msgid "Package updates"
msgstr ""
-#: ../src/update.cc:340
+#: ../src/update.cc:365
msgid "Patches"
msgstr ""
-#: ../src/update.cc:342
+#: ../src/update.cc:367
msgid "Pattern updates"
msgstr ""
-#: ../src/update.cc:344
+#: ../src/update.cc:369
msgid "Product updates"
msgstr ""
-#: ../src/update.cc:528
+#: ../src/update.cc:451
+#, fuzzy
+#| msgid "Version"
+msgid "Current Version"
+msgstr "Version"
+
+#: ../src/update.cc:452
+msgid "Available Version"
+msgstr ""
+
+#: ../src/update.cc:562
#, c-format
msgid "Cannot parse '%s < %s'"
msgstr ""
#. translators: %s is the name of a patch
-#: ../src/update.cc:584
+#: ../src/update.cc:591
#, c-format
msgid "'%s' is interactive, skipping."
msgstr ""
-#: ../src/update.cc:639
+#: ../src/update.cc:651
#, c-format
msgid "No patches matching '%s' found."
msgstr ""
-#: ../src/update.cc:642
+#: ../src/update.cc:654
#, c-format
msgid "Patch '%s' not found."
msgstr ""
-#: ../src/update.cc:710
+#: ../src/update.cc:721
#, c-format
msgid "No packages matching '%s' are installed."
msgstr ""
-#: ../src/update.cc:713
+#: ../src/update.cc:724
#, c-format
msgid "Package '%s' is not installed."
msgstr ""
-#: ../src/update.cc:730
+#: ../src/update.cc:739
#, c-format
msgid "No update candidate for '%s'."
msgstr ""
+#: ../src/update.cc:775
+msgid "Issue"
+msgstr ""
+
+#: ../src/update.cc:775
+#, fuzzy
+#| msgid "No"
+msgid "No."
+msgstr "No"
+
+#: ../src/update.cc:775
+msgid "Patch"
+msgstr ""
+
+#: ../src/update.cc:804
+#, c-format
+msgid "Ignoring %s without argument because similar option with an argument has been specified."
+msgstr ""
+
+#: ../src/update.cc:909
+msgid "No matching issues found."
+msgstr ""
+
+#: ../src/update.cc:918
+msgid "The following matches in issue numbers have been found:"
+msgstr ""
+
+#: ../src/update.cc:929
+msgid "Matches in patch descriptions of the following patches have been found:"
+msgstr ""
+
+#: ../src/update.cc:1000
+#, c-format
+msgid "Fix for bugzilla issue number %s was not found or is not needed."
+msgstr ""
+
+#: ../src/update.cc:1004
+#, c-format
+msgid "Fix for CVE issue number %s was not found or is not needed."
+msgstr ""
+
+#: ../src/utils/Augeas.cc:26
+msgid "Cannot initialize configuration file parser."
+msgstr ""
+
+#: ../src/utils/Augeas.cc:43 ../src/utils/Augeas.cc:55
+msgid "Augeas error: setting config file to load failed."
+msgstr ""
+
+#: ../src/utils/Augeas.cc:61
+#, fuzzy
+#| msgid "Couldn't open file: %s."
+msgid "Could not parse the config files."
+msgstr "Couldn't open file: %s."
+
+#: ../src/utils/Augeas.cc:95
+msgid "No configuration file exists or could be parsed."
+msgstr ""
+
+#: ../src/utils/Augeas.cc:98
+msgid "Error parsing zypper.conf:"
+msgstr ""
+
#. For '-garbage' argument, with 'a', 'b', and 'e' as known options,
#. getopt_long reports 'a', 'b', and 'e' as known options.
#. The rest ends here and it is either the last one from previous argument
@@ -1992,11 +2316,11 @@ msgstr ""
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
#: ../src/utils/messages.cc:25
-msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
+msgid "See http://en.opensuse.org/Zypper/Troubleshooting for instructions."
msgstr ""
#: ../src/utils/messages.cc:40 ../src/utils/messages.cc:50
-#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3706
+#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3823
msgid "Usage"
msgstr ""
@@ -2004,7 +2328,7 @@ msgstr ""
msgid "Too many arguments."
msgstr "Too many arguments."
-#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2715 ../src/Zypper.cc:3703
+#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2821 ../src/Zypper.cc:3820
msgid "Required argument missing."
msgstr ""
@@ -2018,80 +2342,131 @@ msgstr ""
msgid "You have chosen to ignore a problem with download or installation of a package which might lead to broken dependencies of other packages. It is recommended to run '%s' after the operation has finished."
msgstr ""
-#: ../src/utils/misc.cc:87
+#: ../src/utils/misc.cc:116
msgid "package"
msgid_plural "packages"
msgstr[0] ""
msgstr[1] ""
-#: ../src/utils/misc.cc:89
+#: ../src/utils/misc.cc:118
msgid "pattern"
msgid_plural "patterns"
msgstr[0] ""
msgstr[1] ""
-#: ../src/utils/misc.cc:91
+#: ../src/utils/misc.cc:120
msgid "product"
msgid_plural "product"
msgstr[0] ""
msgstr[1] ""
-#: ../src/utils/misc.cc:93
+#: ../src/utils/misc.cc:122
msgid "patch"
msgid_plural "patches"
msgstr[0] ""
msgstr[1] ""
-#: ../src/utils/misc.cc:95
+#: ../src/utils/misc.cc:124
msgid "srcpackage"
msgid_plural "srcpackages"
msgstr[0] ""
msgstr[1] ""
#. default
-#: ../src/utils/misc.cc:97
+#: ../src/utils/misc.cc:126
msgid "resolvable"
msgid_plural "resolvables"
msgstr[0] ""
msgstr[1] ""
-#: ../src/utils/misc.cc:106
+#: ../src/utils/misc.cc:135
msgid "Unknown"
msgstr ""
-#: ../src/utils/misc.cc:118
+#: ../src/utils/misc.cc:142
+msgid "Needed"
+msgstr ""
+
+#: ../src/utils/misc.cc:147
msgid "Not Applicable"
msgstr ""
-#: ../src/utils/misc.cc:191
+#: ../src/utils/misc.cc:220
msgid "Specified local path does not exist or is not accessible."
msgstr ""
-#: ../src/utils/misc.cc:203
+#: ../src/utils/misc.cc:232
msgid "Given URI is invalid"
msgstr ""
-#: ../src/utils/misc.cc:254
+#: ../src/utils/misc.cc:283
msgid "Problem copying the specified RPM file to the cache directory."
msgstr ""
-#: ../src/utils/misc.cc:255
+#: ../src/utils/misc.cc:284
msgid "Perhaps you are running out of disk space."
msgstr ""
-#: ../src/utils/misc.cc:263
+#: ../src/utils/misc.cc:292
msgid "Problem retrieving the specified RPM file"
msgstr ""
-#: ../src/utils/misc.cc:264
+#: ../src/utils/misc.cc:293
msgid "Please check whether the file is accessible."
msgstr ""
-#: ../src/utils/misc.cc:321
+#: ../src/utils/misc.cc:354
#, c-format
msgid "Cannot parse capability '%s'."
msgstr ""
+#. process ID
+#: ../src/utils/misc.cc:435
+msgid "PID"
+msgstr ""
+
+#. parent process ID
+#: ../src/utils/misc.cc:437
+msgid "PPID"
+msgstr ""
+
+#. process user ID
+#: ../src/utils/misc.cc:439
+msgid "UID"
+msgstr ""
+
+#. process login name
+#: ../src/utils/misc.cc:441
+msgid "Login"
+msgstr ""
+
+#. process command name
+#: ../src/utils/misc.cc:443
+msgid "Command"
+msgstr ""
+
+#. "list of deleted files or libraries accessed"
+#: ../src/utils/misc.cc:447
+msgid "Files"
+msgstr ""
+
+#: ../src/utils/misc.cc:467
+msgid "No processes using deleted files found."
+msgstr ""
+
+#: ../src/utils/misc.cc:471
+msgid "The following running processes use deleted files:"
+msgstr ""
+
+#: ../src/utils/misc.cc:474
+msgid "You may wish to restart these processes."
+msgstr ""
+
+#: ../src/utils/misc.cc:476
+#, c-format
+msgid "See '%s' for information about the meaning of values in the above table."
+msgstr ""
+
#: ../src/utils/pager.cc:37
#, c-format
msgid "Press '%c' to exit the pager."
@@ -2105,26 +2480,19 @@ msgstr ""
msgid "Use the Enter or Space key to scroll the text by lines or pages."
msgstr ""
-#. ----------------------------------------------------------------------------
-#: ../src/utils/prompt.cc:88
-msgid "abort"
-msgstr ""
-
-#: ../src/utils/prompt.cc:88
-msgid "retry"
-msgstr ""
-
-#: ../src/utils/prompt.cc:88
-msgid "ignore"
+#: ../src/utils/prompt.cc:147 ../src/utils/prompt.cc:275
+#: ../src/utils/prompt.cc:345
+msgid "yes"
msgstr ""
-#: ../src/utils/prompt.cc:100
-msgid "Abort, retry, ignore?\n"
+#: ../src/utils/prompt.cc:148 ../src/utils/prompt.cc:275
+#: ../src/utils/prompt.cc:345
+msgid "no"
msgstr ""
-#: ../src/utils/prompt.cc:135
+#: ../src/utils/prompt.cc:171 ../src/utils/prompt.cc:216
#, c-format
-msgid "autoselect %s after %u "
+msgid "Retrying in %u seconds..."
msgstr ""
#. translators: "a/r/i" are the answers to the
@@ -2133,37 +2501,33 @@ msgstr ""
#. the answers must be separated by slash characters '/' and must
#. correspond to abort/retry/ignore in that order.
#. The answers should be lower case letters.
-#: ../src/utils/prompt.cc:159
+#: ../src/utils/prompt.cc:177 ../src/utils/prompt.cc:265
msgid "a/r/i"
msgstr ""
-#: ../src/utils/prompt.cc:160
-msgid "Abort, retry, ignore?"
-msgstr ""
-
-#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:205
-#: ../src/utils/prompt.cc:261
-msgid "yes"
-msgstr ""
+#: ../src/utils/prompt.cc:228
+#, c-format
+msgid "Autoselecting '%s' after %u second."
+msgid_plural "Autoselecting '%s' after %u seconds."
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:206
-#: ../src/utils/prompt.cc:261
-msgid "no"
+#: ../src/utils/prompt.cc:247
+msgid "Trying again..."
msgstr ""
-#: ../src/utils/prompt.cc:253
+#: ../src/utils/prompt.cc:338
#, c-format
msgid "Invalid answer '%s'."
msgstr ""
-#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
-#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
-#: ../src/utils/prompt.cc:260
+#. translators: the %s are: 'y', 'yes' (translated), 'n', and 'no' (translated).
+#: ../src/utils/prompt.cc:344
#, c-format
-msgid "Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you."
+msgid "Enter '%s' for '%s' or '%s' for '%s' if nothing else works for you."
msgstr ""
-#: ../src/utils/prompt.cc:274
+#: ../src/utils/prompt.cc:358
#, c-format
msgid ""
"If you run zypper without a terminal, use '%s' global\n"
@@ -2171,19 +2535,19 @@ msgid ""
msgstr ""
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/utils/prompt.h:125
+#: ../src/utils/prompt.h:164
msgid "Not found"
msgstr ""
-#: ../src/utils/prompt.h:125
+#: ../src/utils/prompt.h:164
msgid "I/O error"
msgstr ""
-#: ../src/utils/prompt.h:125
+#: ../src/utils/prompt.h:164
msgid "Invalid object"
msgstr ""
-#: ../src/utils/prompt.h:132
+#: ../src/utils/prompt.h:171
msgid "Error"
msgstr ""
@@ -2192,6 +2556,7 @@ msgid ""
" Global Options:\n"
"\t--help, -h\t\tHelp.\n"
"\t--version, -V\t\tOutput the version number.\n"
+"\t--config, -c <file>\tUse specified config file instead of the default.\n"
"\t--quiet, -q\t\tSuppress normal output, print only error\n"
"\t\t\t\tmessages.\n"
"\t--verbose, -v\t\tIncrease verbosity.\n"
@@ -2207,7 +2572,7 @@ msgid ""
"\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory.\n"
msgstr ""
-#: ../src/Zypper.cc:171
+#: ../src/Zypper.cc:172
msgid ""
" Repository Options:\n"
"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
@@ -2217,13 +2582,13 @@ msgid ""
msgstr ""
#. translators: these belong to Repository Options main help text
-#: ../src/Zypper.cc:178
+#: ../src/Zypper.cc:179
msgid ""
"\t--no-cd\t\t\tIgnore CD/DVD repositories.\n"
"\t--no-remote\t\tIgnore remote repositories.\n"
msgstr ""
-#: ../src/Zypper.cc:182
+#: ../src/Zypper.cc:183
msgid ""
" Target Options:\n"
"\t--root, -R <dir>\tOperate on a different root directory.\n"
@@ -2231,14 +2596,14 @@ msgid ""
"\t\t\t\tDo not read installed packages.\n"
msgstr ""
-#: ../src/Zypper.cc:189
+#: ../src/Zypper.cc:190
msgid ""
" Commands:\n"
"\thelp, ?\t\t\tPrint help.\n"
"\tshell, sh\t\tAccept multiple commands at once.\n"
msgstr ""
-#: ../src/Zypper.cc:194
+#: ../src/Zypper.cc:195
msgid ""
" Repository Management:\n"
"\trepos, lr\t\tList all defined repositories.\n"
@@ -2250,7 +2615,7 @@ msgid ""
"\tclean\t\t\tClean local caches.\n"
msgstr ""
-#: ../src/Zypper.cc:204
+#: ../src/Zypper.cc:205
msgid ""
" Service Management:\n"
"\tservices, ls\t\tList all defined services.\n"
@@ -2260,7 +2625,7 @@ msgid ""
"\trefresh-services, refs\tRefresh all services.\n"
msgstr ""
-#: ../src/Zypper.cc:212
+#: ../src/Zypper.cc:213
msgid ""
" Software Management:\n"
"\tinstall, in\t\tInstall packages.\n"
@@ -2273,7 +2638,7 @@ msgid ""
"\t\t\t\tby installed packages.\n"
msgstr ""
-#: ../src/Zypper.cc:223
+#: ../src/Zypper.cc:224
msgid ""
" Update Management:\n"
"\tupdate, up\t\tUpdate installed packages with newer versions.\n"
@@ -2284,7 +2649,7 @@ msgid ""
"\tpatch-check, pchk\tCheck for patches.\n"
msgstr ""
-#: ../src/Zypper.cc:232
+#: ../src/Zypper.cc:233
msgid ""
" Querying:\n"
"\tsearch, se\t\tSearch for packages matching a pattern.\n"
@@ -2299,15 +2664,16 @@ msgid ""
"\twhat-provides, wp\tList packages providing specified capability.\n"
msgstr ""
-#: ../src/Zypper.cc:247
+#: ../src/Zypper.cc:248
msgid ""
" Package Locks:\n"
"\taddlock, al\t\tAdd a package lock.\n"
"\tremovelock, rl\t\tRemove a package lock.\n"
"\tlocks, ll\t\tList current package locks.\n"
+"\tcleanlocks, cl\t\tRemove unused locks.\n"
msgstr ""
-#: ../src/Zypper.cc:253
+#: ../src/Zypper.cc:255
msgid ""
" Other Commands:\n"
"\tversioncmp, vcmp\tCompare two version strings.\n"
@@ -2316,7 +2682,7 @@ msgid ""
"\t\t\t\tinstalled packages.\n"
msgstr ""
-#: ../src/Zypper.cc:261
+#: ../src/Zypper.cc:263
msgid ""
" Usage:\n"
"\tzypper [--global-options] <command> [--command-options] [arguments]\n"
@@ -2324,115 +2690,164 @@ msgstr ""
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: ../src/Zypper.cc:286
+#: ../src/Zypper.cc:288
#, c-format
msgid "Type '%s' to get a list of global options and commands."
msgstr ""
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: ../src/Zypper.cc:295
+#: ../src/Zypper.cc:297
#, c-format
msgid "Type '%s' to get command-specific help."
msgstr ""
-#: ../src/Zypper.cc:398
+#: ../src/Zypper.cc:409
#, c-format
msgid "Verbosity: %d"
msgstr ""
-#: ../src/Zypper.cc:412
+#: ../src/Zypper.cc:423
#, c-format
msgid "Invalid table style %d."
msgstr ""
-#: ../src/Zypper.cc:413
+#: ../src/Zypper.cc:424
#, c-format
msgid "Use an integer number from %d to %d"
msgstr ""
-#: ../src/Zypper.cc:444
+#: ../src/Zypper.cc:455
msgid "Entering non-interactive mode."
msgstr ""
-#: ../src/Zypper.cc:450
+#: ../src/Zypper.cc:461
msgid "Entering 'no-gpg-checks' mode."
msgstr ""
-#: ../src/Zypper.cc:461
+#: ../src/Zypper.cc:472
msgid "The path specified in the --root option must be absolute."
msgstr ""
-#: ../src/Zypper.cc:490
+#: ../src/Zypper.cc:501
msgid "Repositories disabled, using the database of installed packages only."
msgstr ""
-#: ../src/Zypper.cc:502
+#: ../src/Zypper.cc:513
msgid "Autorefresh disabled."
msgstr ""
-#: ../src/Zypper.cc:509
+#: ../src/Zypper.cc:520
msgid "CD/DVD repositories disabled."
msgstr ""
-#: ../src/Zypper.cc:516
+#: ../src/Zypper.cc:527
msgid "Remote repositories disabled."
msgstr ""
-#: ../src/Zypper.cc:523
+#: ../src/Zypper.cc:534
msgid "Ignoring installed resolvables."
msgstr ""
#. TranslatorExplanation The %s is "--plus-repo"
-#: ../src/Zypper.cc:618
+#: ../src/Zypper.cc:645
#, c-format
msgid "The %s option has no effect here, ignoring."
msgstr ""
-#: ../src/Zypper.cc:795
+#: ../src/Zypper.cc:819
msgid "Unexpected exception."
msgstr ""
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "package"
-#. ! \todo A capability is NAME[.ARCH][OP<VERSION>] now,
-#. ! the help text will be changed after release
-#: ../src/Zypper.cc:884
-#, c-format
+#: ../src/Zypper.cc:913
+#, fuzzy, c-format
+#| msgid ""
+#| "update (up) [options] ...\n"
+#| "\n"
+#| "Update all or specified installed packages with newer versions, if possible.\n"
+#| "\n"
+#| " Command options:\n"
+#| "\n"
+#| "-t, --type <type> Type of package (%s).\n"
+#| " Default: %s.\n"
+#| "-r, --repo Limit updates to the specified repository.\n"
+#| " --skip-interactive Skip interactive updates.\n"
+#| "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+#| " confirmation prompt.\n"
+#| " See man zypper for more details.\n"
+#| " --best-effort Do a 'best effort' approach to update. Updates\n"
+#| " to a lower than the latest version are\n"
+#| " also acceptable.\n"
+#| " --debug-solver Create solver test case for debugging.\n"
+#| " --no-recommends Do not install recommended packages, only required.\n"
+#| "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
+#| " --force-resolution Force the solver to find a solution (even an agressive).\n"
+#| "-D, --dry-run Test the update, do not actually update.\n"
msgid ""
"install (in) [options] ...\n"
"\n"
-"Install packages with specified capabilities or RPM files with specified location. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n"
+"Install packages with specified capabilities or RPM files with specified\n"
+"location. A capability is NAME[.ARCH][OP<VERSION>], where OP is one\n"
+"of <, <=, =, >=, >.\n"
+"\n"
+" Command options:\n"
+" --from Select packages from the specified repository.\n"
+"-r, --repo Load only the specified repository.\n"
+"-t, --type <type> Type of package (%s).\n"
+" Default: %s.\n"
+"-n, --name Select packages by plain name, not by capability.\n"
+"-C, --capability Select packages by capability.\n"
+"-f, --force Reinstall the package if the exact version is\n"
+" available in repositories.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See 'man zypper' for more details.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+" --no-force-resolution Do not force the solver to find solution,\n"
+" let it ask.\n"
+"-R, --force-resolution Force the solver to find a solution (even\n"
+" an agressive).\n"
+"-D, --dry-run Test the installation, do not actually install.\n"
+"-d, --download-only Only download the packages, do not install.\n"
+msgstr ""
+"update (up) [options] [packagename] ...\n"
+"\n"
+"Update all or specified installed packages with newer versions, if possible.\n"
"\n"
" Command options:\n"
-"-r, --repo Install packages only from the specified repository.\n"
+"\n"
"-t, --type <type> Type of package (%s).\n"
" Default: %s.\n"
-"-n, --name Select packages by plain name, not by capability.\n"
-"-C, --capability Select packages by capability.\n"
-"-f, --force Install even if the item is already installed (reinstall).\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n"
-" See 'man zypper' for more details.\n"
+"-r, --repo Limit updates to the specified repository.\n"
+" --skip-interactive Skip interactive updates.\n"
+"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+" --best-effort Do a 'best effort' approach to update. Updates\n"
+" to a lower than the latest version are\n"
+" also acceptable.\n"
" --debug-solver Create solver test case for debugging.\n"
" --no-recommends Do not install recommended packages, only required.\n"
"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
" --force-resolution Force the solver to find a solution (even an agressive).\n"
-"-D, --dry-run Test the installation, do not actually install.\n"
-msgstr ""
-
-#. translators: this option belongs to 'install' command
-#: ../src/Zypper.cc:906
-msgid " --from Select packages only from specified repository.\n"
-msgstr ""
+"-D, --dry-run Test the update, do not actually update.\n"
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "package"
-#: ../src/Zypper.cc:935
+#: ../src/Zypper.cc:971
#, c-format
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
-"Remove packages with specified capabilities. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n"
+"Remove packages with specified capabilities.\n"
+"A capability is NAME[.ARCH][OP<VERSION>], where OP is one\n"
+"of <, <=, =, >=, >.\n"
"\n"
" Command options:\n"
"-r, --repo Operate only with packages from the specified repository.\n"
@@ -2446,7 +2861,7 @@ msgid ""
"-D, --dry-run Test the removal, do not actually remove.\n"
msgstr ""
-#: ../src/Zypper.cc:965
+#: ../src/Zypper.cc:1002
msgid ""
"source-install (si) [options] <name> ...\n"
"\n"
@@ -2458,19 +2873,23 @@ msgid ""
"-r, --repo Install packages only from specified repositories.\n"
msgstr ""
-#: ../src/Zypper.cc:993
+#: ../src/Zypper.cc:1031
msgid ""
"verify (ve) [options]\n"
"\n"
"Check whether dependencies of installed packages are satisfied and repair eventual dependency problems.\n"
"\n"
" Command options:\n"
-" --no-recommends Do not install recommended packages, only required.\n"
-"-D, --dry-run Test the repair, do not actually do anything to the system.\n"
-"-r, --repo Use only specified repositories to install missing packages.\n"
+"-r, --repo Load only the specified repository.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-D, --dry-run Test the repair, do not actually do anything to\n"
+" the system.\n"
+"-d, --download-only Only download needed packages, do not install.\n"
msgstr ""
-#: ../src/Zypper.cc:1017
+#: ../src/Zypper.cc:1060
msgid ""
"install-new-recommends (inr) [options]\n"
"\n"
@@ -2479,12 +2898,12 @@ msgid ""
" Command options:\n"
"-r, --repo Use only specified repositories to install packages.\n"
"-D, --dry-run Test the installation, do not actually install anything.\n"
+"-d, --download-only Only download the packages, do not install.\n"
" --debug-solver Create solver test case for debugging.\n"
msgstr ""
#. translators: the %s = "ris" (the only service type currently supported)
-#. ! \todo s/--name/--name <name> after 11.1 release.
-#: ../src/Zypper.cc:1045
+#: ../src/Zypper.cc:1087
#, c-format
msgid ""
"addservice (as) [options] <URI> <alias>\n"
@@ -2492,14 +2911,13 @@ msgid ""
"Add a repository index service to the system.\n"
"\n"
" Command options:\n"
-"-t, --type <TYPE> Type of the service (%s).\n"
+"-t, --type <type> Type of the service (%s).\n"
"-d, --disable Add the service as disabled.\n"
-"-n, --name Specify descriptive name for the service.\n"
+"-n, --name <alias> Specify descriptive name for the service.\n"
msgstr ""
#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
-#. TODO
-#: ../src/Zypper.cc:1069
+#: ../src/Zypper.cc:1110
msgid ""
"removeservice (rs) [options] \n"
"\n"
@@ -2511,7 +2929,7 @@ msgid ""
msgstr ""
#. translators: %s is "--all" and "--all"
-#: ../src/Zypper.cc:1105
+#: ../src/Zypper.cc:1146
#, c-format
msgid ""
"modifyservice (ms) <options> \n"
@@ -2540,7 +2958,7 @@ msgid ""
"-m, --medium-type <type> Apply changes to services of specified type.\n"
msgstr ""
-#: ../src/Zypper.cc:1153
+#: ../src/Zypper.cc:1194
msgid ""
"services (ls) [options]\n"
"\n"
@@ -2556,7 +2974,7 @@ msgid ""
"-N, --sort-by-name Sort the list by name.\n"
msgstr ""
-#: ../src/Zypper.cc:1179
+#: ../src/Zypper.cc:1220
msgid ""
"refresh-services (refs) [options]\n"
"\n"
@@ -2567,22 +2985,21 @@ msgid ""
msgstr ""
#. translators: the %s = "yast2, rpm-md, plaindir"
-#. ! \todo s/--name/--name <name> after 11.1 release.
-#: ../src/Zypper.cc:1208
+#: ../src/Zypper.cc:1248
#, c-format
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
-"addrepo (ar) [options] \n"
+"addrepo (ar) [options] \n"
"\n"
"Add a repository to the sytem. The repository can be specified by its URI or can be read from specified .repo file (even remote).\n"
"\n"
" Command options:\n"
-"-r, --repo Just another means to specify a .repo file to read.\n"
-"-t, --type <TYPE> Type of repository (%s).\n"
+"-r, --repo Just another means to specify a .repo file to read.\n"
+"-t, --type <type> Type of repository (%s).\n"
"-d, --disable Add the repository as disabled.\n"
"-c, --check Probe URI.\n"
"-C, --no-check Don't probe URI, probe later during refresh.\n"
-"-n, --name Specify descriptive name for the repository.\n"
+"-n, --name <name> Specify descriptive name for the repository.\n"
"-k, --keep-packages Enable RPM files caching.\n"
"-K, --no-keep-packages Disable RPM files caching.\n"
"-f, --refresh Enable autorefresh of the repository.\n"
@@ -2590,14 +3007,15 @@ msgstr ""
#. translators: this is just a rug compatiblity command
#. translators: this is just a rug-compatiblity command
-#: ../src/Zypper.cc:1257 ../src/Zypper.cc:2136
+#: ../src/Zypper.cc:1297 ../src/Zypper.cc:2237
msgid ""
"list-resolvables (lr)\n"
"\n"
"List available resolvable types.\n"
msgstr ""
-#: ../src/Zypper.cc:1265
+#. FIXME it's 'repos (lr) [options] [repo] ...' now. Fix after 11.2
+#: ../src/Zypper.cc:1306
msgid ""
"repos (lr) [options]\n"
"\n"
@@ -2615,11 +3033,12 @@ msgid ""
msgstr ""
#. translators: this option belongs to 'lr' command help
-#: ../src/Zypper.cc:1280
+#. FIXME add this to the rest after 11.2
+#: ../src/Zypper.cc:1322
msgid "-s, --service Show also alias of parent service.\n"
msgstr ""
-#: ../src/Zypper.cc:1295
+#: ../src/Zypper.cc:1337
msgid ""
"removerepo (rr) [options] \n"
"\n"
@@ -2630,7 +3049,7 @@ msgid ""
" --loose-query Ignore query string in the URI.\n"
msgstr ""
-#: ../src/Zypper.cc:1314
+#: ../src/Zypper.cc:1356
msgid ""
"renamerepo (nr) [options] <new-alias>\n"
"\n"
@@ -2641,11 +3060,10 @@ msgstr ""
#. translators: %s is "--all|--remote|--local|--medium-type"
#. and "--all, --remote, --local, --medium-type"
-#. ! \todo s/<1-99>/<#> after 11.1 release.
-#: ../src/Zypper.cc:1346
+#: ../src/Zypper.cc:1387
#, c-format
msgid ""
-"modifyrepo (mr) <options> \n"
+"modifyrepo (mr) <options> ...\n"
"modifyrepo (mr) <options> <%s>\n"
"\n"
"Modify properties of repositories specified by alias, number, or URI, or by the\n"
@@ -2657,7 +3075,7 @@ msgid ""
"-r, --refresh Enable auto-refresh of the repository.\n"
"-R, --no-refresh Disable auto-refresh of the repository.\n"
"-n, --name Set a descriptive name for the repository.\n"
-"-p, --priority <1-99> Set priority of the repository.\n"
+"-p, --priority <integer> Set priority of the repository.\n"
"-k, --keep-packages Enable RPM files caching.\n"
"-K, --no-keep-packages Disable RPM files caching.\n"
"\n"
@@ -2667,7 +3085,7 @@ msgid ""
"-m, --medium-type <type> Apply changes to repositories of specified type.\n"
msgstr ""
-#: ../src/Zypper.cc:1386
+#: ../src/Zypper.cc:1427
msgid ""
"refresh (ref) [alias|#|URI] ...\n"
"\n"
@@ -2683,9 +3101,9 @@ msgid ""
"-s, --services Refresh also services before refreshing repos.\n"
msgstr ""
-#: ../src/Zypper.cc:1415
+#: ../src/Zypper.cc:1456
msgid ""
-"clean [alias|#|URI] ...\n"
+"clean (cc) [alias|#|URI] ...\n"
"\n"
"Clean local caches.\n"
"\n"
@@ -2698,7 +3116,7 @@ msgstr ""
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "patch"
-#: ../src/Zypper.cc:1444
+#: ../src/Zypper.cc:1485
#, c-format
msgid ""
"list-updates (lu) [options]\n"
@@ -2719,10 +3137,60 @@ msgstr ""
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "patch"
-#: ../src/Zypper.cc:1495
-#, c-format
+#: ../src/Zypper.cc:1537
+#, fuzzy, c-format
+#| msgid ""
+#| "update (up) [options] ...\n"
+#| "\n"
+#| "Update all or specified installed packages with newer versions, if possible.\n"
+#| "\n"
+#| " Command options:\n"
+#| "\n"
+#| "-t, --type <type> Type of package (%s).\n"
+#| " Default: %s.\n"
+#| "-r, --repo Limit updates to the specified repository.\n"
+#| " --skip-interactive Skip interactive updates.\n"
+#| "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+#| " confirmation prompt.\n"
+#| " See man zypper for more details.\n"
+#| " --best-effort Do a 'best effort' approach to update. Updates\n"
+#| " to a lower than the latest version are\n"
+#| " also acceptable.\n"
+#| " --debug-solver Create solver test case for debugging.\n"
+#| " --no-recommends Do not install recommended packages, only required.\n"
+#| "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
+#| " --force-resolution Force the solver to find a solution (even an agressive).\n"
+#| "-D, --dry-run Test the update, do not actually update.\n"
msgid ""
-"update (up) [options] ...\n"
+"update (up) [options] [packagename] ...\n"
+"\n"
+"Update all or specified installed packages with newer versions, if possible.\n"
+"\n"
+" Command options:\n"
+"\n"
+"-t, --type <type> Type of package (%s).\n"
+" Default: %s.\n"
+"-r, --repo Load only the specified repository.\n"
+" --skip-interactive Skip interactive updates.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+" --best-effort Do a 'best effort' approach to update. Updates\n"
+" to a lower than the latest version are\n"
+" also acceptable.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-R, --no-force-resolution Do not force the solver to find solution,\n"
+" let it ask.\n"
+" --force-resolution Force the solver to find a solution (even\n"
+" an agressive).\n"
+"-D, --dry-run Test the update, do not actually update.\n"
+"-d, --download-only Only download the packages, do not install.\n"
+msgstr ""
+"update (up) [options] [packagename] ...\n"
"\n"
"Update all or specified installed packages with newer versions, if possible.\n"
"\n"
@@ -2743,6 +3211,52 @@ msgid ""
"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
" --force-resolution Force the solver to find a solution (even an agressive).\n"
"-D, --dry-run Test the update, do not actually update.\n"
+
+#: ../src/Zypper.cc:1587
+#, fuzzy
+#| msgid ""
+#| "update (up) [options] ...\n"
+#| "\n"
+#| "Update all or specified installed packages with newer versions, if possible.\n"
+#| "\n"
+#| " Command options:\n"
+#| "\n"
+#| "-t, --type <type> Type of package (%s).\n"
+#| " Default: %s.\n"
+#| "-r, --repo Limit updates to the specified repository.\n"
+#| " --skip-interactive Skip interactive updates.\n"
+#| "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+#| " confirmation prompt.\n"
+#| " See man zypper for more details.\n"
+#| " --best-effort Do a 'best effort' approach to update. Updates\n"
+#| " to a lower than the latest version are\n"
+#| " also acceptable.\n"
+#| " --debug-solver Create solver test case for debugging.\n"
+#| " --no-recommends Do not install recommended packages, only required.\n"
+#| "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
+#| " --force-resolution Force the solver to find a solution (even an agressive).\n"
+#| "-D, --dry-run Test the update, do not actually update.\n"
+msgid ""
+"patch [options]\n"
+"\n"
+"Install all available needed patches.\n"
+"\n"
+" Command options:\n"
+"\n"
+" --skip-interactive Skip interactive patches.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+"-b, --bugzilla # Install patch fixing the specified bugzilla issue.\n"
+" --cve # Install patch fixing the specified CVE issue.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-r, --repo Load only the specified repository.\n"
+"-D, --dry-run Test the update, do not actually update.\n"
+"-d, --download-only Only download the packages, do not install.\n"
msgstr ""
"update (up) [options] [packagename] ...\n"
"\n"
@@ -2766,34 +3280,44 @@ msgstr ""
" --force-resolution Force the solver to find a solution (even an agressive).\n"
"-D, --dry-run Test the update, do not actually update.\n"
-#: ../src/Zypper.cc:1534
-msgid ""
-"patch [options]\n"
-"\n"
-"Install all available needed patches.\n"
-"\n"
-" Command options:\n"
-"\n"
-"-r, --repo Work only with specified repository.\n"
-" --skip-interactive Skip interactive patches.\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
-" confirmation prompt.\n"
-" See man zypper for more details.\n"
-" --debug-solver Create solver test case for debugging.\n"
-"-D, --dry-run Test the update, do not actually update.\n"
-msgstr ""
-
-#: ../src/Zypper.cc:1560
+#: ../src/Zypper.cc:1625
msgid ""
"list-patches (lp) [options]\n"
"\n"
"List all available needed patches.\n"
"\n"
" Command options:\n"
-"-r, --repo List only patches from the specified repository.\n"
+"-b, --bugzilla[=#] List needed patches for Bugzilla issues.\n"
+" --cve[=#] List needed patches for CVE issues.\n"
+" --issues[=string] Look for issues matching the specified string.\n"
+"-a, --all List all patches, not only the needed ones.\n"
+"-r, --repo List only patches from the specified repository.\n"
msgstr ""
-#: ../src/Zypper.cc:1585
+#: ../src/Zypper.cc:1657
+#, fuzzy
+#| msgid ""
+#| "update (up) [options] ...\n"
+#| "\n"
+#| "Update all or specified installed packages with newer versions, if possible.\n"
+#| "\n"
+#| " Command options:\n"
+#| "\n"
+#| "-t, --type <type> Type of package (%s).\n"
+#| " Default: %s.\n"
+#| "-r, --repo Limit updates to the specified repository.\n"
+#| " --skip-interactive Skip interactive updates.\n"
+#| "-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+#| " confirmation prompt.\n"
+#| " See man zypper for more details.\n"
+#| " --best-effort Do a 'best effort' approach to update. Updates\n"
+#| " to a lower than the latest version are\n"
+#| " also acceptable.\n"
+#| " --debug-solver Create solver test case for debugging.\n"
+#| " --no-recommends Do not install recommended packages, only required.\n"
+#| "-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
+#| " --force-resolution Force the solver to find a solution (even an agressive).\n"
+#| "-D, --dry-run Test the update, do not actually update.\n"
msgid ""
"dist-upgrade (dup) [options]\n"
"\n"
@@ -2801,15 +3325,46 @@ msgid ""
"\n"
" Command options:\n"
"\n"
-"-r, --repo Limit the upgrade to the specified repository.\n"
-" --no-recommends Do not install recommended packages, only required.\n"
-"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n"
+"-r, --repo Load only the specified repository.\n"
+"-l, --auto-agree-with-licenses\n"
+" Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
+" See man zypper for more details.\n"
+" --debug-solver Create solver test case for debugging\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+" --recommends Install also recommended packages in addition\n"
+" to the required.\n"
+"-D, --dry-run Test the upgrade, do not actually upgrade\n"
+"-d, --download-only Only download the packages, do not install.\n"
+msgstr ""
+"update (up) [options] [packagename] ...\n"
+"\n"
+"Update all or specified installed packages with newer versions, if possible.\n"
+"\n"
+" Command options:\n"
+"\n"
+"-t, --type <type> Type of package (%s).\n"
+" Default: %s.\n"
+"-r, --repo Limit updates to the specified repository.\n"
+" --skip-interactive Skip interactive updates.\n"
+"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n"
+" confirmation prompt.\n"
" See man zypper for more details.\n"
-" --debug-solver Create solver test case for debugging\n"
-"-D, --dry-run Test the upgrade, do not actually upgrade\n"
+" --best-effort Do a 'best effort' approach to update. Updates\n"
+" to a lower than the latest version are\n"
+" also acceptable.\n"
+" --debug-solver Create solver test case for debugging.\n"
+" --no-recommends Do not install recommended packages, only required.\n"
+"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
+" --force-resolution Force the solver to find a solution (even an agressive).\n"
+"-D, --dry-run Test the update, do not actually update.\n"
+
+#. FIXME: add to the rest of the strings after 11.2 release
+#: ../src/Zypper.cc:1675
+msgid " --from Restrict upgrade to specified repository.\n"
msgstr ""
-#: ../src/Zypper.cc:1627
+#: ../src/Zypper.cc:1705
msgid ""
"search (se) [options] [querystring] ...\n"
"\n"
@@ -2857,7 +3412,7 @@ msgstr ""
"\n"
"* and ? wildcards can also be used within search strings.\n"
-#: ../src/Zypper.cc:1664
+#: ../src/Zypper.cc:1742
msgid ""
"patch-check (pchk) [options]\n"
"\n"
@@ -2868,7 +3423,7 @@ msgid ""
"-r, --repo Check for patches only in the specified repository.\n"
msgstr ""
-#: ../src/Zypper.cc:1686
+#: ../src/Zypper.cc:1764
msgid ""
"patches (pch) [repository] ...\n"
"\n"
@@ -2879,7 +3434,7 @@ msgid ""
"-r, --repo Just another means to specify repository.\n"
msgstr ""
-#: ../src/Zypper.cc:1713
+#: ../src/Zypper.cc:1791
#, fuzzy
msgid ""
"packages (pa) [options] [repository] ...\n"
@@ -2906,7 +3461,7 @@ msgstr ""
"-N, --sort-by-name Sort the list by package name.\n"
"-R, --sort-by-repo Sort the list by repository.\n"
-#: ../src/Zypper.cc:1741
+#: ../src/Zypper.cc:1819
#, fuzzy
msgid ""
"patterns (pt) [options] [repository] ...\n"
@@ -2929,7 +3484,7 @@ msgstr ""
"-i, --installed-only Show only installed patterns.\n"
"-u, --uninstalled-only Show only patterns which are not installed.\n"
-#: ../src/Zypper.cc:1767
+#: ../src/Zypper.cc:1845
#, fuzzy
msgid ""
"products (pd) [options] [repository] ...\n"
@@ -2952,7 +3507,7 @@ msgstr ""
"-i, --installed-only Show only installed products.\n"
"-u, --uninstalled-only Show only products which are not installed.\n"
-#: ../src/Zypper.cc:1792
+#: ../src/Zypper.cc:1872
#, c-format
msgid ""
"info (if) [options] <name> ...\n"
@@ -2962,10 +3517,12 @@ msgid ""
" Command options:\n"
"-r, --repo Work only with the specified repository.\n"
"-t, --type <type> Type of package (%s).\n"
-" Default: %s."
+" Default: %s.\n"
+" --requires Show also requires and prerequires.\n"
+" --recommends Show also recommends."
msgstr ""
-#: ../src/Zypper.cc:1815
+#: ../src/Zypper.cc:1897
#, c-format
msgid ""
"patch-info <patchname> ...\n"
@@ -2975,7 +3532,7 @@ msgid ""
"This is a rug compatibility alias for '%s'.\n"
msgstr ""
-#: ../src/Zypper.cc:1834
+#: ../src/Zypper.cc:1916
#, c-format
msgid ""
"pattern-info ...\n"
@@ -2985,7 +3542,7 @@ msgid ""
"This is a rug compatibility alias for '%s'.\n"
msgstr ""
-#: ../src/Zypper.cc:1853
+#: ../src/Zypper.cc:1935
#, c-format
msgid ""
"product-info ...\n"
@@ -2995,7 +3552,7 @@ msgid ""
"This is a rug compatibility alias for '%s'.\n"
msgstr ""
-#: ../src/Zypper.cc:1870
+#: ../src/Zypper.cc:1952
msgid ""
"what-provides (wp) <capability>\n"
"\n"
@@ -3004,7 +3561,7 @@ msgid ""
"This command has no additional options.\n"
msgstr ""
-#: ../src/Zypper.cc:1921
+#: ../src/Zypper.cc:2003
msgid ""
"moo\n"
"\n"
@@ -3013,7 +3570,7 @@ msgid ""
"This command has no additional options.\n"
msgstr ""
-#: ../src/Zypper.cc:1943
+#: ../src/Zypper.cc:2025
#, c-format
msgid ""
"addlock (al) [options] <packagename> ...\n"
@@ -3026,7 +3583,7 @@ msgid ""
" Default: %s.\n"
msgstr ""
-#: ../src/Zypper.cc:1969
+#: ../src/Zypper.cc:2051
#, c-format
msgid ""
"removelock (rl) [options] ...\n"
@@ -3037,7 +3594,7 @@ msgid ""
"-r, --repo Remove only locks with specified repository.\n"
msgstr ""
-#: ../src/Zypper.cc:1989
+#: ../src/Zypper.cc:2071
msgid ""
"locks (ll)\n"
"\n"
@@ -3046,7 +3603,18 @@ msgid ""
"This command has no additional options.\n"
msgstr ""
-#: ../src/Zypper.cc:2029
+#: ../src/Zypper.cc:2091
+msgid ""
+"cleanlocks (cl)\n"
+"\n"
+"Remove useless locks.\n"
+"\n"
+" Command options:\n"
+"-d, --only-duplicates Clean only duplicate locks.\n"
+"-e, --only-empty Clean only locks which doesn't lock anything.\n"
+msgstr ""
+
+#: ../src/Zypper.cc:2111
msgid ""
"targetos (tos)\n"
"\n"
@@ -3055,7 +3623,7 @@ msgid ""
"This command has no additional options.\n"
msgstr ""
-#: ../src/Zypper.cc:2048
+#: ../src/Zypper.cc:2130
msgid ""
"versioncmp (vcmp) <version1> <version2>\n"
"\n"
@@ -3065,16 +3633,25 @@ msgid ""
"-m, --match Takes missing release number as any release.\n"
msgstr ""
-#: ../src/Zypper.cc:2068
+#: ../src/Zypper.cc:2149
msgid ""
"licenses\n"
"\n"
-"Report Licenses and EULA of currently installed software packages.\n"
+"Report licenses and EULAs of currently installed software packages.\n"
+"\n"
+"This command has no additional options.\n"
+msgstr ""
+
+#: ../src/Zypper.cc:2168
+msgid ""
+"ps\n"
+"\n"
+"List running processes which use files deleted by recent upgrades.\n"
"\n"
"This command has no additional options.\n"
msgstr ""
-#: ../src/Zypper.cc:2085
+#: ../src/Zypper.cc:2186
msgid ""
"quit (exit, ^D)\n"
"\n"
@@ -3083,7 +3660,7 @@ msgid ""
"This command has no additional options.\n"
msgstr ""
-#: ../src/Zypper.cc:2102
+#: ../src/Zypper.cc:2203
msgid ""
"shell (sh)\n"
"\n"
@@ -3093,7 +3670,7 @@ msgid ""
msgstr ""
#. translators: this is just a rug-compatiblity command
-#: ../src/Zypper.cc:2120
+#: ../src/Zypper.cc:2221
msgid ""
"service-types (st)\n"
"\n"
@@ -3103,7 +3680,7 @@ msgstr ""
#. trunslators: this is a rug-compatibility command (equivalent of
#. 'zypper addrepo -t plaindir URI'). You can refer to rug's translations
#. for how to translate specific terms like channel or service if in doubt.
-#: ../src/Zypper.cc:2158
+#: ../src/Zypper.cc:2259
msgid ""
"mount\n"
"\n"
@@ -3115,7 +3692,7 @@ msgid ""
"-r, --recurse Dive into subdirectories.\n"
msgstr ""
-#: ../src/Zypper.cc:2189
+#: ../src/Zypper.cc:2290
#, c-format
msgid ""
"patch-search [options] [querystring...]\n"
@@ -3124,7 +3701,7 @@ msgid ""
msgstr ""
#. translators: this is just a rug-compatiblity command
-#: ../src/Zypper.cc:2207
+#: ../src/Zypper.cc:2308
msgid ""
"ping [options]\n"
"\n"
@@ -3132,40 +3709,40 @@ msgid ""
"It is provided for compatibility with rug.\n"
msgstr ""
-#: ../src/Zypper.cc:2221 ../src/Zypper.cc:3988
+#: ../src/Zypper.cc:2322 ../src/Zypper.cc:4136
msgid "Unexpected program flow."
msgstr ""
-#: ../src/Zypper.cc:2245
+#: ../src/Zypper.cc:2349
msgid "Non-option program arguments: "
msgstr ""
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/Zypper.cc:2307
+#: ../src/Zypper.cc:2413
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
msgstr ""
-#: ../src/Zypper.cc:2334
+#: ../src/Zypper.cc:2440
msgid "Root privileges are required for refreshing services."
msgstr ""
-#: ../src/Zypper.cc:2361 ../src/Zypper.cc:2481 ../src/Zypper.cc:2708
+#: ../src/Zypper.cc:2467 ../src/Zypper.cc:2587 ../src/Zypper.cc:2814
msgid "Root privileges are required for modifying system services."
msgstr ""
-#: ../src/Zypper.cc:2430
+#: ../src/Zypper.cc:2536
msgid "Could not determine the type of the repository. Check if the specified URI points to a valid repository."
msgstr ""
-#: ../src/Zypper.cc:2462
+#: ../src/Zypper.cc:2568
#, fuzzy, c-format
msgid "'%s' is not a valid service type."
msgstr "`%s' is not a valid netmask."
-#: ../src/Zypper.cc:2464
+#: ../src/Zypper.cc:2570
#, c-format
msgid "See '%s' or '%s' to get a list of known service types."
msgstr ""
@@ -3174,198 +3751,208 @@ msgstr ""
#. followed by ms command help text which will explain it
#. translators: aggregate option is e.g. "--all". This message will be
#. followed by mr command help text which will explain it
-#: ../src/Zypper.cc:2493 ../src/Zypper.cc:2861
+#: ../src/Zypper.cc:2599 ../src/Zypper.cc:2968
msgid "Alias or an aggregate option is required."
msgstr ""
-#: ../src/Zypper.cc:2527
+#: ../src/Zypper.cc:2633
#, c-format
msgid "Service '%s' not found."
msgstr ""
-#: ../src/Zypper.cc:2563 ../src/Zypper.cc:2707 ../src/Zypper.cc:2793
-#: ../src/Zypper.cc:2849
+#: ../src/Zypper.cc:2669 ../src/Zypper.cc:2813 ../src/Zypper.cc:2899
+#: ../src/Zypper.cc:2955
msgid "Root privileges are required for modifying system repositories."
msgstr ""
-#: ../src/Zypper.cc:2612 ../src/Zypper.cc:2970
+#: ../src/Zypper.cc:2718 ../src/Zypper.cc:3081
msgid "Too few arguments."
msgstr ""
-#: ../src/Zypper.cc:2636
+#: ../src/Zypper.cc:2742
msgid "If only one argument is used, it must be a URI pointing to a .repo file."
msgstr ""
-#: ../src/Zypper.cc:2662
+#: ../src/Zypper.cc:2768
#, c-format
msgid "Cannot use %s together with %s. Using the %s setting."
msgstr ""
-#: ../src/Zypper.cc:2685
+#: ../src/Zypper.cc:2791
msgid "Specified type is not a valid repository type:"
msgstr ""
-#: ../src/Zypper.cc:2687
+#: ../src/Zypper.cc:2793
#, c-format
msgid "See '%s' or '%s' to get a list of known repository types."
msgstr ""
#. translators: %s is the supplied command line argument which
#. for which no repository counterpart was found
-#: ../src/Zypper.cc:2743
+#: ../src/Zypper.cc:2849
#, c-format
msgid "Repository '%s' not found by alias, number or URI."
msgstr ""
#. translators: %s is the supplied command line argument which
#. for which no service counterpart was found
-#: ../src/Zypper.cc:2766
+#: ../src/Zypper.cc:2872
#, c-format
msgid "Service '%s' not found by alias, number or URI."
msgstr ""
-#: ../src/Zypper.cc:2800
+#: ../src/Zypper.cc:2906
msgid "Too few arguments. At least URI and alias are required."
msgstr ""
-#: ../src/Zypper.cc:2825
+#: ../src/Zypper.cc:2931
#, c-format
msgid "Repository '%s' not found."
msgstr ""
-#: ../src/Zypper.cc:2891
+#: ../src/Zypper.cc:3001
#, c-format
msgid "Repository %s not found."
msgstr ""
-#: ../src/Zypper.cc:2909
+#: ../src/Zypper.cc:3020
msgid "Root privileges are required for refreshing system repositories."
msgstr ""
-#: ../src/Zypper.cc:2916
+#: ../src/Zypper.cc:3027
#, c-format
msgid "The '%s' global option has no effect here."
msgstr ""
-#: ../src/Zypper.cc:2924
+#: ../src/Zypper.cc:3035
#, c-format
msgid "Arguments are not allowed if '%s' is used."
msgstr ""
-#: ../src/Zypper.cc:2950
+#: ../src/Zypper.cc:3061
msgid "Root privileges are required for cleaning local caches."
msgstr ""
-#: ../src/Zypper.cc:2971
+#: ../src/Zypper.cc:3082
msgid "At least one package name is required."
msgstr ""
-#: ../src/Zypper.cc:2985
+#: ../src/Zypper.cc:3092
msgid "Root privileges are required for installing or uninstalling packages."
msgstr ""
#. translators: rug related message, shown if
#. 'zypper in --entire-catalog foorepo someargument' is specified
-#: ../src/Zypper.cc:3002
+#: ../src/Zypper.cc:3109
msgid "Ignoring arguments, marking the entire repository."
msgstr ""
-#: ../src/Zypper.cc:3012
+#: ../src/Zypper.cc:3119
#, c-format
msgid "Unknown package type: %s"
msgstr ""
-#: ../src/Zypper.cc:3032
+#: ../src/Zypper.cc:3139
#, c-format
msgid "'%s' looks like an RPM file. Will try to download it."
msgstr ""
-#: ../src/Zypper.cc:3045
+#: ../src/Zypper.cc:3152
#, c-format
msgid "Problem with the RPM file specified as '%s', skipping."
msgstr ""
-#: ../src/Zypper.cc:3068
+#: ../src/Zypper.cc:3176
#, c-format
msgid "Problem reading the RPM header of %s. Is it an RPM file?"
msgstr ""
-#: ../src/Zypper.cc:3093
+#: ../src/Zypper.cc:3201
msgid "Plain RPM files cache"
msgstr ""
-#: ../src/Zypper.cc:3114
+#: ../src/Zypper.cc:3222
msgid "No valid arguments specified."
msgstr ""
-#: ../src/Zypper.cc:3128 ../src/Zypper.cc:3207
+#: ../src/Zypper.cc:3236 ../src/Zypper.cc:3315
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr ""
-#: ../src/Zypper.cc:3157
+#: ../src/Zypper.cc:3265
msgid "Source package name is a required argument."
msgstr ""
-#: ../src/Zypper.cc:3264 ../src/Zypper.cc:3524 ../src/Zypper.cc:3608
-#: ../src/Zypper.cc:3731 ../src/Zypper.cc:3799
+#: ../src/Zypper.cc:3372 ../src/Zypper.cc:3632 ../src/Zypper.cc:3725
+#: ../src/Zypper.cc:3848 ../src/Zypper.cc:3928
#, c-format
msgid "Unknown package type '%s'."
msgstr ""
-#: ../src/Zypper.cc:3370
+#: ../src/Zypper.cc:3478
msgid "Problem occurred initializing or executing the search query"
msgstr ""
-#: ../src/Zypper.cc:3371
+#: ../src/Zypper.cc:3479
msgid "See the above message for a hint."
msgstr ""
#. translators: Running as 'rug', cannot use 'best-effort' option.
-#: ../src/Zypper.cc:3543 ../src/Zypper.cc:3626
+#: ../src/Zypper.cc:3653 ../src/Zypper.cc:3743
#, c-format
msgid "Running as '%s', cannot use '%s' option."
msgstr ""
-#: ../src/Zypper.cc:3571
+#: ../src/Zypper.cc:3661
+#, c-format
+msgid "Cannot use %s together with %s."
+msgstr ""
+
+#: ../src/Zypper.cc:3694
msgid "Root privileges are required for updating packages."
msgstr ""
-#: ../src/Zypper.cc:3664
+#: ../src/Zypper.cc:3784
msgid "Root privileges are required for performing a distribution upgrade."
msgstr ""
-#: ../src/Zypper.cc:3761 ../src/Zypper.cc:3822
+#: ../src/Zypper.cc:3860
+#, c-format
+msgid "Type '%s' does not support %s."
+msgstr ""
+
+#: ../src/Zypper.cc:3890 ../src/Zypper.cc:3951
msgid "Root privileges are required for adding of package locks."
msgstr ""
-#: ../src/Zypper.cc:3930
+#: ../src/Zypper.cc:4060
#, c-format
msgid "%s matches %s"
msgstr ""
-#: ../src/Zypper.cc:3932
+#: ../src/Zypper.cc:4062
#, c-format
msgid "%s is newer than %s"
msgstr ""
-#: ../src/Zypper.cc:3934
+#: ../src/Zypper.cc:4064
#, c-format
msgid "%s is older than %s"
msgstr ""
-#: ../src/Zypper.cc:3973
+#: ../src/Zypper.cc:4121
msgid "This command only makes sense in the zypper shell."
msgstr ""
-#: ../src/Zypper.cc:3985
+#: ../src/Zypper.cc:4133
msgid "You already are running zypper's shell."
msgstr ""
-#: ../src/Zypper.cc:4002
+#: ../src/Zypper.cc:4150
msgid "Description"
msgstr "Description"
-#: ../src/Zypper.cc:4066
+#: ../src/Zypper.cc:4213
msgid "Resolvable Type"
msgstr ""
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org