Zypp Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2007
- 12 participants
- 325 discussions
[zypp-commit] r7262 - /trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
by schubi2＠svn.opensuse.org 17 Sep '07
by schubi2＠svn.opensuse.org 17 Sep '07
17 Sep '07
Author: schubi2
Date: Mon Sep 17 15:20:17 2007
New Revision: 7262
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7262&view=rev
Log:
Bugfix in vendor change of a required resolvable (Correct error message)
Bug 310455
Modified:
trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original)
+++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Mon Sep 17 15:20:17 2007
@@ -311,11 +311,13 @@
{
PoolItem_Ref requirer;
ResolverContext_Ptr context;
+ ResPool pool;
bool operator()( const CapAndItem cai)
{
PoolItem provider = cai.item;
Capability match = cai.cap;
+ PoolItem_Ref upgrades = Helper::findInstalledItem (pool, provider);
string msg_str;
//const Capability match;
@@ -349,10 +351,10 @@
misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_KEEP_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match);
misc_info->setOtherPoolItem (provider);
} else if (provider
- && requirer
- && !VendorAttr::instance().equivalent(provider->vendor(), requirer->vendor())) {
+ && upgrades
+ && !VendorAttr::instance().equivalent(provider->vendor(), upgrades->vendor())) {
misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_OTHER_VENDOR_PROVIDER,
- requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match);
+ upgrades, RESOLVER_INFO_PRIORITY_VERBOSE, match);
misc_info->setOtherPoolItem (provider);
}
else if (provider->arch().compatibleWith( context->architecture() )) {
@@ -742,6 +744,7 @@
NoInstallableProviders info;
info.requirer = _requiring_item;
info.context = context;
+ info.pool = pool();
// Maybe we can add some extra info on why none of the providers are suitable.
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7261 - /trunk/libzypp/zypp/cache/CacheInitializer.h
by mlandres＠svn.opensuse.org 17 Sep '07
by mlandres＠svn.opensuse.org 17 Sep '07
17 Sep '07
Author: mlandres
Date: Mon Sep 17 14:19:24 2007
New Revision: 7261
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7261&view=rev
Log:
Update ZYPP_CACHE_SCHEMA_VERSION
Modified:
trunk/libzypp/zypp/cache/CacheInitializer.h
Modified: trunk/libzypp/zypp/cache/CacheInitializer.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheInitiali…
==============================================================================
--- trunk/libzypp/zypp/cache/CacheInitializer.h (original)
+++ trunk/libzypp/zypp/cache/CacheInitializer.h Mon Sep 17 14:19:24 2007
@@ -19,7 +19,7 @@
#include "zypp/Pathname.h"
#include "zypp/cache/sqlite3x/sqlite3x.hpp"
-#define ZYPP_CACHE_SCHEMA_VERSION 1005
+#define ZYPP_CACHE_SCHEMA_VERSION 1006
///////////////////////////////////////////////////////////////////
namespace zypp
@@ -51,7 +51,7 @@
* and was just initialized with success
*/
bool justInitialized() const;
-
+
/**
* \short Has the cache been reinitialized?
*
@@ -60,7 +60,7 @@
* was reinitialized in order to get the new schema
*/
bool justReinitialized() const;
-
+
protected:
bool tablesCreated() const;
void createTables();
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7260 - /branches/SuSE-Linux-10_2-Branch/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 17 Sep '07
by jkupec＠svn.opensuse.org 17 Sep '07
17 Sep '07
Author: jkupec
Date: Mon Sep 17 13:46:53 2007
New Revision: 7260
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7260&view=rev
Log:
- ignore the ZYpp lock if ZYPP_READONLY_HACK=1 env. var. is set
(#310581)
Modified:
branches/SuSE-Linux-10_2-Branch/zypper/src/zypper.cc
Modified: branches/SuSE-Linux-10_2-Branch/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/zypper…
==============================================================================
--- branches/SuSE-Linux-10_2-Branch/zypper/src/zypper.cc (original)
+++ branches/SuSE-Linux-10_2-Branch/zypper/src/zypper.cc Mon Sep 17 13:46:53 2007
@@ -544,7 +544,10 @@
// here come commands that need the lock
try {
- if (command == "service-list" || command == "sl")
+ const char *roh = getenv("ZYPP_READONLY_HACK");
+ if (roh != NULL && roh[0] == '1')
+ zypp_readonly_hack::IWantIt ();
+ else if (command == "service-list" || command == "sl")
zypp_readonly_hack::IWantIt (); // #247001
God = zypp::getZYpp();
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7259 - /trunk/updater-kde/updater/CMakeLists.txt
by tgoettlicher＠svn.opensuse.org 17 Sep '07
by tgoettlicher＠svn.opensuse.org 17 Sep '07
17 Sep '07
Author: tgoettlicher
Date: Mon Sep 17 12:45:33 2007
New Revision: 7259
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7259&view=rev
Log:
removed opensuseupdater-su
Modified:
trunk/updater-kde/updater/CMakeLists.txt
Modified: trunk/updater-kde/updater/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/CMakeLists.t…
==============================================================================
--- trunk/updater-kde/updater/CMakeLists.txt (original)
+++ trunk/updater-kde/updater/CMakeLists.txt Mon Sep 17 12:45:33 2007
@@ -36,7 +36,7 @@
INSTALL_FILES( /share/config.kcfg FILES opensuseupdater_settings.kcfg )
INSTALL_FILES( /share/servicetypes FILES opensuseupdater_backend.desktop )
#INSTALL_FILES( /bin FILES opensuseupdater-su )
-INSTALL_PROGRAMS( /bin FILES opensuseupdater-su )
+#INSTALL_PROGRAMS( /bin FILES opensuseupdater-su )
INSTALL_FILES( /share/applnk/Utilities FILES opensuseupdater.desktop )
INSTALL_FILES( /share/autostart FILES opensusestart.desktop )
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7258 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 17 Sep '07
by tgoettlicher＠svn.opensuse.org 17 Sep '07
17 Sep '07
Author: tgoettlicher
Date: Mon Sep 17 12:40:46 2007
New Revision: 7258
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7258&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 17 12:40:46 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 17 12:36:55 CEST 2007 - tgoettlicher(a)suse.de
+
+- updated translations
+- 7257
+
+-------------------------------------------------------------------
Fri Sep 14 11:30:44 CEST 2007 - tgoettlicher(a)suse.de
- updated translations
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
17 Sep '07
Author: tgoettlicher
Date: Mon Sep 17 12:39:09 2007
New Revision: 7257
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7257&view=rev
Log:
updated translations
Modified:
trunk/updater-kde/po/de.po
Modified: trunk/updater-kde/po/de.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/de.po?rev=7257&r1…
==============================================================================
--- trunk/updater-kde/po/de.po (original)
+++ trunk/updater-kde/po/de.po Mon Sep 17 12:39:09 2007
@@ -1,32 +1,36 @@
+# translation of opensuseupdater.po to deutsch
# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
# This file is distributed under the same license as the package.
#
+# Johannes Engel <j-engel(a)gmx.de>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: opensuseupdater\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-27 16:28+0200\n"
-"PO-Revision-Date: 2006-11-03 12:03\n"
-"Last-Translator: Novell Language <language(a)novell.com>\n"
-"Language-Team: Novell Language <language(a)novell.com>\n"
+"PO-Revision-Date: 2007-09-15 23:47+0200\n"
+"Last-Translator: Johannes Engel <j-engel(a)gmx.de>\n"
+"Language-Team: deutsch <de(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../po/rc.cpp:3
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Check for updates every:"
-msgstr "Auf Aktualisierungen prüfen alle "
+msgstr "Prüf-Intervall für Aktualisierungen:"
#: ../po/rc.cpp:6
#, no-c-format
msgid " Hours"
-msgstr ""
+msgstr " Stunden"
#: ../po/rc.cpp:8
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Show recurring notification when updates are available every:"
-msgstr "Keine Aktualisierungen verfügbar."
+msgstr "Intervall der wiederkehrenden Benachrichtigungen, wenn Updates verfügbar sind:"
#: ../po/rc.cpp:11
#, no-c-format
@@ -41,17 +45,17 @@
#: ../po/rc.cpp:17
#, no-c-format
msgid "Show available upgrades when backend provides them (for experts only)"
-msgstr ""
+msgstr "Zeige verfügbare Upgrades, wenn die Software sie anbietet (nur für Experten)"
#: ../po/rc.cpp:20
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Show notifications"
-msgstr "Benachrichtigungen"
+msgstr "Zeige Benachrichtigungen"
#: ../po/rc.cpp:22
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Backend:"
-msgstr "Hinterg_rund:"
+msgstr "Hintergrund:"
#: ../po/rc.cpp:25
#, no-c-format
@@ -59,9 +63,9 @@
msgstr "Häufigkeit der Prüfung auf Aktualisierungen."
#: ../po/rc.cpp:27
-#, fuzzy, no-c-format
+#, no-c-format
msgid "How often show recurring warning when updates are available."
-msgstr "Keine Aktualisierungen verfügbar."
+msgstr "Wie oft sollen Warnungen gezeigt werden, wenn Updates verfügbar sind?"
#: ../po/rc.cpp:29
#, no-c-format
@@ -71,44 +75,41 @@
#: ../po/rc.cpp:31
#, no-c-format
msgid "The backend for connecting to package database."
-msgstr ""
+msgstr "Die Software-Schicht zur Verbindung zur Paketdatenbank."
#: ../po/rc.cpp:33
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Show available upgrades (for experts only)."
-msgstr "Verfügbare Aktualisierungen anzeigen."
+msgstr "Verfügbare Aktualisierungen anzeigen (nur für Experten)."
#: ../po/rc.cpp:35
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Show notifications."
-msgstr "Benachrichtigungen"
+msgstr "Benachrichtigungen anzeigen."
#: ../updater/simpleview.cpp:39 ../updater/simpleview.cpp:200
#: ../updater/simpleview.cpp:217
-#, fuzzy
msgid "<b>New software for your system is available</b>"
-msgstr "<b>Keine Software-Updates verfügbar</b>"
+msgstr "<b>Neue Updates verfügbar</b>"
#: ../updater/simpleview.cpp:48
-#, fuzzy
msgid "Choose the updates to be installed:"
-msgstr "%s muss installiert werden."
+msgstr "Wählen Sie die zu installlierenden Updates:"
#: ../updater/simpleview.cpp:50 ../updater/simpleview.cpp:55
#: ../updater/simpleview.cpp:225
-#, fuzzy, c-format
+#, c-format
msgid "Install %n recommended update additionally"
msgid_plural "Install %n recommended updates additionally"
-msgstr[0] "ZEN-Partition installieren oder aktualisieren"
-msgstr[1] "ZEN-Partition installieren oder aktualisieren"
+msgstr[0] "Installiere %n zusätzliches empfohlenes Update"
+msgstr[1] "Installiere %n zusätzliche empfohlene Updates"
#: ../updater/simpleview.cpp:58
msgid "Don't install updates that require a restart"
-msgstr ""
+msgstr "Installiere keine Updates, die einen Neustart benötigen"
#. -------------------- Buttons ------------------------
#: ../updater/simpleview.cpp:71
-#, fuzzy
msgid "Details"
msgstr "&Details"
@@ -118,38 +119,34 @@
msgstr "Installieren"
#: ../updater/simpleview.cpp:163
-#, fuzzy
msgid "<b>Checking for updates...</b>"
-msgstr "Prüfen auf Aktualisierungen..."
+msgstr "<b>Prüfen auf Aktualisierungen...</b>"
#: ../updater/simpleview.cpp:175
-#, fuzzy
msgid "<b>Error:</b>"
-msgstr "<b>Händler:</b>"
+msgstr "<b>Fehler:</b>"
#: ../updater/simpleview.cpp:188
-#, fuzzy
msgid "<b>No Updates Available</b>"
-msgstr "Keine Aktualisierungen verfügbar"
+msgstr "<b>Keine Aktualisierungen verfügbar</b>"
#: ../updater/simpleview.cpp:201
-#, fuzzy
msgid "Updates that affect your updater itself are available."
-msgstr "Keine Aktualisierungen verfügbar."
+msgstr "Es sind Updates verfügbar, die das System betreffen."
#: ../updater/simpleview.cpp:218
-#, fuzzy, c-format
+#, c-format
msgid "%n security update is available"
msgid_plural "%n security updates are available"
-msgstr[0] "Keine Aktualisierungen verfügbar."
-msgstr[1] "Keine Aktualisierungen verfügbar."
+msgstr[0] "%n Sicherheits-Update ist verfügbar"
+msgstr[1] "%n Sicherheits-Updates sind verfügbar"
#: ../updater/simpleview.cpp:232
-#, fuzzy, c-format
+#, c-format
msgid "%n recommended update is available"
msgid_plural "%n recommended updates are available"
-msgstr[0] "Keine Aktualisierungen verfügbar."
-msgstr[1] "Keine Aktualisierungen verfügbar."
+msgstr[0] "%n empfohlenes Update ist verfügbar"
+msgstr[1] "%n empfohlene Updates sind verfügbar"
#: ../updater/simpleview.cpp:261
#, c-format
@@ -160,147 +157,136 @@
"%n optional updates are available.\n"
"You can select optional updates in the detailed dialog."
msgstr[0] ""
+"%n optionales Update ist verfügbar.\n"
+"Sie können optionale Updates im erweiterten Dialog auswählen."
msgstr[1] ""
+"%n optionale Updates sind verfügbar.\n"
+"Sie können optionale Updates im erweiterten Dialog auswählen."
#: ../updater/simpleview.cpp:268
-#, fuzzy
msgid "<b>Updating...</b>"
-msgstr "<b>Updating software...</b>"
+msgstr "<b>Aktualisiere...</b>"
#: ../updater/simpleview.cpp:279
-#, fuzzy
msgid "<b>Unable to check whether updates are available.</b>"
-msgstr "<b>Keine Software-Updates verfügbar</b>"
+msgstr "<b>Konnte nicht auf Updates überprüfen.</b>"
#: ../updater/simpleview.cpp:280
msgid ""
"Please use \"Add/Remove Update Sources...\"\n"
"from the tray icon menu to define an update repository."
msgstr ""
+"Bitte benutzen Sie \"Updatequellen hinzufügen...\"\n"
+"aus dem Menu des Tray-Icons, um einen Kanal hinzuzufügen."
#: ../updater/UpdaterApplication.cpp:83
msgid ""
"Backend plugin is not properly configured.\n"
"Please use the configuration dialog to choose the correct one."
msgstr ""
+"Das Backend-Plugin ist nicht richtig konfiguriert.\n"
+"Bitte nutzen Sie den Konfigurations-Dialog, um das richtige auszuwählen."
#: ../updater/UpdaterApplication.cpp:112
-#, fuzzy
msgid "Unable to load plugin. ErrNoServiceFound"
-msgstr "Dienst kann nicht hinzugefügt werden"
+msgstr "Plugin kann nicht geladen werden. Kein Dienst gefunden"
#: ../updater/UpdaterApplication.cpp:116
msgid "Unable to load plugin. ErrServiceProvidesNoLibrary"
-msgstr ""
+msgstr "Dienst kann nicht geladen werden. Bibliothek nicht gefunden"
#: ../updater/UpdaterApplication.cpp:120
-#, fuzzy
msgid "Unable to load plugin. ErrNoLibrary: %1"
-msgstr "Fehler beim Laden des Plugins bei '{0}': {1}"
+msgstr "Plugin kann nicht geladen werden. Bibliothek nicht gefunden: %1"
#: ../updater/UpdaterApplication.cpp:124
-#, fuzzy
msgid "Unable to load plugin. ErrNoFactory"
-msgstr "Verzeichnis konnte nicht erstellt werden."
+msgstr "Plugin konnte nicht geladen werden."
#: ../updater/UpdaterApplication.cpp:128
-#, fuzzy
msgid "Unable to load plugin. ErrNoComponent"
-msgstr "URL-Hauptkomponenten können nicht analysiert werden"
+msgstr "Plugin konnte nicht geladen werden. Keine Komponente"
#: ../updater/UpdaterApplication.cpp:132
-#, fuzzy
msgid "Unable to load plugin. Unknown Error"
-msgstr "Anmelden nicht möglich"
+msgstr "Plugin konnte nicht geladen werden. Unbekannter Fehler"
#: ../updater/zypp/ZYppUpdater.cpp:189 ../updater/zypp/ZYppUpdater.cpp:191
msgid ""
"helper program returned:\n"
"%1"
msgstr ""
+"Dienstprogramm gab zurück:\n"
+"%1"
#: ../updater/zypp/ZYppUpdater.cpp:322
#: ../updater/zypp_traditional/ZYppUpdater.cpp:234
msgid "Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper package is installed and working."
-msgstr ""
+msgstr "Kann den Update-Prüfer zypp nicht laden. Bitte stellen Sie sicher, dass zypper installiert ist und funktioniert."
#: ../updater/zypp/ZYppUpdater.cpp:397 ../updater/zypp/ZYppUpdater.cpp:420
-#, fuzzy
msgid "License of %1"
-msgstr "Lizenzen für '{0}'"
+msgstr "Lizenzen für %1"
#: ../updater/zypp/ZYppUpdater.cpp:451
msgid "Can't launch install helper program. Make sure zypper package is installed and working."
-msgstr ""
+msgstr "Das Installationsprogramm kann nicht geladen werden. Stellen Sie sicher, dass zypper installiert ist und funktioniert."
#: ../updater/zypp/licensedialog.cpp:25
-#, fuzzy
msgid "Accept"
msgstr "Ãber&nehmen"
#: ../updater/zypp/licensedialog.cpp:26
-#, fuzzy
msgid "Decline"
-msgstr "Ab_lehnen"
+msgstr "Ablehnen"
#: ../updater/osupdaterpopup.cpp:74
msgid "Ignore"
msgstr "Ignorieren"
#: ../updater/osupdaterpopup.cpp:75
-#, fuzzy
msgid "Details..."
msgstr "&Details"
#: ../updater/osupdaterpopup.cpp:102
-#, fuzzy
msgid "1 Patch available"
-msgstr "Nicht verfügbar"
+msgstr "1 Aktualisierung verfügbar"
#: ../updater/osupdaterpopup.cpp:105
-#, fuzzy
msgid "%1 Patches available"
-msgstr " Aktualisierungen verfügbar"
+msgstr "%1 Aktualisierungen verfügbar"
#: ../updater/osupdaterpopup.cpp:108
-#, fuzzy
msgid "1 Package available"
-msgstr "Aktualisierung verfügbar"
+msgstr "1 Paket verfügbar"
#: ../updater/osupdaterpopup.cpp:111
-#, fuzzy
msgid "%1 Packages available"
-msgstr " Aktualisierungen verfügbar"
+msgstr "%1 Pakete verfügbar"
#: ../updater/osupdaterpopup.cpp:114
-#, fuzzy
msgid "1 Patch and 1 Package available"
-msgstr "Zurzeit sind %s Pakete verfügbar"
+msgstr "1 Aktualisierung und 1 Paket verfügbar"
#: ../updater/osupdaterpopup.cpp:117
-#, fuzzy
msgid "%1 Patches and 1 Package available"
-msgstr "Zurzeit sind %s Pakete verfügbar"
+msgstr "%1 Aktualisierungen und 1 Paket verfügbar"
#: ../updater/osupdaterpopup.cpp:120
-#, fuzzy
msgid "1 Patch and %1 Packages available"
-msgstr "Zurzeit sind %s Pakete verfügbar"
+msgstr "1 Aktualisierung und %1 Pakete verfügbar"
#: ../updater/osupdaterpopup.cpp:123
-#, fuzzy
msgid "%1 Patches and %2 Packages available"
-msgstr "Zurzeit sind %s Pakete verfügbar"
+msgstr "%1 Aktualisierungen und %2 Pakete verfügbar"
#: ../updater/progresspopup.cpp:25
-#, fuzzy
msgid "<b>Updating ...<b>"
-msgstr "<b>Updating software...</b>"
+msgstr "<b>Aktualisiere ...</b>"
#: ../updater/TrayIcon.cpp:53 ../updater/TrayIcon.cpp:131
-#, fuzzy
msgid "New software for your system is available"
-msgstr "Keine Software-Updates verfügbar"
+msgstr "Es gibt neue Programme für Ihr System"
#: ../updater/TrayIcon.cpp:82
msgid "Checking for updates..."
@@ -316,24 +302,20 @@
#: ../updater/TrayIcon.cpp:96 ../updater/TrayIcon.cpp:102
#: ../updater/TrayIcon.cpp:108
-#, fuzzy
msgid "New software updates are available."
-msgstr "Keine Aktualisierungen verfügbar."
+msgstr "Es gibt neue Aktualisierungen."
#: ../updater/TrayIcon.cpp:115
-#, fuzzy
msgid "Updating..."
msgstr "Aktualisieren"
#: ../updater/TrayIcon.cpp:119
-#, fuzzy
msgid "Unable to check whether updates are available."
-msgstr "Keine Aktualisierungen verfügbar."
+msgstr "Kann die Verfügbarkeit von Updates nicht überprüfen."
#: ../updater/HeaderWidget.cpp:36
-#, fuzzy
msgid "<h2>Available Updates</h2>"
-msgstr "Verfügbare Aktualisierungen"
+msgstr "<h2>Verfügbare Aktualisierungen</h2>"
#: ../updater/MainWindow.cpp:76
msgid "Add/Remove Update Sources..."
@@ -345,11 +327,11 @@
#: ../updater/MainWindow.cpp:78
msgid "Check Now"
-msgstr ""
+msgstr "Jetzt überprüfen"
#: ../updater/MainWindow.cpp:126
msgid "The following official patches for openSUSE either fix security holes or errors in the software."
-msgstr ""
+msgstr "Die folgenden offiziellen Aktualisierungen für openSUSE schlieÃen entweder Sicherheitslücken oder beheben Softwarefehler."
#: ../updater/MainWindow.cpp:128 ../updater/MainWindow.cpp:166
msgid "Name"
@@ -376,43 +358,36 @@
msgstr "Neustart"
#: ../updater/MainWindow.cpp:139 ../updater/MainWindow.cpp:424
-#, fuzzy
msgid "Patches"
-msgstr "Verbergen von Patches"
+msgstr "Aktualisierungen"
#: ../updater/MainWindow.cpp:144
-#, fuzzy
msgid "Select All Patches"
-msgstr "Pfad auswählen"
+msgstr "Alle Aktualisierungen auswählen"
#: ../updater/MainWindow.cpp:145
-#, fuzzy
msgid "Clear Patch Selection"
msgstr "Auswahl löschen"
#: ../updater/MainWindow.cpp:163
msgid "The following list contains new versions for software packages installed on your system.<br>These updates are provided by the openSUSE community."
-msgstr ""
+msgstr "Die folgende Liste enthält neue Versionen von Paketen, die auf diesem System installiert sind.<br>Diese Updates wurden von openSUSE-Nutzern bereit gestellt."
#: ../updater/MainWindow.cpp:181
-#, fuzzy
msgid "Select All Packages"
msgstr "Alle Pakete"
#: ../updater/MainWindow.cpp:182
-#, fuzzy
msgid "Clear Package Selection"
-msgstr "Paketauswahl"
+msgstr "Paketauswahl löschen"
# Use "Update" here; cf. #29964
# 2003-09-10 18:45:06 CEST -ke-
#: ../updater/MainWindow.cpp:189 ../updater/MainWindow.cpp:425
-#, fuzzy
msgid "Upgrades"
-msgstr "Aufrüsten"
+msgstr "Upgrades"
#: ../updater/MainWindow.cpp:200
-#, fuzzy
msgid "Add/Remove Update Repositories..."
msgstr "Update-Quellen hinzufügen/entfernen..."
@@ -425,95 +400,83 @@
msgstr "Einstellungen"
#: ../updater/zmd/ZmdServerDialog.cpp:80
-#, fuzzy
msgid "Please enter server name below"
-msgstr "Geben Sie das Treiber-Update-Gerät ein."
+msgstr "Geben Sie den Namen des Servers ein"
#: ../updater/zmd/ZmdServerDialog.cpp:81
-#, fuzzy
msgid "Please enter server URL below"
-msgstr "Geben Sie das Treiber-Update-Gerät ein."
+msgstr "Geben Sie die Adresse des Servers ein"
#: ../updater/zmd/ZmdServerDialog.cpp:84
-#, fuzzy
msgid "Server Type"
-msgstr "Server"
+msgstr "Server-Typ"
#: ../updater/zmd/ZmdServerDialog.cpp:89
-#, fuzzy
msgid "NU Server"
-msgstr "VNC-Server"
+msgstr "NU-Server"
#: ../updater/zmd/ZmdServerDialog.cpp:90
-#, fuzzy
msgid "RCE Server"
-msgstr "VNC-Server"
+msgstr "RCE-Server"
#: ../updater/zmd/ZmdServerDialog.cpp:124 ../updater/zmd/ZmdEditServers.cpp:53
-#, fuzzy
msgid "Add Server"
-msgstr "Dienst hinzufügen"
+msgstr "Server hinzufügen"
#: ../updater/zmd/ZmdEditServers.cpp:54
-#, fuzzy
msgid "Remove Server"
-msgstr "Service entfernen"
+msgstr "Server entfernen"
#: ../updater/zmd/ZmdEditServers.cpp:56
-#, fuzzy
msgid "Services/Catalogs"
msgstr "Dienste und Kataloge"
#. Tell the user what is going on
#: ../updater/zmd/ZmdEditServers.cpp:99
-#, fuzzy
msgid "Fetching service list..."
-msgstr "Refreshing services..."
+msgstr "Hole die Liste der Dienste..."
#: ../updater/zmd/ZmdEditServers.cpp:141
msgid "Fetching Catalogs For Service..."
-msgstr ""
+msgstr "Hole die Dienstkataloge..."
#. Tell the user what is going on, this takes a long long time
#: ../updater/zmd/ZmdEditServers.cpp:218
-#, fuzzy
msgid "Adding server.."
-msgstr "Nameserver-Anfrage..."
+msgstr "Füge den Server hinzu..."
#: ../updater/zmd/ZmdEditServers.cpp:219
msgid ""
"We are adding a server to the updater, this may take a long time. \n"
"Please be patient"
msgstr ""
+"Füge einen Server hinzu, das kann länger dauern. \n"
+"Bitte haben Sie etwas Geduld."
#. We don't say you need to have a type, because the groupbox takes care of that
#: ../updater/zmd/ZmdEditServers.cpp:231
-#, fuzzy
msgid "You need to specify a name and URL to add a server"
-msgstr "Sie müssen Ressourcentypen, Namen und Versionen angeben"
+msgstr "Sie müssen einen Namen und eine Adresse angeben, um einen Server hinzuzufügen."
#: ../updater/zmd/ZmdEditServers.cpp:248
-#, fuzzy
msgid "Invalid server: "
-msgstr "Ungültiger Benutzername"
+msgstr "Ungültiger Server: "
#: ../updater/zmd/ZmdEditServers.cpp:251
msgid "The type you specified for the server is invalid:"
-msgstr ""
+msgstr "Der Typ des Servers ist ungültig: "
#: ../updater/zmd/ZmdEditServers.cpp:254
msgid "Sorry, the server could not be added: "
-msgstr ""
+msgstr "Der Server konnte nicht hinzugefügt werden: "
#: ../updater/zmd/ZmdEditServers.cpp:281
-#, fuzzy
msgid "Service Removed"
-msgstr "Dienstname"
+msgstr "Dienst entfernt"
#: ../updater/zmd/ZmdConfigWindow.cpp:62 ../updater/zmd/ZmdConfigWindow.cpp:77
-#, fuzzy
msgid "Add/Remove Servers"
-msgstr "Service entfernen"
+msgstr "Dienst hinzufügen/entfernen"
#: ../updater/zmd/ZmdConfigWindow.cpp:63
msgid "Advanced Options"
@@ -521,29 +484,27 @@
#: ../updater/zmd/ZmdConfigWindow.cpp:65 ../updater/zmd/ZmdConfigWindow.cpp:88
msgid "<b>Add/Remove Package Servers:</b><br> You may add or remove update servers below or change your software catalog subscriptions.<br> <u>Make whatever changes you wish and press close.</u>"
-msgstr ""
+msgstr "<b>Paket-Server hinzufügen/entfernen:</b><br> Sie können unten Update-Server hinzufügen oder ihre Kanal-Abonnements ändern.<br> <u>Tätigen Sie Ihre Ãnderungen und klicken Sie danach auf schlieÃen.</u>"
#: ../updater/zmd/ZmdConfigWindow.cpp:92
msgid "<b>Configure ZMD:</b><br>The following are advanced options for ZMD. Only change these if you know what you are doing.<br><u>Be aware, disabling TCP support will disable this updater</u>"
-msgstr ""
+msgstr "<b>Konfiguriere den ZMD:</b><br>Die folgenden Optionen sind für Experten im Umgang mit dem ZMD. Ãndern Sie sie nur, wenn Sie genau wissen, was Sie tun.<br><u>Beachten Sie: Das Abschalten von TCP deaktiviert den updater</u>"
#: ../updater/zmd/ZmdUpdater.cpp:153
-#, fuzzy
msgid "Hold Back Package"
-msgstr "Gefundene Pakete"
+msgstr "Halte ein Paket zurück"
#: ../updater/zmd/ZmdUpdater.cpp:157
msgid "Don't Hold Back Package"
-msgstr ""
+msgstr "Halte keine Pakete zurück"
#: ../updater/zmd/ZmdUpdater.cpp:372
msgid "Update"
msgstr "Update"
#: ../updater/zmd/ZmdUpdater.cpp:410
-#, fuzzy
msgid "Patch"
-msgstr "Patch"
+msgstr "Aktualisierung"
#: ../updater/zmd/ZmdUpdater.cpp:457 ../updater/zmd/ZmdUpdater.cpp:471
msgid "Description: "
@@ -551,85 +512,77 @@
#: ../updater/zmd/ZmdUpdater.cpp:459
msgid "<b>Upgrading from old version:</b> "
-msgstr ""
+msgstr "<b>Aktualisiere alte Version:</b>"
#: ../updater/zmd/ZmdUpdater.cpp:470
-#, fuzzy
msgid "Patch Category: "
msgstr "Kategorie: "
#: ../updater/zmd/ZmdUpdater.cpp:473
-#, fuzzy
msgid "<b>Upgrading to version:</b> "
-msgstr "<b>USB-Version:</b>"
+msgstr "<b>Aktualisiere auf Version:</b>"
#: ../updater/zmd/ZmdUpdater.cpp:477
-#, fuzzy
msgid "<b>Reboot Required</b>"
-msgstr "Reboot erforderlich:"
+msgstr "<b>Neustart erforderlich:</b>"
#: ../updater/zmd/ZmdUpdater.cpp:482
-#, fuzzy
msgid "<b>ZMD Restart Required</b>"
-msgstr "Neustart erforderlich: "
+msgstr "<b>Neustart des ZMD erforderlich: </b>"
#: ../updater/zmd/ZmdInstallWindow.cpp:73
msgid "<b>Installing updates and patches:</b><br> Below is a description of the transaction and its progress.<br>"
-msgstr ""
+msgstr "<b>Installiere Aktualisierungen:</b><br>Unten finden Sie eine Beschreibung der Transaktion und die Fortschrittsanzeige.<br>"
#. we can't yet abort an upgrade
#: ../updater/zmd/ZmdInstallWindow.cpp:77
-#, fuzzy
msgid "Abort Upgrade"
-msgstr "Brich das kernel-Upgrade ab"
+msgstr "Aktualisierung abbrechen"
#: ../updater/zmd/ZmdInstallWindow.cpp:90
-#, fuzzy
msgid "Installing Packages..."
msgstr "Installiere Pakete"
#: ../updater/zmd/ZmdInstallWindow.cpp:117
-#, fuzzy
msgid "The following packages will be installed:\n"
-msgstr "Folgende Pakete werden installiert:"
+msgstr "Folgende Pakete werden installiert:\n"
#: ../updater/zmd/ZmdInstallWindow.cpp:126
-#, fuzzy
msgid "The following packages will be updated:\n"
-msgstr "Folgende Pakete werden aufgerüstet:"
+msgstr "Folgende Pakete werden aktualisiert:\n"
#: ../updater/zmd/ZmdInstallWindow.cpp:135
-#, fuzzy
msgid ""
"\n"
"The following packages must also be removed:\n"
msgstr ""
"\n"
-"Folgende Pakete werden entfernt:"
+"Folgende Pakete müssen auch entfernt werden:\n"
#: ../updater/zmd/ZmdInstallWindow.cpp:142
-#, fuzzy
msgid "Transaction Summary"
-msgstr "Fehler bei Transaktion: "
+msgstr "Ãberblick der Transaktion"
#: ../updater/zmd/ZmdInstallWindow.cpp:161
msgid ""
"\n"
"We are currently unable to show the progress for the download. This is caused by a bug in ZMD, which should be fixed soon. We apologize for any inconvenience this may cause."
msgstr ""
+"\n"
+"Wir können gerade keine Fortschrittsanzeige darstellen für den Download. Das liegt an einem Fehler im ZMD, der bald behoben wird. Bitte entschuldigen Sie eventuelle Unannehmlichkeiten."
#: ../updater/zmd/ZmdInstallWindow.cpp:161
-#, fuzzy
msgid ""
"\n"
"Packages Are Downloading..."
-msgstr "Downloading von %s..."
+msgstr ""
+"\n"
+"Pakete werden heruntergeladen..."
#. if this is the first time we are watching a package
#: ../updater/zmd/ZmdInstallWindow.cpp:172
-#, fuzzy
msgid "Packages Are Downloading..."
-msgstr "Downloading von %s..."
+msgstr "Pakete werden heruntergeladen..."
#. we have just started the transaction, download is now done
#: ../updater/zmd/ZmdInstallWindow.cpp:179
@@ -644,30 +597,25 @@
#. if we are not already watching a package and the transaction is running
#: ../updater/zmd/ZmdInstallWindow.cpp:209
-#, fuzzy
msgid "Packages Are Being Installed..."
-msgstr "Paket {0} ist bereits installiert."
+msgstr "Pakete werden installiert..."
#. if the transaction is done and we have not already marked it done
#: ../updater/zmd/ZmdInstallWindow.cpp:215
-#, fuzzy
msgid " Done."
-msgstr "Fertig"
+msgstr " Fertig"
#: ../updater/zmd/ZmdInstallWindow.cpp:231
-#, fuzzy
msgid "Sorry, we couldn't resolve the dependencies for this update:\n"
-msgstr "die Abhängigkeiten konnten nicht aufgelöst werden"
+msgstr "Die Abhängigkeiten für diese Aktualisierung konnten nicht aufgelöst werden:\n"
#: ../updater/zmd/ZmdInstallWindow.cpp:235
-#, fuzzy
msgid "Upgrade Failed: "
-msgstr "Aktualisierung von %s ist fehlgeschlagen"
+msgstr "Aktualisierung fehlgeschlagen: "
#: ../updater/zmd/ZmdInstallWindow.cpp:239
-#, fuzzy
msgid "Done!"
-msgstr "Fertig"
+msgstr "Fertig!"
#: ../updater/zmd/ZmdInstallWindow.cpp:278
msgid "Resolving Dependencies..."
@@ -675,41 +623,37 @@
#: ../updater/zmd/ZmdAdvancedConfig.cpp:75
msgid "To use this part of the updater, rug must be in your path"
-msgstr ""
+msgstr "Um diesen Teil des Updaters zu nutzen, muss sich rug in einem ihrer Programmpfade befinden."
#: ../updater/zmd/ZmdAdvancedConfig.cpp:85
-#, fuzzy
msgid "Connection Options"
-msgstr "Verbindungen"
+msgstr "Verbindungseinstellungen"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:88
msgid "ZMD Is Listening on: "
-msgstr ""
+msgstr "ZMD lauscht auf: "
#: ../updater/zmd/ZmdAdvancedConfig.cpp:92
msgid "ZMD TCP Support: "
-msgstr ""
+msgstr "ZMD TCP-Unterstützung: "
#: ../updater/zmd/ZmdAdvancedConfig.cpp:95
#: ../updater/zmd/ZmdAdvancedConfig.cpp:147
-#, fuzzy
msgid "On"
-msgstr "Ãffnen"
+msgstr "Ein"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:96
#: ../updater/zmd/ZmdAdvancedConfig.cpp:148
-#, fuzzy
msgid "Off"
-msgstr "Office"
+msgstr "Aus"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:103
-#, fuzzy
msgid "Security Options"
-msgstr "Sicherheitsaktualisierungen"
+msgstr "Sicherheitseinstellungen"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:106
msgid "Require GPG Certificates For Servers: "
-msgstr ""
+msgstr "Verlange GPG-Zertifikate für Server: "
#: ../updater/zmd/ZmdAdvancedConfig.cpp:109
msgid "Yes"
@@ -720,19 +664,16 @@
msgstr "Nein"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:116
-#, fuzzy
msgid "Security Level: "
-msgstr "security-level"
+msgstr "Sicherheitsstufe: "
#: ../updater/zmd/ZmdAdvancedConfig.cpp:121
-#, fuzzy
msgid "Proxy Options"
-msgstr "Bootoptionen"
+msgstr "Proxy-Optionen"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:124
-#, fuzzy
msgid "Proxy Server:"
-msgstr "Druckserver"
+msgstr "Proxy-Server:"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:128
msgid "User Name:"
@@ -749,136 +690,53 @@
#: ../updater/zmd/ZmdAdvancedConfig.cpp:140
msgid "ZMD Logging Level: "
-msgstr ""
+msgstr "ZMD Protokollstufe: "
#: ../updater/zmd/ZmdAdvancedConfig.cpp:144
-#, fuzzy
msgid "Rollback Support: "
-msgstr "Rollback"
+msgstr "Rollback-Unterstützung: "
#: ../updater/zmd/ZmdAdvancedConfig.cpp:154
-#, fuzzy
msgid "Max Simultaneous Downloads"
msgstr "Max. Anzahl der gleichzeitigen Downloads"
#: ../updater/zmd/ZmdAdvancedConfig.cpp:356
msgid "Rug must be installed to configure ZMD, is it in your path?"
-msgstr ""
+msgstr "Rug muss installiert sein, um ZMD zu konfigurieren. Befindet sich Rug in Ihrem Programmpfad?"
#: ../udshttp/udshttp.cpp:128
-#, fuzzy
msgid "There were errors getting data from job"
-msgstr "Beim Abrufen der Freigabedaten ist ein Fehler aufgetreten"
+msgstr "Es trat ein Fehler auf bei dem Versuch, Daten von dem Prozess zu erhalten"
#: ../udshttp/udshttp.cpp:270
msgid "Timeout on server"
-msgstr ""
+msgstr "Zeitüberschreitung am Server"
#: ../udshttp/udshttp.cpp:285
msgid "Bad url"
-msgstr ""
+msgstr "Falsche Adresse"
#: ../udshttp/udshttp.cpp:392
-#, fuzzy
msgid "Unauthorized access"
msgstr "Nicht autorisiert"
#: ../udshttp/udshttp.cpp:395 ../udshttp/udshttp.cpp:397
-#, fuzzy
msgid "URL Invalid"
-msgstr "Ungültige URL"
+msgstr "Ungültige Adresse"
#: ../udshttp/udshttp.cpp:400
-#, fuzzy
msgid "Server Error"
-msgstr "Server\n"
+msgstr "Server-Fehler"
#: ../udshttp/udshttp.cpp:403
-#, fuzzy
msgid "Service unavailable"
-msgstr "Hilfe nicht verfügbar"
+msgstr "Dienst nicht verfügbar"
#: ../kxmlrpcclient/kxmlrpcquery.cpp:131
msgid "Received invalid XML markup: %1 at %2:%3"
-msgstr ""
+msgstr "Ungültiges XML-Markup: %1 bei %2:%3"
#: ../kxmlrpcclient/kxmlrpcquery.cpp:141
msgid "Unknown type of XML markup received"
-msgstr ""
-
-#~ msgid "Close"
-#~ msgstr "SchlieÃen"
-
-#~ msgid "Form1"
-#~ msgstr "Formular1"
-
-#, fuzzy
-#~ msgid "Show recurring notification every "
-#~ msgstr "Zeigt das Benachrichtungsfeld-Symbol an"
-
-#, fuzzy
-#~ msgid " Minutes when updates are available"
-#~ msgstr "Keine Aktualisierungen verfügbar."
-
-#~ msgid "Alt+T"
-#~ msgstr "Alt+T"
-
-#~ msgid "Alt+U"
-#~ msgstr "Alt+U"
-
-#, fuzzy
-#~ msgid "Details ..."
-#~ msgstr "&Details"
-
-#~ msgid "<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>"
-#~ msgstr "<b>Verfügbare Aktualisierungen:</b><br> Folgende Software-Upgrades und -Patches enthalten zusätzliche Funktionen und beheben Fehler.<br>"
-
-#, fuzzy
-#~ msgid "The following are software patches to fix bugs."
-#~ msgstr "Die folgenden Ressourcen sind modifiziert"
-
-#, fuzzy
-#~ msgid "Size"
-#~ msgstr "GröÃe:"
-
-#, fuzzy
-#~ msgid "<b>For experts only!</b><br>The following are software upgrades to add features."
-#~ msgstr "<b>Verfügbare Aktualisierungen:</b><br> Folgende Software-Upgrades und -Patches enthalten zusätzliche Funktionen und beheben Fehler.<br>"
-
-#~ msgid "Security"
-#~ msgstr "Sicherheit"
-
-#~ msgid "General"
-#~ msgstr "Allgemein"
-
-#~ msgid " Update Available"
-#~ msgstr " Aktualisierung verfügbar"
-
-#~ msgid " Important Update Available"
-#~ msgstr " Wichtige Aktualisierung verfügbar"
-
-#~ msgid " Important Updates Available"
-#~ msgstr " Wichtige Aktualisierung verfügbar"
-
-#~ msgid ""
-#~ "_: NAME OF TRANSLATORS\n"
-#~ "Your names"
-#~ msgstr ""
-#~ "_: NAME DER ÃBERSETZER\n"
-#~ "Ihre Namen"
-
-#~ msgid ""
-#~ "_: EMAIL OF TRANSLATORS\n"
-#~ "Your emails"
-#~ msgstr ""
-#~ "_: E-MAIL-ADRESSE DER ÃBERSETZTER\n"
-#~ "Ihre E-Mail-Adressen"
-
-#~ msgid "Get Updates Via"
-#~ msgstr "Aktualisierungen abrufen über"
-
-#~ msgid "Novell ZENWorks"
-#~ msgstr "Novell ZENWorks"
+msgstr "Unbekannter XML Markup-Typ"
-#~ msgid "Width of the main window."
-#~ msgstr "Breite des Hauptfensters."
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7256 - in /trunk/libzypp: package/libzypp.changes zypp/parser/susetags/PackagesDuFileReader.cc zypp/zypp_detail/ZYppImpl.cc
by lslezak＠svn.opensuse.org 17 Sep '07
by lslezak＠svn.opensuse.org 17 Sep '07
17 Sep '07
Author: lslezak
Date: Mon Sep 17 12:38:25 2007
New Revision: 7256
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7256&view=rev
Log:
- fixed DU parsing in inst-sys (#308659)
- revision 7256
Modified:
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc
trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 17 12:38:25 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 17 12:36:28 CEST 2007 - lslezak(a)suse.cz
+
+- fixed DU parsing in inst-sys (#308659)
+- revision 7256
+
+-------------------------------------------------------------------
Fri Sep 14 22:57:54 CEST 2007 - ma(a)suse.de
- Enable using patch and delta rpms. (#309124)
Modified: trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/Pac…
==============================================================================
--- trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc (original)
+++ trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc Mon Sep 17 12:38:25 2007
@@ -10,6 +10,7 @@
*
*/
#include <iostream>
+#include <cstdlib>
#include "zypp/base/Easy.h"
#include "zypp/base/Regex.h"
#include "zypp/base/Logger.h"
@@ -133,7 +134,8 @@
str::strtonum<unsigned>(what[2]) + str::strtonum<unsigned>(what[3]),
str::strtonum<unsigned>(what[4]) + str::strtonum<unsigned>(what[5]) );
- if ( _mounts.empty() )
+ // the partitioning is not known or we are running in instsys (see #308659)
+ if ( _mounts.empty() || (getenv("YAST_IS_RUNNING") && (std::string(getenv("YAST_IS_RUNNING")) == "instsys" )))
{
// if no mount information, cut off deeper directory
// levels in DiskUsage::Entry to reduce data size.
Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImp…
==============================================================================
--- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original)
+++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Mon Sep 17 12:38:25 2007
@@ -198,7 +198,7 @@
if (_disk_usage)
return _disk_usage->getMountPoints();
else
- return DiskUsageCounter::MountPointSet();
+ return DiskUsageCounter::detectMountPoints();
}
//------------------------------------------------------------------------
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
15 Sep '07
Author: jkupec
Date: Sat Sep 15 19:28:03 2007
New Revision: 7255
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7255&view=rev
Log:
- german and slovak translation
Added:
trunk/zypper/po/de.po
Modified:
trunk/zypper/po/sk.po
Added: trunk/zypper/po/de.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/de.po?rev=7255&view=au…
==============================================================================
--- trunk/zypper/po/de.po (added)
+++ trunk/zypper/po/de.po Sat Sep 15 19:28:03 2007
@@ -0,0 +1,1727 @@
+# translation of zypper.de.po to
+# @TITLE@
+# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
+#
+# This file is distributed under the same license as @PACKAGE@ package. FIRST
+#
+# Lars Vogdt <lrupp(a)suse.de>, 2007.
+# Stephan Kulow <coolo(a)kde.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: zypper.de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
+"PO-Revision-Date: 2007-09-15 18:01+0200\n"
+"Last-Translator: Stephan Kulow <coolo(a)kde.org>\n"
+"Language-Team: <en(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../src/zypper-keyring-callbacks.h:40
+#, c-format
+msgid "Warning: Accepting an unsigned file %s."
+msgstr "Warnung: Sie akzeptieren eine unsignierte Datei %s."
+
+#: ../src/zypper-keyring-callbacks.h:46
+#, c-format
+msgid "%s is unsigned, continue?"
+msgstr "%s ist nicht signiert. Trotzdem fortfahren?"
+
+#: ../src/zypper-keyring-callbacks.h:56
+#, c-format
+msgid "Import key %s to trusted keyring?"
+msgstr "Schlüssel %s zu den vertrauenswürdigen Schlüsseln hinzufügen?"
+
+#: ../src/zypper-keyring-callbacks.h:66
+#, c-format
+msgid "Warning: Accepting file %s signed with an unknown key %s."
+msgstr "Warnung: Datei %s, signiert mit dem unbekannten Schlüssel %s, wird akzeptiert."
+
+#: ../src/zypper-keyring-callbacks.h:73
+#, c-format
+msgid "%s is signed with an unknown key %s. Continue?"
+msgstr "%s ist mit dem unbekanntem Schlüssel %s signiert. Trotzdem fortfahren?"
+
+#: ../src/zypper-keyring-callbacks.h:87
+#, c-format
+msgid "Automatically trusting key id %s, %s, fingerprint %s"
+msgstr "Vertraue Schlüssel %s, %s, mit Fingerabdruck %s automatisch"
+
+#: ../src/zypper-keyring-callbacks.h:93
+#, c-format
+msgid "Do you want to trust key id %s, %s, fingerprint %s"
+msgstr "Möchten Sie diesem Schlüssel %s, %s, Fingerabdruck %s vertrauen?"
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Warnung: die Signatur für %s konnte nicht mit dem Schlüssel %s, %s, Fingerabdruck %s verifiziert werden!"
+
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Ãberprüfen sie zweimal, dass dies nicht durch eine boshafte Ãnderung in der Datei ausgelöst wurde!"
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Ãberprüfung fehlgeschlagen für %s mit Schlüssel %s, %s, Fingerabdruck %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "Warnung: Dies kann durch eine boshafte Ãnderung in der Datei ausgelöst worden sein!"
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Fortfahren ist mit Risiko verbunden! Trotzdem fortfahren?"
+
+#: ../src/zypper-keyring-callbacks.h:136
+#, c-format
+msgid "No digest for file %s."
+msgstr "Keine Zusammenfassung für die Datei %s."
+
+# internal key used: Ok
+# internal key used: Ok
+#. there are resolvables to install/uninstall
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
+msgid "Continue?"
+msgstr "Fortfahren?"
+
+#: ../src/zypper-keyring-callbacks.h:143
+#, c-format
+msgid "Unknown digest %s for file %s."
+msgstr "Unbekannte Zusammenfassung %s für die Datei %s."
+
+#: ../src/zypper-keyring-callbacks.h:156
+#, c-format
+msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
+msgstr "Ignoriere fehlgeschlagene Ãberprüfung für %s (erwartet wurde %s, gefunden wurde %s)."
+
+#: ../src/zypper-keyring-callbacks.h:162
+#, c-format
+msgid "Digest verification failed for %s. Expected %s, found %s."
+msgstr "Ãberprüfung fehlgeschlagen für %s. Erwartet wurde %s, gefunden wurde %s."
+
+#: ../src/zypper-misc.cc:42
+msgid "Initializing Target"
+msgstr "Ziel wird initialisiert"
+
+#: ../src/zypper-misc.cc:83
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "Paket"
+msgstr[1] "Paket"
+
+#: ../src/zypper-misc.cc:85
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "Auswahl"
+msgstr[1] "Auswahl"
+
+#: ../src/zypper-misc.cc:87
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "Schema"
+msgstr[1] "Schema"
+
+#: ../src/zypper-misc.cc:89
+msgid "product"
+msgid_plural "product"
+msgstr[0] "Produkt"
+msgstr[1] "Produkt"
+
+#: ../src/zypper-misc.cc:91
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "Patch"
+msgstr[1] "Patch"
+
+#: ../src/zypper-misc.cc:93
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "Skript"
+msgstr[1] "Skript"
+
+#: ../src/zypper-misc.cc:95
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "Meldung"
+msgstr[1] "Meldung"
+
+#: ../src/zypper-misc.cc:97
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "Sprache"
+msgstr[1] "Sprache: "
+
+#: ../src/zypper-misc.cc:99
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "Atom"
+msgstr[1] "atom"
+
+#: ../src/zypper-misc.cc:101
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "System"
+msgstr[1] "System"
+
+#: ../src/zypper-misc.cc:103
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "Quellpaket"
+msgstr[1] "Verwende Paket %s"
+
+#. default
+#: ../src/zypper-misc.cc:105
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Objekt"
+msgstr[1] "Auflösbar"
+
+#: ../src/zypper-misc.cc:271
+#, c-format
+msgid "Cannot parse capability '%s'."
+msgstr "Fähigkeit '%s' kann nicht analysiert werden."
+
+#. TranslatorExplanation e.g. "package 'pornview' not found"
+#: ../src/zypper-misc.cc:295
+#, c-format
+msgid "%s '%s' not found"
+msgstr "%s '%s' nicht gefunden"
+
+#: ../src/zypper-misc.cc:304
+#, c-format
+msgid "skipping %s '%s' (already installed)"
+msgstr "%s '%s' wird übersprungen: bereits installiert"
+
+#: ../src/zypper-misc.cc:310
+#, c-format
+msgid "Failed to add '%s' to the list of packages to be installed."
+msgstr "'%s' konnte nicht zur Liste der zu installierenden Pakete hinzugefügt werden."
+
+#: ../src/zypper-misc.cc:330
+#, c-format
+msgid "Failed to add '%s' to the list of packages to be removed."
+msgstr "'%s' konnte nicht zur Liste der zu entfernenden Pakete hinzugefügt werden."
+
+#. TranslatorExplanation These are reasons for various failures.
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
+msgid "Not found"
+msgstr "Nicht gefunden"
+
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
+msgid "Problem: "
+msgstr "Problem: "
+
+#. TranslatorExplanation %d is the solution number
+#: ../src/zypper-misc.cc:435
+#, c-format
+msgid " Solution %d: "
+msgstr "Lösung %d: "
+
+#. input prompt
+#: ../src/zypper-misc.cc:450
+msgid "number, (r)etry or (c)ancel> "
+msgstr "zahl, (w)iederholen oder (a)bbrechen> "
+
+#. translators: corresponds to (r)etry
+#: ../src/zypper-misc.cc:461
+msgid "r"
+msgstr "w"
+
+#. translators: corresponds to (c)ancel
+#: ../src/zypper-misc.cc:464
+msgid "c"
+msgstr "a"
+
+#: ../src/zypper-misc.cc:470
+#, c-format
+msgid "Applying solution %s"
+msgstr "Wende Lösung %s an"
+
+#: ../src/zypper-misc.cc:494
+#, c-format
+msgid "%s Problems:"
+msgstr "%s Probleme:"
+
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
+msgid "Specified capability not found"
+msgstr "Angegebene Fähigkeit nicht gefunden."
+
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
+msgid "Nothing to do."
+msgstr "Keine auszuführenden Aktionen."
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "%s wird installiert (neu):"
+msgstr[1] "%s werden installiert (neu):"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
+#, c-format
+msgid "Overall download size: %s."
+msgstr "GesamtgröÃe des Downloads: %s."
+
+#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
+#: ../src/zypper-misc.cc:767
+#, c-format
+msgid "After the operation, additional %s will be used."
+msgstr ""
+
+#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
+#: ../src/zypper-misc.cc:779
+#, c-format
+msgid "After the operation, %s will be freed."
+msgstr "Nach dem Vorgang wird %s freigegeben."
+
+#: ../src/zypper-misc.cc:827
+#, c-format
+msgid "%s items locked"
+msgstr ""
+
+#: ../src/zypper-misc.cc:828
+msgid "Establishing status of aggregates"
+msgstr "Der Status der Aggregate wird festgestellt"
+
+#: ../src/zypper-misc.cc:836
+msgid "Resolving dependencies..."
+msgstr "Abhängigkeiten werden aufgelöst..."
+
+#: ../src/zypper-misc.cc:862
+#, c-format
+msgid "%d patches needed (%d security patches)"
+msgstr "%d Patches verfügbar (davon %d Sicherheitspatches)"
+
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
+msgid "Installed"
+msgstr "installiert"
+
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
+msgid "Uninstalled"
+msgstr "deinstalliert"
+
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
+msgid "No Longer Applicable"
+msgstr "Nicht mehr zutreffend"
+
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
+msgid "Not Applicable"
+msgstr "Nicht anwendbar"
+
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
+msgid "Applied"
+msgstr "Angewendet"
+
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
+msgid "Not Needed"
+msgstr "Nicht benötigt"
+
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
+msgid "Broken"
+msgstr "Defekt"
+
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
+msgid "Needed"
+msgstr "Benötigt"
+
+#. if ResStatus interface changes
+#: ../src/zypper-misc.cc:879
+msgid "error"
+msgstr "Fehler"
+
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
+msgid "Catalog: "
+msgstr "Katalog: "
+
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
+msgid "Repository: "
+msgstr "Repository: "
+
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
+msgid "Name"
+msgstr "Name"
+
+#. best_effort does not know version or arch yet
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
+msgid "Version"
+msgstr "Version"
+
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+msgid "Category"
+msgstr "Kategorie"
+
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-sources.cc:316
+msgid "Status"
+msgstr "Status"
+
+#: ../src/zypper-misc.cc:935
+msgid "No needed patches found."
+msgstr "Keine benötigten Patches gefunden."
+
+#: ../src/zypper-misc.cc:1063
+msgid ""
+"WARNING: These are only the updates affecting the updater itself.\n"
+"There are others available too.\n"
+msgstr ""
+"WARNUNG: Dies sind nur die Aktualisierungen für das Aktualisierungsprogramm selbst.\n"
+"Es sind zusätzlich weitere Aktualisierungen vorhanden.\n"
+
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
+msgid "No updates found."
+msgstr "Keine Updates gefunden."
+
+#. TranslatorExplanation S stands for Status
+#. TranslatorExplanation S as Status
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
+msgid "S"
+msgstr "S"
+
+#. TranslatorExplanation This is Bundle in as used in rug.
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
+msgid "Bundle"
+msgstr "Bundle"
+
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
+msgid "Arch"
+msgstr "Architektur"
+
+#. Skipping a patch because it is interactive and
+#. --skip-interactive is requested. %s is a name of a
+#. patch
+#: ../src/zypper-misc.cc:1343
+#, c-format
+msgid "WARNING: %s is interactive, skipped."
+msgstr "WARNUNG: %s benötigt Benutzer-Interaktion, übersprungen."
+
+#: ../src/zypper-misc.cc:1406
+msgid "committing"
+msgstr "speichern"
+
+#: ../src/zypper-misc.cc:1421
+msgid "Problem downloading the package file from the repository:"
+msgstr "Problem beim Laden von Daten von:"
+
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr ""
+
+#: ../src/zypper-misc.cc:1432
+#, fuzzy
+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 ""
+"Prüfung der Paketintegrität fehlgeschlagen. Dies kann ein Problem mit dem Repository oder dem Installationsmedium sein. Versuchen Sie eine der folgenden MaÃnahmen:\n"
+" \n"
+" â Führen Sie das letzte Kommando erneut durch\n"
+" â Aktualisieren Sie das Repository mit 'zypper refresh'\n"
+" â Verwenden Sie ein anderes Installationsmedium (beispielsweise bei Beschädigung)\n"
+" â Verwenden Sie ein anderes Repository"
+
+#: ../src/zypper-misc.cc:1452
+#, fuzzy
+msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
+msgstr "WARNUNG: Für einen der installierten Patches muss Ihr Computer neu gestartet werden. Führen Sie dies so bald wie möglich durch."
+
+#: ../src/zypper-misc.cc:1455
+#, fuzzy
+msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
+msgstr "WARNUNG: Für einen der installierten Patches muss Ihr Computer neu gestartet werden. Führen Sie dies so bald wie möglich durch."
+
+#: ../src/zypper-misc.cc:1461
+#, fuzzy
+msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
+msgstr "WARNUNG: Einer der installierten Patches betrifft den Paketmanager selbst, weshalb vor den nächsten Vorgängen ein Neustart des Paketmanagers durchgeführt werden muss."
+
+#: ../src/zypper-misc.cc:1487
+#, c-format
+msgid "Automatically agreeing with %s %s license."
+msgstr "Stimme der Lizenz %s für %s automatisch zu."
+
+#: ../src/zypper-misc.cc:1498
+#, fuzzy, c-format
+msgid "%s %s license:"
+msgstr "Lizenz"
+
+#: ../src/zypper-misc.cc:1502
+msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
+msgstr "Um dieses Paket installieren zu können, müssen Sie den Bedingungen der obigen Lizenz zustimmen. Fortfahren?"
+
+#: ../src/zypper-misc.cc:1513
+#, fuzzy
+msgid "Aborting installation due to the need for license(s) confirmation."
+msgstr "Die Installation wird abgebrochen, da die Lizenz(en) bestätigt werden müssen."
+
+#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
+#. it is a command line option
+#: ../src/zypper-misc.cc:1517
+#, fuzzy
+msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
+msgstr "Starten Sie den Vorgang im interaktiven Modus neu und bestätigen Sie, dass Sie den angegebenen Lizenzen zustimmen."
+
+#: ../src/zypper-misc.cc:1528
+#, fuzzy, c-format
+msgid "Aborting installation due to user disagreement with %s %s license."
+msgstr "Die Installation wird abgebrochen, da der Benutzer nicht zustimmt zu "
+
+#: ../src/zypper-misc.cc:1598
+#, fuzzy, c-format
+msgid "Installing source package %s-%s"
+msgstr "Installiere Pakete"
+
+#: ../src/zypper-misc.cc:1606
+#, fuzzy, c-format
+msgid "Source package %s-%s successfully installed."
+msgstr "Kernel-Paket %s ist nicht installiert"
+
+#: ../src/zypper-misc.cc:1612
+#, fuzzy, c-format
+msgid "Problem installing source package %s-%s:"
+msgstr "Installiere Pakete"
+
+#: ../src/zypper-misc.cc:1620
+#, fuzzy, c-format
+msgid "Source package '%s' not found."
+msgstr "Quelle %s nicht gefunden."
+
+#: ../src/zypper-sources.cc:52
+#, fuzzy, c-format
+msgid "Checking whether to refresh metadata for %s"
+msgstr "Ãberprüfe, ob die Meta-Daten für %s erneuert werden müssen."
+
+#: ../src/zypper-sources.cc:61
+#, fuzzy, c-format
+msgid "Refreshing '%s'"
+msgstr "Aktualisiere"
+
+#: ../src/zypper-sources.cc:63
+msgid "(forced)"
+msgstr "(erzwungen)"
+
+#: ../src/zypper-sources.cc:68
+#, fuzzy, c-format
+msgid "Repository '%s' is up to date."
+msgstr "Repository %s nicht gefunden."
+
+#: ../src/zypper-sources.cc:80
+#, fuzzy
+msgid "Forcing raw metadata refresh"
+msgstr "Metadaten werden analysiert für"
+
+#: ../src/zypper-sources.cc:88
+#, fuzzy, c-format
+msgid "Problem downloading files from '%s'."
+msgstr "Problem beim Laden von Daten von '%s'"
+
+#: ../src/zypper-sources.cc:96
+#, fuzzy, c-format
+msgid "No URLs defined for '%s'."
+msgstr "%s: Zwei SubDomains für '%s' definiert.\n"
+
+#. TranslatorExplanation the first %s is a .repo file path
+#: ../src/zypper-sources.cc:100
+#, c-format
+msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
+msgstr "Bitte, fügen Sie eine oder mehrere Einträge für Basis URLs (baseurl=URL) in %s im Repository '%s'."
+
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
+msgid "No alias defined this repository."
+msgstr "Kein Alias definiert für dieses Repository."
+
+#: ../src/zypper-sources.cc:117
+#, fuzzy, c-format
+msgid "Repository '%s' is invalid."
+msgstr "Repository %s nicht gefunden."
+
+#: ../src/zypper-sources.cc:118
+msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
+msgstr ""
+
+#: ../src/zypper-sources.cc:126
+#, fuzzy, c-format
+msgid "Error downloading metadata for '%s':"
+msgstr "Problem beim Laden von Daten von '%s'"
+
+#: ../src/zypper-sources.cc:153
+#, fuzzy
+msgid "Forcing building of repository cache"
+msgstr "Erzeuge Repository Zwischenspeicher..."
+
+#: ../src/zypper-sources.cc:166
+#, fuzzy, c-format
+msgid "Error parsing metadata for '%s':"
+msgstr "Metadaten werden analysiert für"
+
+#. TranslatorExplanation Don't translate the URL unless it is translated, too
+#: ../src/zypper-sources.cc:168
+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 folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
+msgstr ""
+
+#: ../src/zypper-sources.cc:182
+#, fuzzy, c-format
+msgid "Repository metadata for '%s' not found in local cache."
+msgstr "Repository %s nicht gefunden."
+
+#: ../src/zypper-sources.cc:190
+#, fuzzy
+msgid "Error building the cache database:"
+msgstr "Fehler beim Neuaufbau der iPod-Datenbank"
+
+#: ../src/zypper-sources.cc:222
+#, fuzzy, c-format
+msgid "Repository '%s' not found."
+msgstr "Repository %s nicht gefunden."
+
+#: ../src/zypper-sources.cc:228
+#, fuzzy, c-format
+msgid "Error reading repository description file for '%s'."
+msgstr "Fehler beim Lesen von Repository '%s':"
+
+#: ../src/zypper-sources.cc:230
+#, fuzzy
+msgid "Reason: "
+msgstr "Version : "
+
+#: ../src/zypper-sources.cc:257
+#, fuzzy, c-format
+msgid "Disabling repository '%s' because of the above error."
+msgstr "Ãberspringe Repository '%s' Aufgrund des obigen Fehlers."
+
+#: ../src/zypper-sources.cc:275
+#, c-format
+msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
+msgstr ""
+
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
+msgid "Type"
+msgstr "Typ"
+
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/zypper-sources.cc:333
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
+#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
+#: ../src/zypper-info.cc:168
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
+#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
+#: ../src/zypper-info.cc:168
+msgid "No"
+msgstr "Nein"
+
+#: ../src/zypper-sources.cc:391
+#, fuzzy
+msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
+msgstr "Keine Repositories definiert. Rufen Sie 'zypper addrepo' auf um Repositories hinzuzufügen."
+
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
+msgid "Error reading repositories:"
+msgstr "Fehler beim Lesen von Repositories: "
+
+#: ../src/zypper-sources.cc:446
+#, c-format
+msgid "Can't open %s for writing. Maybe you don't have write permissions?"
+msgstr ""
+
+#: ../src/zypper-sources.cc:454
+#, fuzzy, c-format
+msgid "Repositories have been successfully exported to %s."
+msgstr "Repository %s wurde erfolgreich geändert."
+
+#: ../src/zypper-sources.cc:551
+#, c-format
+msgid "Skipping disabled repository '%s'"
+msgstr "Ãberspringe deaktiviertes Repository '%s'"
+
+#: ../src/zypper-sources.cc:587
+#, c-format
+msgid "Skipping repository '%s' because of the above error."
+msgstr "Ãberspringe Repository '%s' Aufgrund des obigen Fehlers."
+
+#: ../src/zypper-sources.cc:600
+#, fuzzy, c-format
+msgid "Repository '%s' not found by its alias or number."
+msgstr "Repository nicht über angegebenen Alias oder URL gefunden."
+
+#: ../src/zypper-sources.cc:605
+msgid "Use 'zypper repos' to get the list of defined repositories."
+msgstr ""
+
+#: ../src/zypper-sources.cc:612
+msgid "Specified repositories are not enabled or defined."
+msgstr ""
+
+#: ../src/zypper-sources.cc:614
+#, fuzzy
+msgid "There are no enabled repositories defined."
+msgstr "Es sind keine installierbaren Anbieter von %s verfügbar"
+
+#: ../src/zypper-sources.cc:617
+#, fuzzy
+msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
+msgstr "Keine Repositories definiert. Rufen Sie 'zypper addrepo' auf um Repositories hinzuzufügen."
+
+#: ../src/zypper-sources.cc:621
+msgid "Could not refresh the repositories because of errors."
+msgstr "Konnte aufgrund von Fehlern die Repositories nicht aktualisieren."
+
+#: ../src/zypper-sources.cc:623
+#, fuzzy
+msgid "Some of the repositories have not been refreshed because of an error."
+msgstr "Einige Repositories konnten aufgrund von Fehlern nicht aktualisiert werden."
+
+#: ../src/zypper-sources.cc:625
+#, fuzzy
+msgid "Specified repositories have been refreshed."
+msgstr "Alle Repositories wurden aktualisiert."
+
+#: ../src/zypper-sources.cc:627
+msgid "All repositories have been refreshed."
+msgstr "Alle Repositories wurden aktualisiert."
+
+#: ../src/zypper-sources.cc:667
+msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
+msgstr ""
+
+#: ../src/zypper-sources.cc:685
+#, fuzzy, c-format
+msgid "Repository named '%s' already exists. Please, use another alias."
+msgstr "Eine Wiedergabeliste mit diesem Namen existiert bereits. Bitte wählen Sie einen anderen Namen."
+
+#: ../src/zypper-sources.cc:693
+msgid "Can't find a valid repository at given location:"
+msgstr ""
+
+#: ../src/zypper-sources.cc:694
+msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
+msgstr ""
+
+#: ../src/zypper-sources.cc:705
+#, fuzzy
+msgid "Problem transferring repository data from specified URL:"
+msgstr "Fehler beim Ãbertragen der Repository-Daten von der angegebenen URL."
+
+#: ../src/zypper-sources.cc:706
+msgid "Please, check whether the specified URL is accessible."
+msgstr ""
+
+#: ../src/zypper-sources.cc:713
+#, fuzzy
+msgid "Unknown problem when adding repository:"
+msgstr "Problem bei der Analyse der Repository Daten."
+
+#: ../src/zypper-sources.cc:717
+#, fuzzy, c-format
+msgid "Repository '%s' successfully added"
+msgstr "Repository '%s' erfolgreich hinzugefügt:"
+
+#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
+#: ../src/zypper-sources.cc:732
+#, fuzzy
+msgid "Autorefresh"
+msgstr "Automatische Aktualisierung"
+
+#: ../src/zypper-sources.cc:740
+#, fuzzy, c-format
+msgid "Reading data from '%s' media"
+msgstr "Problem beim Laden von Daten von '%s'"
+
+#: ../src/zypper-sources.cc:746
+#, fuzzy, c-format
+msgid "Problem reading data from '%s' media"
+msgstr "Problem beim Laden von Daten von '%s'"
+
+#: ../src/zypper-sources.cc:747
+msgid "Please, check if your installation media is valid and readable."
+msgstr ""
+
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Fehler beim Ãbertragen der Repository-Daten von der angegebenen URL."
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr ""
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Fehler beim Ãbertragen der Repository-Daten von der angegebenen URL."
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
+#, c-format
+msgid "Repository %s has been removed."
+msgstr "Repository %s wurde entfernt."
+
+#: ../src/zypper-sources.cc:922
+#, c-format
+msgid "Repository %s renamed to %s"
+msgstr "Repository %s wurde unbenannt in %s"
+
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
+#, c-format
+msgid "Repository %s not found."
+msgstr "Repository %s nicht gefunden."
+
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
+msgid "Error while modifying the repository:"
+msgstr "Fehler beim Ãndern des Repositories:"
+
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
+#, c-format
+msgid "Leaving repository %s unchanged."
+msgstr "Nehme keine Ãnderungen an Repository %s vor."
+
+#: ../src/zypper-sources.cc:948
+#, c-format
+msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
+msgstr "%s wird zusammen mit %s genutzt, welche sich gegenseitig aufheben. Die Einstellung wird nicht geändert."
+
+#: ../src/zypper-sources.cc:999
+#, c-format
+msgid "Repository %s has been sucessfully modified."
+msgstr "Repository %s wurde erfolgreich geändert."
+
+#: ../src/zypper-sources.cc:1047
+#, fuzzy, c-format
+msgid "Retrieving repository '%s' data..."
+msgstr "Lese Inhalt des Repositories %s ..."
+
+#: ../src/zypper-sources.cc:1054
+#, c-format
+msgid "Repository '%s' not cached. Caching..."
+msgstr "Inhalt des Repositories '%s' ist nicht im Zwischenspeicher. Empfange..."
+
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
+#, c-format
+msgid "Problem loading data from '%s'"
+msgstr "Problem beim Laden von Daten von '%s'"
+
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
+#, c-format
+msgid "Resolvables from '%s' not loaded because of error."
+msgstr "Mögliche Abhängigkeiten von '%s' werden aufgrund eines Fehlers nicht berücksichtigt."
+
+#: ../src/zypper-sources.cc:1069
+#, c-format
+msgid "(%d resolvables found)"
+msgstr "(%d auflösbare Abhängigkeiten gefunden)"
+
+#: ../src/zypper-sources.cc:1081
+msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
+msgstr ""
+
+#: ../src/zypper-sources.cc:1093
+msgid "Reading RPM database..."
+msgstr "RPM-Datenbank wird analysiert..."
+
+#: ../src/zypper-sources.cc:1100
+#, c-format
+msgid "(%s resolvables)"
+msgstr "(%s auflösbare Abhängigkeiten)"
+
+#. list name, exact match
+#: ../src/zypper-sources.cc:1188
+msgid ""
+"ZENworks Management Daemon is running.\n"
+"WARNING: this command will not synchronize changes.\n"
+"Use rug or yast2 for that.\n"
+msgstr ""
+"Der ZENworks Management Daemon läuft.\n"
+"WARNUNG: Dieses Kommando synchronisiert Veränderungen nicht.\n"
+"Benutzen Sie dafür rug oder yast2.\n"
+
+#: ../src/zypp-checkpatches.cc:125
+#, fuzzy
+msgid "The updater could not access the package manager engine. This usually happens when you have another application (like YaST) using it at the same time. Please close the other applications and check again for updates."
+msgstr "Das Aktualisierungsprogramm konnte nicht auf die Paketmanager-Engine zugreifen. Dies tritt in der Regel auf, wenn eine andere Anwendung (wie YaST) zum gleichen Zeitpunkt auf sie zugreift. SchlieÃen Sie andere Anwendungen und führen Sie erneut eine Ãberprüfung auf Aktualisierungen durch."
+
+#: ../src/zypp-checkpatches.cc:185
+#, c-format
+msgid ""
+"Couldn't restore repository.\n"
+"Detail: %s"
+msgstr ""
+"Das Repository konnte nicht wiederhergestellt werden.\n"
+"Details: %s"
+
+#: ../src/zypp-checkpatches.cc:235
+msgid "There are no update repositories defined. Please add one or more update repositories in order to be notified of updates."
+msgstr "Es wurden keine Update Repositories definiert. Bitte fügen Sie ein oder mehrere Update Repositories hinzu um über Updates informiert zu werden."
+
+#. TranslatorExplanation don't translate letters in parentheses!! (yet)
+#: ../src/zypper-callbacks.cc:83
+msgid "(A)bort, (R)etry, (I)gnore?"
+msgstr "(A)bbrechen, E(r)neut versuchen, (I)gnorieren?"
+
+#: ../src/zypper-callbacks.cc:117
+msgid "Invalid answer. Choose letter a, r, or i."
+msgstr "Falsche Antwort. Wählen Sie 'a', 'r' oder 'i' aus."
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "ja"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "nein"
+
+#. 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/zypper-callbacks.cc:152
+#, c-format
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
+
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "Zu viele Argumente."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "Osage-Sprache"
+
+#: ../src/zypper-getopt.cc:56
+msgid "Unknown option "
+msgstr "Unbekannte Option"
+
+#: ../src/zypper-getopt.cc:59
+msgid "Missing argument for "
+msgstr "Fehlendes Argument für"
+
+#. TranslatorExplanation E.g. "package zypper not found."
+#: ../src/zypper-info.cc:52
+#, c-format
+msgid "%s %s not found."
+msgstr "%s %s nicht gefunden."
+
+#. print info
+#. TranslatorExplanation E.g. "Information for package zypper:"
+#: ../src/zypper-info.cc:58
+#, c-format
+msgid "Information for %s %s:"
+msgstr "Informationen für %s %s:"
+
+#: ../src/zypper-info.cc:94 ../src/zypper-info.cc:141
+msgid "Name: "
+msgstr "Name : "
+
+#: ../src/zypper-info.cc:95 ../src/zypper-info.cc:142
+msgid "Version: "
+msgstr "Version : "
+
+#: ../src/zypper-info.cc:96 ../src/zypper-info.cc:143
+msgid "Arch: "
+msgstr "Architektur : "
+
+#: ../src/zypper-info.cc:97
+msgid "Installed: "
+msgstr "Installiert : "
+
+#: ../src/zypper-info.cc:99 ../src/zypper-info.cc:145
+msgid "Status: "
+msgstr "Status : "
+
+#: ../src/zypper-info.cc:102
+msgid "up-to-date"
+msgstr "aktuell"
+
+#: ../src/zypper-info.cc:104
+msgid "out-of-date (version "
+msgstr "veraltet (Version "
+
+#: ../src/zypper-info.cc:105
+msgid " installed) "
+msgstr " installiert)"
+
+#: ../src/zypper-info.cc:108
+msgid "not installed"
+msgstr "Nicht installiert"
+
+#: ../src/zypper-info.cc:110
+msgid "Installed Size: "
+msgstr "GröÃe (installiert): "
+
+#: ../src/zypper-info.cc:111 ../src/zypper-info.cc:169
+msgid "Summary: "
+msgstr "Zusammenfassung : "
+
+#: ../src/zypper-info.cc:112 ../src/zypper-info.cc:170
+msgid "Description: "
+msgstr "Beschreibung : "
+
+#: ../src/zypper-info.cc:158
+msgid "Category: "
+msgstr "Kategorie : "
+
+#: ../src/zypper-info.cc:159
+msgid "Created On: "
+msgstr "Erstellt am :"
+
+#: ../src/zypper-info.cc:160
+msgid "Reboot Required: "
+msgstr "Reboot erforderlich:"
+
+#: ../src/zypper-info.cc:163
+msgid "Package Manager Restart Required"
+msgstr "Neustart des Paket Managers erforderlich: "
+
+#: ../src/zypper-info.cc:165
+msgid "Restart Required: "
+msgstr "Neustart des Rechners erforderlich: "
+
+#: ../src/zypper-info.cc:168
+msgid "Interactive: "
+msgstr "Interaktiv : "
+
+#: ../src/zypper-info.cc:172
+msgid "Provides:"
+msgstr "Bietet : "
+
+#: ../src/zypper-info.cc:178
+msgid "Requires:"
+msgstr "Benötigt : "
+
+#: ../src/zypper-search.cc:85
+#, fuzzy
+msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
+msgstr "Keine Repositories konfiguriert. Bitte fügen Sie zunächst mindestens ein Repository mit dem Kommando 'zypper addrepo' hinzu, bevor Sie die Suche benutzen."
+
+#: ../src/zypper-search.cc:232
+msgid "Pre-caching installed resolvables matching given search criteria... "
+msgstr "Precaching von installierten auflösbaren Elementen, die den Suchkriterien entsprechen..."
+
+#: ../src/zypper-search.cc:242
+msgid " out of ("
+msgstr " von ("
+
+#: ../src/zypper-search.cc:243
+msgid "cached."
+msgstr "im Cache gespeichert."
+
+#: ../src/zypper-search.cc:344
+msgid " is not a valid regular expression: \""
+msgstr "ist kein gültiger regulärer Ausdruck: \""
+
+#: ../src/zypper-search.cc:346
+msgid "This is a bug, please file a bug report against zypper."
+msgstr "Dies ist ein Programmfehler; erstellen Sie einen Fehlerbericht über Zypper."
+
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
+msgid "Given URL is invalid."
+msgstr "Ungültige URL."
+
+#: ../src/zypper.cc:84
+#, fuzzy
+msgid ""
+" Commands:\n"
+"\thelp, ?\t\t\tHelp\n"
+"\tshell, sh\t\tAccept multiple commands at once\n"
+"\tinstall, in\t\tInstall packages or resolvables\n"
+"\tremove, rm\t\tRemove packages or resolvables\n"
+"\tsearch, se\t\tSearch for packages matching a pattern\n"
+"\trepos, lr\t\tList all defined repositories.\n"
+"\taddrepo, ar\t\tAdd a new repository\n"
+"\tremoverepo, rr\t\tRemove specified repository\n"
+"\trenamerepo, nr\t\tRename specified repository\n"
+"\tmodifyrepo, mr\t\tModify specified repository\n"
+"\trefresh, ref\t\tRefresh all repositories\n"
+"\tpatch-check, pchk\tCheck for patches\n"
+"\tpatches, pch\t\tList patches\n"
+"\tlist-updates, lu\tList updates\n"
+"\txml-updates, xu\t\tList updates and patches in xml format\n"
+"\tupdate, up\t\tUpdate installed resolvables with newer versions.\n"
+"\tinfo, if\t\tShow full information for packages\n"
+"\tpatch-info\t\tShow full information for patches\n"
+"\tsource-install, si\tInstall a source package\n"
+msgstr ""
+" Kommandos:\n"
+" \thelp\t\t\tHilfe\n"
+" \tshell, sh\t\tMehrere Kommandos gleichzeitig akzeptieren\n"
+" \tinstall, in\t\tPakete oder andere auflösbare Objekte installieren\n"
+" \tremove, rm\t\tPakete oder andere auflösbare Objekte entfernen\n"
+" \tsearch, se\t\tNach Paketen suchen, die einem Muster entsprechen\n"
+" \trepos, lr\t\tRepositories auflisten\n"
+" \taddrepo, ar\t\tNeues Repository hinzufügen\n"
+" \tremoverepo, rr\tangegebenes Repository löschen\n"
+" \trenamerepo, nr\tRepository umbenennen\n"
+" \tmodifyrepo, mr\t\tangegebenes Repository ändern \trefresh, ref\t\tAlle Repositories aktualisieren\n"
+" \tpatch-check, pchk\tAuf Patches prüfen\n"
+" \tpatches, pch\t\tPatches auflisten\n"
+" \tlist-updates, lu\tUpdates auflisten\n"
+" \txml-updates, xu\t\tUpdates und Patches im XML Format auflisten\n"
+" \tupdate, up\t\tPakete auflisten, für die neuere Versionen verfügbar sind.\n"
+" \tinfo, if\t\tVollständige Informationen für Pakete anzeigen\n"
+" \tpatch-info\t\tVollständige Informationen für Patches anzeigen\n"
+
+#: ../src/zypper.cc:136
+#, fuzzy
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Optionen:\n"
+"\t--help, -h\t\tHilfe ausgeben.\n"
+"\t--version, -V\t\tVersionsnummer anzeigen.\n"
+"\t--quiet, -q\t\tNur Fehlermeldungen werden ausgegeben.\n"
+"\t--verbose, -v\t\tAusführliche Ausgabe.\n"
+"\t--terse, -t\t\tKnappe Ausgabe für Scripte.\n"
+"\t--table-style, -s\tAusgabe im tabellarischem Styl.\n"
+"\t--rug-compatible, -r\trug Kompatibilität einschalten.\n"
+"\t--non-interactive\tKeine Nachfragen - Standard-Antworten verwenden.\n"
+"\t--no-gpg-checks\t\tIgnoriere GPG Schlüssel Fehler.\n"
+"\t--root, -R <dir>\tArbeite in einem anderen root Verzeichnis.\n"
+
+#: ../src/zypper.cc:167
+#, c-format
+msgid "Verbosity: %d"
+msgstr "Ausführlichkeitsgrad: %d"
+
+#: ../src/zypper.cc:173
+msgid "Entering non-interactive mode."
+msgstr "Aktiviere automatischen Modus."
+
+#: ../src/zypper.cc:179
+msgid "Entering no-gpg-checks mode."
+msgstr "Deaktiviere GPG Schlüssel Prüfungen."
+
+#: ../src/zypper.cc:189
+msgid "Invalid table style "
+msgstr "Ungültiger Tabellenstil"
+
+#: ../src/zypper.cc:234
+msgid "Try -h for help."
+msgstr "Hilfe erhalten Sie mit '-h'"
+
+#: ../src/zypper.cc:293
+msgid ""
+"install (in) [options] <capability> ...\n"
+"\n"
+"Install resolvables with specified capabilities. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n"
+"\n"
+" Command options:\n"
+"-r, --repo <alias> Install resolvables only from repository specified by alias.\n"
+"-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: package)\n"
+"-n, --name Select resolvables by plain name, not by capability\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"
+msgstr ""
+
+#: ../src/zypper.cc:322
+msgid ""
+"remove (rm) [options] <capability> ...\n"
+"\n"
+"Remove resolvables with specified capabilities. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n"
+"\n"
+" Command options:\n"
+"-r, --repo <alias> Operate only with resolvables from repository specified by alias.\n"
+"-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: package)\n"
+"-n, --name Select resolvables by plain name, not by capability\n"
+" --debug-solver Create solver test case for debugging\n"
+msgstr ""
+
+#: ../src/zypper.cc:341
+#, fuzzy
+msgid ""
+"source-install (si) <name> ...\n"
+"\n"
+"Install source packages specified by their names.\n"
+"\n"
+"This command has no additional options.\n"
+msgstr ""
+"refresh\n"
+"\n"
+"Frische alle Installationsquellen und Repositories des Systems auf.\n"
+"\n"
+"Für dieses Kommando gibt es keine weiteren Optionen.\n"
+
+#: ../src/zypper.cc:361
+#, fuzzy
+msgid ""
+"addrepo (ar) [options] <URI> <alias>\n"
+"\n"
+"Add repository specified by URI to the system and assing the specified alias to it.\n"
+"\n"
+" Command options:\n"
+"-r, --repo <FILE.repo> Read the URL and alias from a file (even remote)\n"
+"-t, --type <TYPE> Type of repository (yast2, rpm-md, or plaindir)\n"
+"-d, --disabled Add the repository as disabled\n"
+"-n, --no-refresh Add the repository with auto-refresh disabled\n"
+msgstr ""
+"addrepo (ar) [Optionen] <URI> <Alias>\n"
+"\n"
+"Füge das per URI angegebene Repository mit dem angegebenen Alias dem System hinzu.\n"
+" Kommandooptionen:\n"
+"\t--repo,-r <Datei.repo>\tLese URL und Alias von einer Datei\n"
+"\t\t\t\t(auch remote)\n"
+"\t--type,-t <TYPE>\tType des Repositories (YaST, YUM, oder Plaindir)\n"
+"\t--disabled,-d\t\tFüge das Repository mit dem Status 'deaktiviert' hinzu.\n"
+"\t--no-refresh,-n\t\tFüge das Repository mit dem Status 'Auto-refresh deaktiviert'\n"
+
+#: ../src/zypper.cc:380
+msgid ""
+"repos (lr)\n"
+"\n"
+"List all defined repositories.\n"
+"\n"
+" Command options:\n"
+"-e, --export <FILE.repo> Export all defined repositories as a single local .repo file\n"
+msgstr ""
+
+#: ../src/zypper.cc:397
+#, fuzzy
+msgid ""
+"removerepo (rr) [options] <alias|URL>\n"
+"\n"
+"Remove repository specified by alias or URL.\n"
+"\n"
+" Command options:\n"
+" --loose-auth\tIgnore user authentication data in the URL\n"
+" --loose-query\tIgnore query string in the URL\n"
+msgstr ""
+"removerepo (rr) [Optionen] <Alias|URL>\n"
+"\n"
+"Entferne die über Alias oder URL angegebenen Repositories.\n"
+" Kommandooptionen:\n"
+"\t--loose-auth\tIgnoriere Benutzer-Authentifizierungsdaten in der URL\n"
+"\t--loose-query\tIgnoriere Suchstring in der URL\n"
+
+#: ../src/zypper.cc:413
+#, fuzzy
+msgid ""
+"renamerepo [options] <alias> <new-alias>\n"
+"\n"
+"Assign new alias to the repository specified by alias.\n"
+"\n"
+"This command has no additional options.\n"
+msgstr ""
+"renamerepo [Optionen] <Alias> <Neuer-Alias>\n"
+"\n"
+"Neuen Alias zu dem durch URI oder aktuellen Alias angegebenen Dienst zuweisen.\n"
+"Für dieses Kommando gibt es keine weiteren Optionen.\n"
+
+#: ../src/zypper.cc:431
+#, fuzzy
+msgid ""
+"modifyrepo (mr) <options> <alias>\n"
+"\n"
+"Modify properties of the repository specified by alias.\n"
+"\n"
+" Command options:\n"
+"-d, --disable Disable the repository (but don't remove it)\n"
+"-e, --enable Enable a disabled repository\n"
+"-a, --enable-autorefresh Enable auto-refresh of the repository\n"
+" --disable-autorefresh Disable auto-refresh of the repository\n"
+msgstr ""
+"modifyrepo (mr) <Optionen> <Alias>\n"
+"\n"
+"Modifiziere Eigenschaften des durch Alias angegebenen Repositories.\n"
+"\t--disable,-d\t\tDeaktiviere das Repository (aber lösche es nicht)\n"
+"\t--enable,-e\t\tAktiviere ein deaktiviertes Repository\n"
+"\t--enable-autorefresh,-a\tAktiviere den 'auto-refresh' für das Repository\n"
+"\t--disable-autorefresh\tDeaktiviere 'auto-refresh' für das Repository\n"
+
+#: ../src/zypper.cc:454
+msgid ""
+"refresh (ref) [alias|#] ...\n"
+"\n"
+"Refresh repositories specified by their alias or number. If none are specified, all enabled repositories will be refreshed.\n"
+"\n"
+" Command options:\n"
+"-f, --force Force a complete refresh\n"
+"-b, --force-build Force rebuild of the database\n"
+"-d, --force-download Force download of raw metadata\n"
+"-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"
+msgstr ""
+
+#: ../src/zypper.cc:479
+msgid ""
+"list-updates [options]\n"
+"\n"
+"List all available updates\n"
+"\n"
+" Command options:\n"
+"-t, --type <type> Type of resolvable (package, patch, pattern, product) (default: patch)\n"
+"-r, --repo <alias> List only updates from the repository specified by the alias.\n"
+" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable.\n"
+msgstr ""
+
+#: ../src/zypper.cc:506
+msgid ""
+"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"
+msgstr ""
+
+#: ../src/zypper.cc:545
+#, fuzzy
+msgid ""
+"search [options] [querystring...]\n"
+"\n"
+"Search for packages matching given search strings\n"
+"\n"
+" Command options:\n"
+" --match-all Search for a match with all search strings (default)\n"
+" --match-any Search for a match with any of the search strings\n"
+" --match-substrings Matches with search strings may be partial words (default)\n"
+" --match-words Matches with search strings may only be whole words\n"
+" --match-exact Searches for an exact package name\n"
+"-d, --search-descriptions Search also in package summaries and descriptions.\n"
+"-c, --case-sensitive Perform case-sensitive search.\n"
+"-i, --installed-only Show only packages that are already installed.\n"
+"-u, --uninstalled-only Show only packages that are not currently installed.\n"
+"-t, --type <type> Search only for packages of the specified type.\n"
+"-r, --repo <alias> Search only in the repository specified by the alias.\n"
+" --sort-by-name Sort packages by name (default).\n"
+" --sort-by-repo Sort packages by repository.\n"
+"\n"
+"* and ? wildcards can also be used within search strings.\n"
+msgstr ""
+"zypper [globale Optionen] search [Optionen] [Suchzeichenkette...]\n"
+"\n"
+" 'search' - Nach Paketen suchen, die mit den vorgegebenen Suchzeichenketten übereinstimmen\n"
+" \n"
+" Kommandooptionen:\n"
+" --match-all Nach Ãbereinstimmung mit allen Suchzeichenketten suchen (Standard)\n"
+" --match-any Nach Ãbereinstimmung mit einer der Suchzeichenketten suchen\n"
+" --match-substrings Ãbereinstimmungen mit Suchzeichenketten können Wortteile sein (Standard)\n"
+" --match-words Ãbereinstimmungen mit Suchzeichenketten können nur ganze Wörter sein\n"
+" --match-exact Sucht nach einem exakten Paketnamen\n"
+" -d, --search-descriptions Auch in Paketzusammenfassungen und Beschreibungen suchen.\n"
+" -c, --case-sensitive GroÃ-/Kleinschreibung bei der Suche beachten.\n"
+" -i, --installed-only Nur bereits installierte Pakete anzeigen.\n"
+" -u, --uninstalled-only Nur zurzeit nicht installierte Pakete anzeigen.\n"
+" -t, --type Nur nach Paketen des angegebenen Typs suchen.\n"
+" --sort-by-name Pakete nach Namen sortieren (Standard).\n"
+" --sort-by-catalog Pakete nach Katalog sortieren (Quelle).\n"
+" \n"
+" In Suchzeichenketten können auch die Platzhalter * und ? verwendet werden.\n"
+
+#: ../src/zypper.cc:577
+msgid ""
+"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"
+msgstr ""
+
+#: ../src/zypper.cc:596
+msgid ""
+"patches\n"
+"\n"
+"List all available patches\n"
+"\n"
+" Command options:\n"
+"\n"
+"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
+msgstr ""
+
+#: ../src/zypper.cc:615
+#, fuzzy
+msgid ""
+"info <name> ...\n"
+"\n"
+"Show full information for packages\n"
+"\n"
+" Command options:\n"
+"\n"
+"-r, --repo <alias> Work only with the repository specified by the alias.\n"
+msgstr ""
+"zypper [globale Optionen] info [name...]\n"
+"\n"
+" 'info' -- Vollständige Informationen für Paket <name> anzeigen\n"
+
+#: ../src/zypper.cc:633
+#, fuzzy
+msgid ""
+"patch-info <patchname> ...\n"
+"\n"
+"Show detailed information for patches\n"
+"\n"
+"This is a rug compatibility alias for 'zypper info -t patch'\n"
+msgstr ""
+"zypper [globale Optionen] patch-info [Patchname...]\n"
+"\n"
+"'patch-info' -- Detaillierte Informationen für Patches anzeigen\n"
+
+#: ../src/zypper.cc:647
+#, fuzzy
+msgid ""
+"moo\n"
+"\n"
+"Show an animal\n"
+"\n"
+"This command has no additional options.\n"
+msgstr ""
+"moo\n"
+"\n"
+"'moo' - Zeige ein Tier\n"
+"\n"
+"Für dieses Kommando gibt es keine weiteren Optionen.\n"
+
+#: ../src/zypper.cc:662
+msgid ""
+"xml-updates\n"
+"\n"
+"Show updates and patches in xml format\n"
+"\n"
+" Command options:\n"
+"-r, --repo <alias> Work only with updates from repository specified by alias.\n"
+msgstr ""
+
+#: ../src/zypper.cc:682
+msgid "Non-option program arguments: "
+msgstr "Andere Programmargumente (ohne Optionen):"
+
+#: ../src/zypper.cc:705
+#, fuzzy
+msgid "Repositories disabled, using the database of installed packages only."
+msgstr "Repositories sind deaktivert, nur die Datenbank mit bereits installierten Pakete wird genutzt."
+
+#: ../src/zypper.cc:717
+msgid "Ignoring installed resolvables..."
+msgstr "Installierte auflösbare Objekte werden ignoriert..."
+
+#: ../src/zypper.cc:742
+#, fuzzy
+msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
+msgstr "Eine ZYpp Aktion wird bereits ausgeführt. Das bedeutet, das bereits ein anderes Programm (etwa YaST2) die libzypp Bibliothek für das Paket- oder Patchmanagement nutzt. Sämtliche andere Programme müssen erst beendet werden, bevor dieses Programm gestartet werden kann."
+
+#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
+#: ../src/zypper.cc:767
+msgid ""
+" \\\\\\\\\\\n"
+" \\\\\\\\\\\\\\__o\n"
+"__\\\\\\\\\\\\\\'/_"
+msgstr ""
+" \\\\\\\\\\\n"
+" \\\\\\\\\\\\\\__o\n"
+"__\\\\\\\\\\\\\\'/_"
+
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
+msgid "Root privileges are required for modifying system repositories."
+msgstr "Zur Ãnderung von Systemressourcen sind Root-Berechtigungen erforderlich."
+
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
+msgid "Too few arguments. At least URL and alias are required."
+msgstr "Zu viele Argumente. Es wird nur eine URL und ein Alias-Name benötigt."
+
+#: ../src/zypper.cc:861
+msgid "Specified type is not a valid repository type:"
+msgstr ""
+
+#: ../src/zypper.cc:862
+msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
+msgstr ""
+
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
+msgid "Required argument missing."
+msgstr "Benötigtes Argument fehlt."
+
+#: ../src/zypper.cc:908
+msgid "Repository not found by alias, trying delete by URL..."
+msgstr "Repository nicht über Alias gefunden, versuche es über URL zu löschen..."
+
+#: ../src/zypper.cc:941
+msgid "Repository not found by given alias or URL."
+msgstr "Repository nicht über angegebenen Alias oder URL gefunden."
+
+#: ../src/zypper.cc:1012
+msgid "Alias is a required argument."
+msgstr "Die Angabe eines Alias-Namens ist zwingend erforderlich."
+
+#: ../src/zypper.cc:1040
+msgid "Root privileges are required for refreshing system repositories."
+msgstr "Zum Auffrischen von Repositories sind Root-Rechte erforderlich."
+
+#: ../src/zypper.cc:1077
+msgid "Root privileges are required for installing or uninstalling packages."
+msgstr "Zur Installieren oder De-Installieren von Paketen sind Root-Rechte erforderlich."
+
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
+#, c-format
+msgid "Unknown resolvable type: %s"
+msgstr "Unbekannter Typ %s für auflösbare Objekte"
+
+#: ../src/zypper.cc:1109
+msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
+msgstr "Warnung: Keine Repositories definiert. Betrieb nur mit den installierten Paketen. Es können keine weiteren Objekte (Pakete, Patterns, Patches) installiert werden."
+
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
+#, fuzzy
+msgid "Generating solver test case..."
+msgstr "Erzeuge Repository Zwischenspeicher..."
+
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
+#, fuzzy
+msgid "Solver test case generated successfully."
+msgstr "Das Modul \"%s\" wurde erfolgreich geladen."
+
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
+#, fuzzy
+msgid "Error creating the solver test case."
+msgstr "Fehler beim Lesen der Systemquellen:"
+
+#: ../src/zypper.cc:1156
+#, fuzzy
+msgid "Source package name is a required argument."
+msgstr "Die Angabe eines Alias-Namens ist zwingend erforderlich."
+
+#: ../src/zypper.cc:1198
+msgid "Unknown resolvable type "
+msgstr "Unbekannter Typ des auflösbaren Objekts"
+
+#: ../src/zypper.cc:1235
+msgid "No resolvables found."
+msgstr "Keine auflösbaren Elemente gefunden."
+
+#. 'rug' is the name of a program and must not be translated
+#. 'best-effort' is a program parameter and can not be translated
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
+msgid "Running as 'rug', can't do 'best-effort' approach to update."
+msgstr ""
+
+#: ../src/zypper.cc:1397
+msgid "Root privileges are required for updating packages."
+msgstr "Um Pakete zu aktualisieren sind Root-Rechte erforderlich."
+
+#: ../src/zypper.cc:1517
+msgid "Unexpected exception."
+msgstr "Unerwarteter Fehler."
+
+#: ../src/zypper.cc:1602
+msgid "You already are running zypper's shell."
+msgstr "Sie haben schon eine zypper shell geöffnet."
+
+#: ../src/zypper-utils.cc:47
+msgid "Please file a bug report about this."
+msgstr "Tragen Sie bitte unter https://bugzilla.novell.com/ einen Bericht zu diesem Fehler ein."
+
+#. TranslatorExplanation remember not to translate the URL
+#. unless you translate the actual page :)
+#: ../src/zypper-utils.cc:50
+msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
+msgstr "Anweisungen finden Sie unter http://de.opensuse.org/Zypper#Troubleshooting."
+
+#: ../src/zypper-command.cc:92
+#, c-format
+msgid "Unknown command '%s'"
+msgstr "Unbekannter Befehl '%s'"
+
+# error box title
+#: ../src/zypper-callbacks.h:42
+msgid "I/O error"
+msgstr "E/A-Fehler"
+
+#: ../src/zypper-callbacks.h:42
+msgid "Invalid object"
+msgstr "Ungültiges Object"
+
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Fehler"
+
+#: ../src/zypper-media-callbacks.h:57
+#, c-format
+msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
+msgstr ""
+
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
+msgid "Downloading: "
+msgstr "Lade herunter: "
+
+#. TranslatorExplanation This text is a progress display label e.g. "Downloading delta [42%]"
+#: ../src/zypper-source-callbacks.h:97 ../src/zypper-source-callbacks.h:104
+msgid "Downloading delta"
+msgstr "Lade delta herunter"
+
+#. TranslatorExplanation This text is a progress display label e.g. "Applying delta [42%]"
+#: ../src/zypper-source-callbacks.h:125 ../src/zypper-source-callbacks.h:131
+msgid "Applying delta"
+msgstr "Wende delta an"
+
+#: ../src/zypper-source-callbacks.h:152
+msgid "Downloading patch rpm"
+msgstr "Lade Patch-RPM herunter"
+
+#. TranslatorExplanation This text is a progress display label e.g. "Applying patch rpm [42%]"
+#: ../src/zypper-source-callbacks.h:159
+msgid "Applying patch rpm"
+msgstr "Wende Patch-RPM an"
+
+#: ../src/zypper-source-callbacks.h:179
+#, c-format
+msgid "Downloading %s %s-%s.%s"
+msgstr "Herunterladen von %s %s-%s.%s"
+
+#. TranslatorExplanation %s is package size like "5.6 M"
+#: ../src/zypper-source-callbacks.h:190
+#, c-format
+msgid "(%s unpacked)"
+msgstr "(%s installiert)"
+
+#. TranslatorExplanation This text is a progress display label e.g. "Downloading [42%]"
+#: ../src/zypper-source-callbacks.h:199
+msgid "Downloading"
+msgstr "Lade herunter"
+
+#. TranslatorExplanation speaking of a script
+#: ../src/zypper-rpm-callbacks.h:63
+#, c-format
+msgid "Running: %s (%s, %s)"
+msgstr "Starte: %s (%s, %s)"
+
+#: ../src/zypper-rpm-callbacks.h:117
+msgid "Reading installed packages"
+msgstr "Lese installierte Pakete"
+
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
+#, fuzzy
+msgid "Removing "
+msgstr "Entfernen"
+
+#: ../src/zypper-rpm-callbacks.h:155
+#, fuzzy, c-format
+msgid "Removal of %s failed:"
+msgstr "Entfernen von %s ist fehlgeschlagen"
+
+#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
+#: ../src/zypper-rpm-callbacks.h:170
+msgid "(with --nodeps)"
+msgstr "(mit --nodeps)"
+
+#: ../src/zypper-rpm-callbacks.h:170
+msgid "(with --nodeps --force)"
+msgstr "(mit --nodeps --force)"
+
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
+#, c-format
+msgid "Installing: %s-%s"
+msgstr "Installation von %s-%s"
+
+#: ../src/zypper-rpm-callbacks.h:215
+#, c-format
+msgid "Installation of %s failed:"
+msgstr "Installation von %s ist fehlgeschlagen:"
+
+#: ../src/zypper-search.h:289
+msgid "Catalog"
+msgstr "Katalog"
+
+#: ../src/zypper-search.h:291
+msgid "Repository"
+msgstr "Repository"
+
Modified: trunk/zypper/po/sk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/sk.po?rev=7255&r1=7254…
==============================================================================
--- trunk/zypper/po/sk.po (original)
+++ trunk/zypper/po/sk.po Sat Sep 15 19:28:03 2007
@@ -8,8 +8,8 @@
"Project-Id-Version: zypper.sk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-11 11:12+0200\n"
-"PO-Revision-Date: 2007-09-14 15:12+0200\n"
-"Last-Translator: <jkupec(a)suse.cz>\n"
+"PO-Revision-Date: 2007-09-15 12:12+0200\n"
+"Last-Translator: Ján Kupec <jkupec(a)suse.cz>\n"
"Language-Team: Slovak\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -428,7 +428,7 @@
#. TranslatorExplanation This is Bundle in as used in rug.
#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
-msgstr ""
+msgstr "Bundle"
#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
@@ -504,7 +504,7 @@
#. it is a command line option
#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
-msgstr "ProsÃm, reÅ¡tartujte túto operáciu v interaktÃvnom režime a potvrÄte súhlas s požadovanými licenciami."
+msgstr "ProsÃm, reÅ¡tartujte túto operáciu v interaktÃvnom režime a potvrÄte súhlas s požadovanými licenciami, prÃpadne použite voľbu --auto-agree-with-licences."
#: ../src/zypper-misc.cc:1528
#, c-format
@@ -548,7 +548,7 @@
#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
-msgstr "Repozitár '%s' nebol nájdený."
+msgstr "Repozitár '%s' je aktuálny."
#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
@@ -616,7 +616,7 @@
#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
-msgstr "Repositár '%s' nebol nájdený."
+msgstr "Repozitár '%s' nebol nájdený."
#: ../src/zypper-sources.cc:228
#, c-format
@@ -662,7 +662,7 @@
#: ../src/zypper-sources.cc:357
msgid "Refresh"
-msgstr "Obnoviť"
+msgstr "Autoakt."
# printers.ycp.noloc:1270
# printers.ycp.noloc:1270
@@ -785,7 +785,7 @@
#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
-msgstr "Repositár '%s' bol úspešne pridaný"
+msgstr "Repozitár '%s' bol úspešne pridaný"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
#: ../src/zypper-sources.cc:732
@@ -1151,7 +1151,7 @@
"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
"\t--root, -R <dir>\tOperate on a different root directory.\n"
msgstr ""
-" Možnosti:\n"
+" Voľby:\n"
"\t--help, -h\t\tPomoc\n"
"\t--version, -V\t\tVýpis ÄÃsla verzie.\n"
"\t--quiet, -q\t\tPotlaÄ normálny výstup, zobraz len chybové správy.\n"
@@ -1198,18 +1198,18 @@
" See 'man zypper' for more details.\n"
" --debug-solver Create solver test case for debugging\n"
msgstr ""
-"install (in) [options] <názov> ...\n"
-"install (in) [options] --capability <kapabilita> ...\n"
+"install (in) [voľby] <názov> ...\n"
+"install (in) [voľby] --capability <kapabilita> ...\n"
"\n"
-"NainÅ¡taluj balÃÄky alebo iné typy objektov so zadanými názvami alebo kapabilitami.Kapabilita je NÃZOV[OP<VERZIA>], kde OP je <, <=, =, >=, >.\n"
+"NainÅ¡taluj balÃÄky alebo iné typy objektov so zadanými názvami alebo kapabilitami. Kapabilita je NÃZOV[OP<VERZIA>], kde OP je <, <=, =, >=, >.\n"
"\n"
-" Možnosti prÃkazu:\n"
+" Voľby prÃkazu:\n"
"-r, --repo <alias> InÅ¡taluj iba balÃÄky zo zadaného repozitára.\n"
-"-t, --type <typ> Typ balÃÄka (package, patch, pattern, product) (prednastavený typ: package)\n"
+"-t, --type <typ> Typ balÃÄka (package, patch, pattern, product) (prednastavený typ: package)\n"
"-n, --name Vyber balÃÄky podľa názvu (prednastavená možnosÅ¥)\n"
"-C, --capabiltiy Vyber balÃÄky podľa kapability\n"
"-l, --auto-agree-with-licenses Automaticky potrÄ súhlas s licenciami tretÃch strán.\n"
-" Pozrite 'man zypper' kvôli ÄalÅ¡Ãm informáciám..\n"
+" Pre ÄalÅ¡ie informácie pozrite 'man zypper'.\n"
" --debug-solver Vytvor testovacà prÃpad pre ladenie solveru závislostÃ.\n"
#: ../src/zypper.cc:322
@@ -1224,12 +1224,12 @@
"-n, --name Select resolvables by plain name, not by capability\n"
" --debug-solver Create solver test case for debugging\n"
msgstr ""
-"remove (rm) [options] <názov> ...\n"
-"remove (rm) [options] --capability <kapabilita> ...\n"
+"remove (rm) [voľby] <názov> ...\n"
+"remove (rm) [voľby] --capability <kapabilita> ...\n"
"\n"
"OdstráŠbalÃÄky alebo iné typy objektov so zadanými názvami alebo kapabilitami. Kapabilita je NÃZOV[OP<VERZIA>], kde OP je <, <=, =, >=, >.\n"
"\n"
-" Možnosti prÃkazu:\n"
+" Voľby prÃkazu:\n"
"-r, --repo <alias> InÅ¡taluj iba balÃÄky zo zadaného repozitára.\n"
"-t, --type <typ> Typ balÃÄka (package, patch, pattern, product) (prednastavený typ: package)\n"
"-n, --name Vyber balÃÄky podľa názvu (prednastavená možnosÅ¥)\n"
@@ -1237,7 +1237,6 @@
" --debug-solver Vytvor testovacà prÃpad pre ladenie solveru závislostÃ.\n"
#: ../src/zypper.cc:341
-#, fuzzy
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1245,12 +1244,13 @@
"\n"
"This command has no additional options.\n"
msgstr ""
-"zypper refresh\n"
+"source-install (si) <názov> ...\n"
"\n"
-"Obnov/aktualizuj vÅ¡etky inÅ¡talaÄné zdroje v systéme.\n"
+"NainÅ¡taluj zdrojové balÃÄky so zadanými názvami.\n"
+"\n"
+"Tento prÃkaz nemá žiadne ÄalÅ¡ie voľby.\n"
#: ../src/zypper.cc:361
-#, fuzzy
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1262,14 +1262,15 @@
"-d, --disabled Add the repository as disabled\n"
"-n, --no-refresh Add the repository with auto-refresh disabled\n"
msgstr ""
-"service-add [možnosti] URI [alias]\n"
+"addrepo (ar) [voľby] <URI> <alias>\n"
+"\n"
+"Pridaj repozitár so zadanou URL adresou do systému a priraÄ mu zadaný alias.\n"
"\n"
-"Pridaj inÅ¡talaÄný zdroj do systému.\n"
-" Možnosti prÃkazu:\n"
-"\t--repo,-r <SÃBOR.repo>\tNaÄÃtaj URL adresu a alias zo zadaného súboru (aj vzdialeného)\n"
-"\t--type,-t <TYPE>\tTyp inÅ¡talaÄného zdroja (YaST, YUM, alebo Plaindir)\n"
-"\t--disabled,-d\t\tPridaÅ¥ inÅ¡talaÄný zdroj ako vypnutý\n"
-"\t--no-refresh,-n\t\tVypnúť automatické obnovovanie/aktualizáciu zdroja\n"
+" Voľby prÃkazu:\n"
+"-r, --repo <SÃBOR.repo> NaÄÃtaj URL adresu a alias zo zadaného súboru (aj vzdialeného)\n"
+"-t, --type <TYP> Typ repozitára (yast2, rpm-md alebo plaindir)\n"
+"-d, --disabled Pridaný repozitár bude nastavaný ako vypnutý\n"
+"-n, --no-refresh Pridaj repozitár bude mať vypntú automatickú aktualizáciu\n"
#: ../src/zypper.cc:380
msgid ""
@@ -1280,6 +1281,12 @@
" Command options:\n"
"-e, --export <FILE.repo> Export all defined repositories as a single local .repo file\n"
msgstr ""
+"repos (lr) [voľby]\n"
+"\n"
+"VypÃÅ¡ zoznam vÅ¡etkých definovaných repozitárov.\n"
+"\n"
+" Voľby prÃkazu:\n"
+"-e, --export <SÃBOR.repo> Exportuj vÅ¡etky nadefinované repozitáre ako jeden .repo súbor\n"
#: ../src/zypper.cc:397
msgid ""
@@ -1291,9 +1298,15 @@
" --loose-auth\tIgnore user authentication data in the URL\n"
" --loose-query\tIgnore query string in the URL\n"
msgstr ""
+"removerepo (rr) [voľby] <alias|URL>\n"
+"\n"
+"Remove repository specified by alias or URL.\n"
+"\n"
+" Voľby prÃkazu:\n"
+" --loose-auth\tIgnore user authentication data in the URL\n"
+" --loose-query\tIgnore query string in the URL\n"
#: ../src/zypper.cc:413
-#, fuzzy
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1301,11 +1314,11 @@
"\n"
"This command has no additional options.\n"
msgstr ""
-"service-rename <URI|alias> <nový-alias>\n"
+"renamerepo <alias> <nový-alias>\n"
"\n"
-"Premenovanie zdroja. Priradà existujúcemu zdroju so zadanou URI adresou alebo aliasom nový alias.\n"
+"Premenovanie aliasu repozitára. Priradà existujúcemu repozitáru so zadaným aliasom nový alias.\n"
"\n"
-"Tento prÃkaz nemá žiadne ÄalÅ¡ie možnosti.\n"
+"Tento prÃkaz nemá žiadne ÄalÅ¡ie voľby.\n"
#: ../src/zypper.cc:431
msgid ""
@@ -1319,6 +1332,15 @@
"-a, --enable-autorefresh Enable auto-refresh of the repository\n"
" --disable-autorefresh Disable auto-refresh of the repository\n"
msgstr ""
+"modifyrepo (mr) <voľby> <alias>\n"
+"\n"
+"ZmeŠvlastnoti repozitára so zadaným aliasom.\n"
+"\n"
+" Voľby prÃkazu:\n"
+"-d, --disable Vypni repozitár (ale neodstraÅuj ho)\n"
+"-e, --enable Zapni repozitár\n"
+"-a, --enable-autorefresh Zapni autoaktualizáciu pre repozitár\n"
+" --disable-autorefresh Vypni autoaktualizáciu pre repozitár\n"
#: ../src/zypper.cc:454
msgid ""
@@ -1333,6 +1355,16 @@
"-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"
msgstr ""
+"refresh (ref) [voľby] [alias|#] ...\n"
+"\n"
+"Aktualizuj repozitáre zadané pomocou aliasu alebo ÄÃsla. Ak nie sú zadané žiadne repozitáre, aktualizujú sa vÅ¡etky zapnuté repozitáre.\n"
+"\n"
+" Voľby prÃkazu:\n"
+"-f, --force Vynúť si úplnú aktualizáciu\n"
+"-b, --force-build Vynúť znovuvytvorenie cache databázy\n"
+"-d, --force-download Vynúť stiahnutie surových metadát\n"
+"-B, --build-only Len vytvor databázu, nesťahuj metadáta.\n"
+"-D, --download-only Len stiahni metadáta, nevytváraj databázu\n"
#: ../src/zypper.cc:479
msgid ""
@@ -1345,6 +1377,14 @@
"-r, --repo <alias> List only updates from the repository specified by the alias.\n"
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable.\n"
msgstr ""
+"list-updates [voľby]\n"
+"\n"
+"VypÃÅ¡ zoznam vÅ¡etkých dostupných aktualizáciÃ\n"
+"\n"
+" Voľby prÃkazu:\n"
+"-t, --type <typ> Typ objektov (package, patch, pattern, product) (prednastavený: patch)\n"
+"-r, --repo <alias> VypÃÅ¡ iba aktualizácie z repozitára so zadaným aliasom.\n"
+" --best-effort Zvoľ prÃstup 'najväÄÅ¡ia snaha' pri hľadanà aktualizáciÃ. Budu povolené aj aktualizácie na nižšiu verziu ako je posledná alebo najlepÅ¡ia k dispozÃcii.\n"
#: ../src/zypper.cc:506
msgid ""
@@ -1362,9 +1402,21 @@
" --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"
msgstr ""
+"update (up) [voľby]\n"
+"\n"
+"Aktualizuj všetky nainštalované objekty na novšie verzie všade, kde je to možné.\n"
+"\n"
+" Voľby prÃkazu:\n"
+"\n"
+"-t, --type <typ> Typ objektov (package, patch, pattern, product) (prednastavený: patch)\n"
+"-r, --repo <alias> VypÃÅ¡ iba aktualizácie z repozitára so zadaným aliasom.\n"
+" --skip-interactive Vynechaj interaktÃvne aktualizácie\n"
+"-l, --auto-agree-with-licenses Automaticky potrÄ súhlas s licenciami tretÃch strán.\n"
+" Pre ÄalÅ¡ie informácie pozrite 'man zypper'.\n"
+" --best-effort Zvoľ prÃstup 'najväÄÅ¡ia snaha' pri hľadanà aktualizáciÃ. Budu povolené aj aktualizácie na nižšiu verziu ako je posledná alebo najlepÅ¡ia k dispozÃcii.\n"
+" --debug-solver Vytvor testovacà prÃpad pre ladenie solveru závislostÃ\n"
#: ../src/zypper.cc:545
-#, fuzzy
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1387,11 +1439,11 @@
"\n"
"* and ? wildcards can also be used within search strings.\n"
msgstr ""
-"zypper [globálne-možnosti] search [špecifické-možnosti] [hľadaný-výraz...]\n"
+"search [voľby] [hľadaný-výraz] ...\n"
"\n"
-"'search' - Hľadaj balÃÄky podľa zadaného výrazu\n"
+"Nájdi balÃÄky podľa zadaného výrazu\n"
"\n"
-" Možnosti prÃkazu:\n"
+" Voľby prÃkazu:\n"
" --match-all Nájdi balÃÄky, ktoré obsahujú vÅ¡etky hľadané výrazy (predvolené)\n"
" --match-any Nájdi balÃÄky, ktoré obsahujú ktorýkoľvek z hľadaných výrazov\n"
" --match-substrings Hľadané výrazy môžu predstavovaÅ¥ Äasti slov (predvolené)\n"
@@ -1401,9 +1453,10 @@
"-c, --case-sensitive RozliÅ¡uj veľké a malé pÃsmená\n"
"-i, --installed-only Hľadaj iba medzi nainÅ¡talovanými balÃÄkami\n"
"-u, --uninstalled-only Hľadaj iba medzi nenainÅ¡talovanými balÃÄkami\n"
-"-t, --type Hľadaj iba balÃÄky urÄeného typu\n"
+"-t, --type <typ> Hľadaj iba balÃÄky urÄeného typu\n"
+"-r, --repo <alias> Hľadaj iba balÃÄky zorepozitára so zadaným aliasom.\n"
" --sort-by-name ZotrieÄ nájdené balÃÄky podľa mena (predvolené)\n"
-" --sort-by-catalog ZotrieÄ balÃÄky podľa inÅ¡talaÄného zdroja\n"
+" --sort-by-repo ZotrieÄ balÃÄky podľa repozitára\n"
"\n"
"Znaky * a ? môžu byt v hľadaných výrazoch použité ako náhrada ľubovoľného reťazca alebo znaku.\n"
@@ -1417,6 +1470,13 @@
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
msgstr ""
+"patch-check [voľby]\n"
+"\n"
+"Zisti ktoré záplaty sú k dispozÃcii\n"
+"\n"
+" Voľby prÃkazu:\n"
+"\n"
+"-r, --repo <alias> Hľadaj záplaty len v repozitári so zadaným aliasom.\n"
#: ../src/zypper.cc:596
msgid ""
@@ -1428,9 +1488,15 @@
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
msgstr ""
+"patches\n"
+"\n"
+"VypÃÅ¡ zoznam vÅ¡etkých záplat, ktoré sú k dispozÃcii\n"
+"\n"
+" Voľby prÃkazu:\n"
+"\n"
+"-r, --repo <alias> Hľadaj záplaty len v repozitári so zadaným aliasom.\n"
#: ../src/zypper.cc:615
-#, fuzzy
msgid ""
"info <name> ...\n"
"\n"
@@ -1440,14 +1506,15 @@
"\n"
"-r, --repo <alias> Work only with the repository specified by the alias.\n"
msgstr ""
-"zypper [globálne-možnosti] info [názov...]\n"
+"info [voľby] <názov> ...\n"
+"\n"
+"Zobraz podrobné informácie o zadaných balÃÄkoch\n"
"\n"
-"'info' -- Zobraz podrobné informácie o zadaných balÃÄkoch.\n"
+" Voľby prÃkazu:\n"
"\n"
-"Tento prÃkaz nemá žiadne ÄalÅ¡ie možnosti.\n"
+"-r, --repo <alias> Pracuj iba s repozitárom so zadaným aliasom.\n"
#: ../src/zypper.cc:633
-#, fuzzy
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1455,14 +1522,13 @@
"\n"
"This is a rug compatibility alias for 'zypper info -t patch'\n"
msgstr ""
-"zypper [globálne-možnosti] patch-info [názov-záplaty...]\n"
+"patch-info [názov-záplaty] ...\n"
"\n"
-"'patch-info' -- Zobraz podrobné informácie o zadaných záplatách.\n"
+"Zobraz podrobné informácie o zadaných záplatách.\n"
"\n"
-"Tento prÃkaz nemá žiadne ÄalÅ¡ie možnosti.\n"
+"Tento prÃkaz je alias prÃkazu 'zypper info -t patch' kvôli kompatibilite s programom rug\n"
#: ../src/zypper.cc:647
-#, fuzzy
msgid ""
"moo\n"
"\n"
@@ -1470,11 +1536,11 @@
"\n"
"This command has no additional options.\n"
msgstr ""
-"patches\n"
+"moo\n"
"\n"
-"Zobraz zoznam všetkých dostupných záplat.\n"
+"Ukáž zviera\n"
"\n"
-"Tento prÃkaz nemá žiadne ÄalÅ¡ie možnosti.\n"
+"Tento prÃkaz nemá žiadne ÄalÅ¡ie voľby.\n"
#: ../src/zypper.cc:662
msgid ""
@@ -1485,15 +1551,20 @@
" Command options:\n"
"-r, --repo <alias> Work only with updates from repository specified by alias.\n"
msgstr ""
+"xml-updates [voľby]\n"
+"\n"
+"VypÃÅ¡ vÅ¡etky dostupné akutalizácie balÃÄkov a záplat vo formáte XML\n"
+"\n"
+" Voľby prÃkazu:\n"
+"-r, --repo <alias> Hľadaj aktualizácie len v repozitári so zadaným aliasom.\n"
#: ../src/zypper.cc:682
-#, fuzzy
msgid "Non-option program arguments: "
msgstr "Argumenty programu (okrem volieb): "
#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
-msgstr ""
+msgstr "Repozitáre sú vypnuté, použijem len databázu nainÅ¡talovaných balÃÄkov."
#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
@@ -1501,7 +1572,7 @@
#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
-msgstr ""
+msgstr "Pravé prebieha iná ZYpp transakcia. Znamená to, že je spustená nejaká ÄalÅ¡ia aplikácia, ktorá použÃva knižnicu libzypp na správu balÃÄkov. VÅ¡etky takéto aplikácie musia byÅ¥ pred použitÃm tohto prÃkazu zatvorené."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
#: ../src/zypper.cc:767
@@ -1510,101 +1581,93 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
msgstr ""
+" \\(_)\\\\\n"
+" \\\\(_(_)\\\\__o\n"
+"__\\\\\\\\\\\\\\'/_"
#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
#: ../src/zypper.cc:1006
-#, fuzzy
msgid "Root privileges are required for modifying system repositories."
-msgstr "Pre prácu so systémovými zdrojmi sú potrebné práva správcu systému (root)."
+msgstr "Pre prácu so systémovými repozitármi sú potrebné práva správcu systému (root)."
#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
-msgstr ""
+msgstr "PrÃliÅ¡ málo argumentov. AspoÅ URL adresa a alias musia byÅ¥ zadané."
#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
-msgstr ""
+msgstr "Zadaný typ nie je platný typ repozitára:"
#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
-msgstr ""
+msgstr "Zoznam známych typov repozitárov ziskate pomocou 'zypper -h addrepo' alebo 'man zypper'."
#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
-msgstr ""
+msgstr "Chýba vyžadovaný argument."
#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
-msgstr ""
+msgstr "Zadaný repozitár nebol nájdený podľa aliasu, skúsim ho odstrániť podľa URL adresy..."
#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
-msgstr ""
+msgstr "Repozitár nebol nájdený podľa zadaného aliasu ani URL adresy."
#: ../src/zypper.cc:1012
-#, fuzzy
msgid "Alias is a required argument."
-msgstr "Schéma URL je povinná"
+msgstr "Alias je vyžadovaný argument."
#: ../src/zypper.cc:1040
-#, fuzzy
msgid "Root privileges are required for refreshing system repositories."
-msgstr "Pre prácu so systémovými zdrojmi sú potrebné práva správcu systému (root)."
+msgstr "Pre aktualizáciu repozitárov sú potrebné práva správcu systému (root)."
#: ../src/zypper.cc:1077
-#, fuzzy
msgid "Root privileges are required for installing or uninstalling packages."
-msgstr "Pre prácu so systémovými zdrojmi sú potrebné práva správcu systému (root)."
+msgstr "Pre inÅ¡taláciu alebo odstraÅovanie balÃÄkov sú potrebné práva správcu systému (root)."
#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
-#, fuzzy, c-format
+#, c-format
msgid "Unknown resolvable type: %s"
-msgstr "Neznámy typ balÃÄka "
+msgstr "Neznámy typ balÃÄka: %s"
#: ../src/zypper.cc:1109
-#, fuzzy
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
-msgstr "Pozor: Nie sú dostupné žiadne inÅ¡talaÄné zdroje. Pracujem len s nainÅ¡talovanými balÃÄkami. Nové balÃÄky nebude možné inÅ¡talovaÅ¥."
+msgstr "Pozor: Nie sú definované žiadne repozitáre. Pracujem len s nainÅ¡talovanými balÃÄkami. Nové balÃÄky nebude možné inÅ¡talovaÅ¥."
#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
-#, fuzzy
msgid "Generating solver test case..."
-msgstr "ÄÃtam metadáta z "
+msgstr "Generujem testovacà prÃpad pre solver závislostÃ..."
#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
-#, fuzzy
msgid "Solver test case generated successfully."
-msgstr "Modul \"%s\" bol úspeÅ¡ne naÄÃtaný."
+msgstr "Testovacà prÃpad pre solver závislostà bol úspeÅ¡ne vygenerovaný."
#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
-#, fuzzy
msgid "Error creating the solver test case."
-msgstr "Chyba pri ÄÃtanà sektoru %u."
+msgstr "Chyba pri vytváranà testovacieho prÃpadu pre solver závislostÃ."
#: ../src/zypper.cc:1156
-#, fuzzy
msgid "Source package name is a required argument."
-msgstr "Schéma URL je povinná"
+msgstr "Názov zdrojového balÃÄka je povinný argument."
#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Neznámy typ balÃÄka "
#: ../src/zypper.cc:1235
-#, fuzzy
msgid "No resolvables found."
-msgstr " balÃÄkov."
+msgstr "Žiadne objekty neboli nájdené."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
-msgstr ""
+msgstr "BežÃm v režime rug, nemôžem použiÅ¥ prÃstup 'najväÄÅ¡ej snahy' pre výber aktualizáciÃ."
#: ../src/zypper.cc:1397
-#, fuzzy
msgid "Root privileges are required for updating packages."
-msgstr "Pre prácu so systémovými zdrojmi sú potrebné práva správcu systému (root)."
+msgstr "Pre aktualizáciu balÃÄkov sú potrebné práva správcu systému (root)."
#: ../src/zypper.cc:1517
msgid "Unexpected exception."
@@ -1612,7 +1675,7 @@
#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
-msgstr ""
+msgstr "Už sa nachádzate v shelli zypperu."
#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
@@ -1625,9 +1688,9 @@
msgstr "Na adrese http://en.opensuse.org/Zypper#Troubleshooting nájdete návod ako na to."
#: ../src/zypper-command.cc:92
-#, fuzzy, c-format
+#, c-format
msgid "Unknown command '%s'"
-msgstr "Neznámy prÃkaz "
+msgstr "Neznámy prÃkaz '%s'"
# error box title
#: ../src/zypper-callbacks.h:42
@@ -1635,9 +1698,8 @@
msgstr "Chyba V/V"
#: ../src/zypper-callbacks.h:42
-#, fuzzy
msgid "Invalid object"
-msgstr "Nesprávny typ tabuľky "
+msgstr "Neplatný objekt"
#: ../src/zypper-callbacks.h:50
msgid "Error"
@@ -1646,98 +1708,91 @@
#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
-msgstr ""
+msgstr "ProsÃm vložte médium [%s] #%d a napÃÅ¡te 'a' pre pokraÄovanie alebo 'n' pre zruÅ¡enie operácie."
#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
-#, fuzzy
msgid "Downloading: "
-msgstr "SÅ¥ahujem %s"
+msgstr "SÅ¥ahujem: "
#. TranslatorExplanation This text is a progress display label e.g. "Downloading delta [42%]"
#: ../src/zypper-source-callbacks.h:97 ../src/zypper-source-callbacks.h:104
-#, fuzzy
msgid "Downloading delta"
-msgstr "SÅ¥ahujem %s"
+msgstr "SÅ¥ahujem delta balÃÄek"
#. TranslatorExplanation This text is a progress display label e.g. "Applying delta [42%]"
#: ../src/zypper-source-callbacks.h:125 ../src/zypper-source-callbacks.h:131
msgid "Applying delta"
-msgstr ""
+msgstr "Aplikujem delta balÃÄek"
#: ../src/zypper-source-callbacks.h:152
-#, fuzzy
msgid "Downloading patch rpm"
-msgstr "SÅ¥ahujem %s"
+msgstr "Sťahujem patch rpm (záplatu)"
#. TranslatorExplanation This text is a progress display label e.g. "Applying patch rpm [42%]"
#: ../src/zypper-source-callbacks.h:159
msgid "Applying patch rpm"
-msgstr ""
+msgstr "Aplikujem patch rpm (záplatu)"
#: ../src/zypper-source-callbacks.h:179
-#, fuzzy, c-format
+#, c-format
msgid "Downloading %s %s-%s.%s"
-msgstr "SÅ¥ahujem %s"
+msgstr "SÅ¥ahujem %s %s-%s.%s"
#. TranslatorExplanation %s is package size like "5.6 M"
#: ../src/zypper-source-callbacks.h:190
#, c-format
msgid "(%s unpacked)"
-msgstr ""
+msgstr "(%s po rozbalenÃ)"
#. TranslatorExplanation This text is a progress display label e.g. "Downloading [42%]"
#: ../src/zypper-source-callbacks.h:199
-#, fuzzy
msgid "Downloading"
-msgstr "SÅ¥ahujem %s"
+msgstr "SÅ¥ahujem"
#. TranslatorExplanation speaking of a script
#: ../src/zypper-rpm-callbacks.h:63
#, c-format
msgid "Running: %s (%s, %s)"
-msgstr ""
+msgstr "Spúšťam: %s (%s, %s)"
#: ../src/zypper-rpm-callbacks.h:117
-#, fuzzy
msgid "Reading installed packages"
-msgstr "InÅ¡talovaÅ¥ balÃky"
+msgstr "NaÄÃtavam nainÅ¡talované balÃÄky"
#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
-#, fuzzy
msgid "Removing "
-msgstr "Zlyhalo odstraÅovanie %s"
+msgstr "OdstraÅujem "
#: ../src/zypper-rpm-callbacks.h:155
-#, fuzzy, c-format
+#, c-format
msgid "Removal of %s failed:"
-msgstr "Zlyhalo odstraÅovanie %s"
+msgstr "OdstraÅovanie %s zlyhalo:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
-msgstr ""
+msgstr "(s --nodeps)"
#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
-msgstr ""
+msgstr "(s --nodeps --force)"
#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
-#, fuzzy, c-format
+#, c-format
msgid "Installing: %s-%s"
-msgstr "Inštalujem %s"
+msgstr "Inštalujem: %s-%s"
#: ../src/zypper-rpm-callbacks.h:215
-#, fuzzy, c-format
+#, c-format
msgid "Installation of %s failed:"
-msgstr "Inštalácia %s zlyhala"
+msgstr "Inštalácia %s zlyhala:"
#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Katalóg"
#: ../src/zypper-search.h:291
-#, fuzzy
msgid "Repository"
-msgstr "ÃroveÅ podrobnosti výstupu "
+msgstr "Repozitár"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7254 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 14 Sep '07
by mlandres＠svn.opensuse.org 14 Sep '07
14 Sep '07
Author: mlandres
Date: Fri Sep 14 23:14:12 2007
New Revision: 7254
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7254&view=rev
Log:
changes
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Fri Sep 14 23:14:12 2007
@@ -3,6 +3,7 @@
- Enable using patch and delta rpms. (#309124)
- version 3.24.0
+- revision 7253
-------------------------------------------------------------------
Thu Sep 13 17:59:55 CEST 2007 - ma(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7253 - in /trunk/libzypp: ./ devel/devel.ma/ package/ tests/cache/ zypp/cache/ zypp/cache/schema/ zypp/data/ zypp/parser/yum/ zypp/repo/ zypp/repo/cached/
by mlandres＠svn.opensuse.org 14 Sep '07
by mlandres＠svn.opensuse.org 14 Sep '07
14 Sep '07
Author: mlandres
Date: Fri Sep 14 23:13:47 2007
New Revision: 7253
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7253&view=rev
Log:
- Fixed YUM parser, database schema, RepoImpl, PatchRpm and DeltaRpm
to parse, store and provide patch/delta rpms name edition and architecture,
filtering incomatible archs.
- Fixed DeltaCandidates to filter patch/delta rpms that done match the target
packages NVRA.
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/devel/devel.ma/Parse.cc
trunk/libzypp/package/libzypp.changes
trunk/libzypp/tests/cache/CacheStore_test.cc
trunk/libzypp/zypp/cache/CacheStore.cc
trunk/libzypp/zypp/cache/schema/schema.sql
trunk/libzypp/zypp/data/ResolvableData.cc
trunk/libzypp/zypp/data/ResolvableData.h
trunk/libzypp/zypp/parser/yum/PatchFileReader.cc
trunk/libzypp/zypp/repo/DeltaCandidates.cc
trunk/libzypp/zypp/repo/PackageDelta.cc
trunk/libzypp/zypp/repo/PackageDelta.h
trunk/libzypp/zypp/repo/cached/RepoImpl.cc
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7253&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Fri Sep 14 23:13:47 2007
@@ -45,6 +45,6 @@
#
SET(LIBZYPP_MAJOR "3")
-SET(LIBZYPP_MINOR "23")
-SET(LIBZYPP_COMPATMINOR "23")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_MINOR "24")
+SET(LIBZYPP_COMPATMINOR "24")
+SET(LIBZYPP_PATCH "0")
Modified: trunk/libzypp/devel/devel.ma/Parse.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?…
==============================================================================
--- trunk/libzypp/devel/devel.ma/Parse.cc (original)
+++ trunk/libzypp/devel/devel.ma/Parse.cc Fri Sep 14 23:13:47 2007
@@ -59,10 +59,17 @@
const Edition & ed_r,
const Arch & arch_r )
{
- INT << name_r << "-" << ed_r << "." << arch_r << endl;
+ if ( ed_r == Edition::noedition )
+ return true;
+ if ( name_r == "kernel-default" && ed_r == Edition("2.6.22.5-10") )
+ return true;
+ if ( name_r == "update-test-affects-package-manager" && ed_r == Edition("1.1-6") )
+ return true;
+
return false;
}
+
ManagedFile repoProvidePackage( const PoolItem & pi )
{
ResPool _pool( getZYpp()->pool() );
@@ -528,7 +535,8 @@
repoManager.cleanCache( nrepo );
}
SEC << "refreshMetadata" << endl;
- repoManager.refreshMetadata( nrepo, RepoManager::RefreshForced );
+ //repoManager.refreshMetadata( nrepo, RepoManager::RefreshForced );
+ repoManager.refreshMetadata( nrepo );
SEC << "buildCache" << endl;
repoManager.buildCache( nrepo );
}
@@ -545,7 +553,7 @@
USR << "pool: " << pool << endl;
SEC << pool.knownRepositoriesSize() << endl;
- if ( 1 )
+ if ( 0 )
{
{
zypp::base::LogControl::TmpLineWriter shutUp;
@@ -563,9 +571,14 @@
DBG << "patch: " << deltas.patchRpms(0).size() << " " << deltas.patchRpms(0) << endl;
DBG << "delta: " << deltas.deltaRpms(0).size() << " " << deltas.deltaRpms(0) << endl;
+ PoolItem pi( getPi<Package>( "kernel-default", Edition("2.6.22.5-12") ) );
+ USR << pi << endl;
+ USR << repoProvidePackage( pi ) << endl;
- PoolItem pi( getPi<Package>( "kernel-default" ) );
+ pi = getPi<Package>( "update-test-affects-package-manager", Edition("99-99") );
USR << pi << endl;
+ USR << repoProvidePackage( pi ) << endl;
+
///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Fri Sep 14 23:13:47 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Sep 14 22:57:54 CEST 2007 - ma(a)suse.de
+
+- Enable using patch and delta rpms. (#309124)
+- version 3.24.0
+
+-------------------------------------------------------------------
Thu Sep 13 17:59:55 CEST 2007 - ma(a)suse.de
- On update do not delete unmaintained non-SuSE packages.
Modified: trunk/libzypp/tests/cache/CacheStore_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t…
==============================================================================
--- trunk/libzypp/tests/cache/CacheStore_test.cc (original)
+++ trunk/libzypp/tests/cache/CacheStore_test.cc Fri Sep 14 23:13:47 2007
@@ -467,7 +467,8 @@
// 22 packages and 6 patches
BOOST_CHECK_EQUAL( repositoryImpl->resolvables().size(), 42 );
// 19 patch rpms
- BOOST_CHECK_EQUAL( repositoryImpl->patchRpms().size(), 19 );
+ // but only 13 are compatible with x86_64_
+ BOOST_CHECK_EQUAL( repositoryImpl->patchRpms().size(), 13 );
//check_tables_clean(tmpdir);
}
Modified: trunk/libzypp/zypp/cache/CacheStore.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc…
==============================================================================
--- trunk/libzypp/zypp/cache/CacheStore.cc (original)
+++ trunk/libzypp/zypp/cache/CacheStore.cc Fri Sep 14 23:13:47 2007
@@ -122,13 +122,13 @@
count_shared_cmd.reset( new sqlite3_command( con, "select count(id) from resolvables where shared_id=:rid;" ));
insert_patchrpm_cmd.reset( new sqlite3_command (con,
- "insert into patch_packages (repository_id, media_nr, location, checksum, checksum_type, download_size, build_time) "
- "values (:repository_id, :media_nr, :location, :checksum, :checksum_type, :download_size, :build_time);" ));
+ "insert into patch_packages (repository_id, name, version, release, epoch, arch, media_nr, location, checksum, checksum_type, download_size, build_time) "
+ "values (:repository_id, :name, :version, :release, :epoch, :arch, :media_nr, :location, :checksum, :checksum_type, :download_size, :build_time);" ));
insert_deltarpm_cmd.reset( new sqlite3_command (con,
- "insert into delta_packages (repository_id, media_nr, location, checksum, checksum_type, download_size, build_time, "
+ "insert into delta_packages (repository_id, name, version, release, epoch, arch, media_nr, location, checksum, checksum_type, download_size, build_time, "
"baseversion_version, baseversion_release, baseversion_epoch, baseversion_checksum, "
"baseversion_build_time, baseversion_sequence_info) "
- "values (:repository_id, :media_nr, :location, :checksum, :checksum_type, :download_size, :build_time, "
+ "values (:repository_id, :name, :version, :release, :epoch, :arch, :media_nr, :location, :checksum, :checksum_type, :download_size, :build_time, "
":baseversion_version, :baseversion_release, :baseversion_epoch, :baseversion_checksum, "
":baseversion_build_time, :baseversion_sequence_info);" ));
append_patch_baseversion_cmd.reset( new sqlite3_command (con,
@@ -743,12 +743,18 @@
{
RecordId id;
- //! \todo what's this? _pimpl->insert_patchrpm_cmd->bind(":media_nr", ???);
_pimpl->insert_patchrpm_cmd->bind(":repository_id", repository_id);
+
+ _pimpl->insert_patchrpm_cmd->bind(":name", prpm->name);
+ _pimpl->insert_patchrpm_cmd->bind(":version", prpm->edition.version());
+ _pimpl->insert_patchrpm_cmd->bind(":release", prpm->edition.release());
+ _pimpl->insert_patchrpm_cmd->bind(":epoch", (int) prpm->edition.epoch());
+ _pimpl->insert_patchrpm_cmd->bind(":arch", lookupOrAppendType("arch", prpm->arch.asString()));
+
+ _pimpl->insert_patchrpm_cmd->bind(":media_nr", (int) prpm->location.medianr());
_pimpl->insert_patchrpm_cmd->bind(":location", prpm->location.filename().asString());
_pimpl->insert_patchrpm_cmd->bind(":checksum", prpm->location.checksum().checksum());
_pimpl->insert_patchrpm_cmd->bind(":checksum_type", prpm->location.checksum().type());
- //! \todo checksum type
_pimpl->insert_patchrpm_cmd->bind(":download_size", static_cast<ByteCount::SizeType>(prpm->location.downloadSize()));
_pimpl->insert_patchrpm_cmd->bind(":build_time", prpm->buildTime.asSeconds());
_pimpl->insert_patchrpm_cmd->executenonquery();
@@ -774,13 +780,19 @@
{
RecordId id;
- //! \todo what's this? _pimpl->insert_deltarpm_cmd->bind(":media_nr", ???);
_pimpl->insert_deltarpm_cmd->bind(":repository_id", repository_id);
+
+ _pimpl->insert_deltarpm_cmd->bind(":name", drpm->name);
+ _pimpl->insert_deltarpm_cmd->bind(":version", drpm->edition.version());
+ _pimpl->insert_deltarpm_cmd->bind(":release", drpm->edition.release());
+ _pimpl->insert_deltarpm_cmd->bind(":epoch", (int) drpm->edition.epoch());
+ _pimpl->insert_deltarpm_cmd->bind(":arch", lookupOrAppendType("arch", drpm->arch.asString()));
+
+ _pimpl->insert_deltarpm_cmd->bind(":media_nr", (int) drpm->location.medianr());
_pimpl->insert_deltarpm_cmd->bind(":location", drpm->location.filename().asString());
_pimpl->insert_deltarpm_cmd->bind(":checksum", drpm->location.checksum().checksum());
_pimpl->insert_deltarpm_cmd->bind(":checksum", drpm->location.checksum().checksum());
_pimpl->insert_deltarpm_cmd->bind(":checksum_type", drpm->location.checksum().type());
- //! \todo checksum type
_pimpl->insert_deltarpm_cmd->bind(":download_size", static_cast<ByteCount::SizeType>(drpm->location.downloadSize()));
_pimpl->insert_deltarpm_cmd->bind(":build_time", drpm->buildTime.asSeconds());
Modified: trunk/libzypp/zypp/cache/schema/schema.sql
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/schema/schema…
==============================================================================
--- trunk/libzypp/zypp/cache/schema/schema.sql (original)
+++ trunk/libzypp/zypp/cache/schema/schema.sql Fri Sep 14 23:13:47 2007
@@ -166,6 +166,11 @@
CREATE TABLE delta_packages (
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
+ , name TEXT
+ , version TEXT
+ , release TEXT
+ , epoch INTEGER
+ , arch INTEGER REFERENCES types(id)
, media_nr INTEGER
, location TEXT
, checksum TEXT
@@ -185,6 +190,11 @@
CREATE TABLE patch_packages (
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
+ , name TEXT
+ , version TEXT
+ , release TEXT
+ , epoch INTEGER
+ , arch INTEGER REFERENCES types(id)
, media_nr INTEGER
, location TEXT
, checksum TEXT
@@ -319,7 +329,7 @@
DELETE FROM file_capabilities WHERE resolvable_id = old.id;
DELETE FROM split_capabilities WHERE resolvable_id = old.id;
DELETE FROM other_capabilities WHERE resolvable_id = old.id;
-
+
DELETE FROM text_attributes WHERE weak_resolvable_id = old.id;
DELETE FROM numeric_attributes WHERE weak_resolvable_id = old.id;
DELETE FROM resolvable_disk_usage WHERE resolvable_id = old.id;
Modified: trunk/libzypp/zypp/data/ResolvableData.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData…
==============================================================================
--- trunk/libzypp/zypp/data/ResolvableData.cc (original)
+++ trunk/libzypp/zypp/data/ResolvableData.cc Fri Sep 14 23:13:47 2007
@@ -49,5 +49,12 @@
// << " enhances:" << endl << enhances << endl
}
+
+std::ostream & RpmBase::dumpOn( std::ostream & str ) const
+{
+ str << "Patch/Delta[ " << name << " " << edition << " " << arch << " ]";
+ return str;
+}
+
} // namespace cache
} // namespace zypp
Modified: trunk/libzypp/zypp/data/ResolvableData.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData…
==============================================================================
--- trunk/libzypp/zypp/data/ResolvableData.h (original)
+++ trunk/libzypp/zypp/data/ResolvableData.h Fri Sep 14 23:13:47 2007
@@ -368,18 +368,16 @@
{
// Base <patchrpm>/<deltarpm> element attributes
- Arch attr_arch;
- std::string attr_filename;
- std::string attr_md5sum;
- ByteCount attr_downloadSize;
- Date attr_buildTime;
-
- // Shared RPM data
-
+ std::string name; // target rpm name
+ Edition edition; // target rpm edition
+ Arch arch; // target rpm architecture
OnMediaLocation location;
- Date buildTime;
- Date fileTime;
- ByteCount archiveSize; // ??
+ Date buildTime;
+ Date fileTime;
+ ByteCount archiveSize; // ??
+ protected:
+ /** Overload to realize std::ostream & operator\<\<. */
+ virtual std::ostream & dumpOn( std::ostream & str ) const;
};
DEFINE_PTR_TYPE(PatchRpm);
Modified: trunk/libzypp/zypp/parser/yum/PatchFileReader.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/yum/PatchFil…
==============================================================================
--- trunk/libzypp/zypp/parser/yum/PatchFileReader.cc (original)
+++ trunk/libzypp/zypp/parser/yum/PatchFileReader.cc Fri Sep 14 23:13:47 2007
@@ -16,6 +16,7 @@
#include "zypp/parser/yum/PatchFileReader.h"
#include "zypp/parser/yum/FileReaderBaseImpl.h"
+#include "zypp/ZConfig.h"
#undef ZYPP_BASE_LOGGER_LOGGROUP
#define ZYPP_BASE_LOGGER_LOGGROUP "parser::yum"
@@ -481,8 +482,16 @@
data::PatchRpm_Ptr tmp;
tmp.swap(_patchrpm);
data::PackageAtom_Ptr patom_ptr = zypp::dynamic_pointer_cast<data::PackageAtom>(_tmpResObj);
- if (patom_ptr)
+ if (patom_ptr && patom_ptr->arch.compatibleWith( ZConfig::instance().systemArchitecture() ))
+ {
+ // Patch and delta rpms are standalone objects.
+ // We must store the target packages NVRA.
+ // We don't store incompatible archs.
+ tmp->name = patom_ptr->name;
+ tmp->edition = patom_ptr->edition;
+ tmp->arch = patom_ptr->arch;
patom_ptr->patchRpms.insert(tmp);
+ }
toParentTag();
return true;
}
@@ -493,8 +502,16 @@
data::DeltaRpm_Ptr tmp;
tmp.swap(_deltarpm);
data::PackageAtom_Ptr patom_ptr = zypp::dynamic_pointer_cast<data::PackageAtom>(_tmpResObj);
- if (patom_ptr)
+ if (patom_ptr && patom_ptr->arch.compatibleWith( ZConfig::instance().systemArchitecture() ))
+ {
+ // Patch and delta rpms are standalone objects.
+ // We must store the target packages NVRA.
+ // We don't store incompatible archs.
+ tmp->name = patom_ptr->name;
+ tmp->edition = patom_ptr->edition;
+ tmp->arch = patom_ptr->arch;
patom_ptr->deltaRpms.insert(tmp);
+ }
toParentTag();
return true;
}
Modified: trunk/libzypp/zypp/repo/DeltaCandidates.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/DeltaCandidate…
==============================================================================
--- trunk/libzypp/zypp/repo/DeltaCandidates.cc (original)
+++ trunk/libzypp/zypp/repo/DeltaCandidates.cc Fri Sep 14 23:13:47 2007
@@ -27,18 +27,18 @@
{
public:
-
+
Impl( const std::list<Repository> & repos )
: repos(repos)
{
-
+
}
friend Impl * rwcowClone<Impl>( const Impl * rhs );
/** clone for RWCOW_pointer */
Impl * clone() const
{ return new Impl( *this ); }
-
+
std::list<Repository> repos;
};
///////////////////////////////////////////////////////////////////
@@ -59,7 +59,7 @@
std::list<PatchRpm> DeltaCandidates::patchRpms(const Package::constPtr & package ) const
{
std::list<PatchRpm> candidates;
-
+
// query all repos
for ( std::list<Repository>::const_iterator it = _pimpl->repos.begin();
it != _pimpl->repos.end();
@@ -71,17 +71,22 @@
dit != candidates_in_repo.end();
++dit )
{
- PatchRpm delta(*dit);
- candidates.push_back(delta);
+ if ( ! package
+ || ( package->name() == dit->name()
+ && package->edition() == dit->edition()
+ && package->arch() == dit->arch() ) )
+ {
+ candidates.push_back( *dit );
+ }
}
}
return candidates;
}
-
+
std::list<DeltaRpm> DeltaCandidates::deltaRpms(const Package::constPtr & package) const
{
std::list<DeltaRpm> candidates;
-
+
// query all repos
for ( std::list<Repository>::const_iterator it = _pimpl->repos.begin();
it != _pimpl->repos.end();
@@ -93,13 +98,18 @@
dit != candidates_in_repo.end();
++dit )
{
- DeltaRpm delta(*dit);
- candidates.push_back(delta);
+ if ( ! package
+ || ( package->name() == dit->name()
+ && package->edition() == dit->edition()
+ && package->arch() == dit->arch() ) )
+ {
+ candidates.push_back( *dit );
+ }
}
}
return candidates;
}
-
+
std::ostream & operator<<( std::ostream & str, const DeltaCandidates & obj )
{
return str << *obj._pimpl;
Modified: trunk/libzypp/zypp/repo/PackageDelta.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageDelta.c…
==============================================================================
--- trunk/libzypp/zypp/repo/PackageDelta.cc (original)
+++ trunk/libzypp/zypp/repo/PackageDelta.cc Fri Sep 14 23:13:47 2007
@@ -28,7 +28,8 @@
std::ostream & operator<<( std::ostream & str, const PatchRpm & obj )
{
str
- << "PatchRpm(" << obj.location()
+ << "PatchRpm[" << obj.name() << "-" << obj.edition() << "." << obj.arch()
+ << "](" << obj.location()
<< '|' << obj.buildtime()
<< '|';
return dumpRangeLine( str, obj.baseversions().begin(), obj.baseversions().end() )
@@ -38,7 +39,8 @@
std::ostream & operator<<( std::ostream & str, const DeltaRpm & obj )
{
return str
- << "DeltaRpm(" << obj.location()
+ << "DeltaRpm[" << obj.name() << "-" << obj.edition() << "." << obj.arch()
+ << "](" << obj.location()
<< '|' << obj.buildtime()
<< '|' << obj.baseversion().edition()
<< ',' << obj.baseversion().buildtime()
Modified: trunk/libzypp/zypp/repo/PackageDelta.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageDelta.h…
==============================================================================
--- trunk/libzypp/zypp/repo/PackageDelta.h (original)
+++ trunk/libzypp/zypp/repo/PackageDelta.h Fri Sep 14 23:13:47 2007
@@ -17,6 +17,7 @@
#include "zypp/OnMediaLocation.h"
#include "zypp/Edition.h"
+#include "zypp/Arch.h"
#include "zypp/Date.h"
///////////////////////////////////////////////////////////////////
@@ -28,6 +29,7 @@
///////////////////////////////////////////////////////////////////
+ /** \todo cheap copy! (switch to RWCOW) */
class PatchRpm
{
public:
@@ -39,17 +41,29 @@
{}
public:
+ /** \name Target package ident. */
+ //@{
+ const std::string & name() const { return _name; }
+ const Edition & edition() const { return _edition; }
+ const Arch & arch() const { return _arch; }
+ //@}
const OnMediaLocation & location() const { return _location; }
const BaseVersions & baseversions() const { return _baseversions; }
const Date & buildtime() const { return _buildtime;}
public:
+ PatchRpm & setName( const std::string & val_r ) { _name = val_r; return *this; }
+ PatchRpm & setEdition( const Edition & val_r ) { _edition = val_r; return *this; }
+ PatchRpm & setArch( const Arch & val_r ) { _arch = val_r; return *this; }
PatchRpm & setLocation( const OnMediaLocation & val_r ) { _location = val_r; return *this; }
PatchRpm & setBaseversions( const BaseVersions & val_r ){ _baseversions = val_r; return *this; }
PatchRpm & addBaseversion( const BaseVersion & val_r ) { _baseversions.push_back( val_r ); return *this; }
PatchRpm & setBuildtime( const Date & val_r ) { _buildtime = val_r; return *this; }
private:
+ std::string _name;
+ Edition _edition;
+ Arch _arch;
OnMediaLocation _location;
BaseVersions _baseversions;
Date _buildtime;
@@ -60,6 +74,7 @@
///////////////////////////////////////////////////////////////////
+ /** \todo cheap copy! (switch to RWCOW) */
class DeltaRpm
{
public:
@@ -95,16 +110,28 @@
{}
public:
+ /** \name Target package ident. */
+ //@{
+ const std::string & name() const { return _name; }
+ const Edition & edition() const { return _edition; }
+ const Arch & arch() const { return _arch; }
+ //@}
const OnMediaLocation & location() const { return _location; }
const BaseVersion & baseversion() const { return _baseversion; }
const Date & buildtime() const { return _buildtime;}
public:
+ DeltaRpm & setName( const std::string & val_r ) { _name = val_r; return *this; }
+ DeltaRpm & setEdition( const Edition & val_r ) { _edition = val_r; return *this; }
+ DeltaRpm & setArch( const Arch & val_r ) { _arch = val_r; return *this; }
DeltaRpm & setLocation( const OnMediaLocation & val_r ) { _location = val_r; return *this; }
DeltaRpm & setBaseversion( const BaseVersion & val_r ) { _baseversion = val_r; return *this; }
DeltaRpm & setBuildtime( const Date & val_r ) { _buildtime = val_r; return *this; }
private:
+ std::string _name;
+ Edition _edition;
+ Arch _arch;
OnMediaLocation _location;
BaseVersion _baseversion;
Date _buildtime;
Modified: trunk/libzypp/zypp/repo/cached/RepoImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/RepoImp…
==============================================================================
--- trunk/libzypp/zypp/repo/cached/RepoImpl.cc (original)
+++ trunk/libzypp/zypp/repo/cached/RepoImpl.cc Fri Sep 14 23:13:47 2007
@@ -187,59 +187,62 @@
con.executenonquery("PRAGMA cache_size=8000;");
con.executenonquery("BEGIN;");
- string pp_query =
- // 0 1 2 3 4 5
- "SELECT id, media_nr, location, checksum, checksum_type, download_size, build_time "
- "FROM patch_packages WHERE repository_id=:repository_id;";
-
- string pp_bv_query =
- "SELECT version, release, epoch "
- "FROM patch_packages_baseversions WHERE patch_package_id = :patch_package_id";
-
- string delta_query =
- // 0 1 2 3 4 5 6 7 8 9 10 11
- "SELECT id, media_nr, location, checksum, checksum_type, download_size, build_time, baseversion_version, baseversion_release, baseversion_epoch, baseversion_checksum, baseversion_checksum_type, baseversion_build_time "
- // 11
- ", baseversion_sequence_info "
- "FROM delta_packages WHERE repository_id=:repository_id;";
-
+ // Refer to the enum when retrieving the data from reader.
+
+ enum pp_query_val { pp_id, pp_name, pp_version, pp_release, pp_epoch, pp_arch, pp_media_nr, pp_location, pp_checksum, pp_checksum_type, pp_download_size, pp_build_time };
+ string pp_query = "SELECT id, name, version, release, epoch, arch, media_nr, location, checksum, checksum_type, download_size, build_time "
+
+ "FROM patch_packages WHERE repository_id=:repository_id;";
+
+ enum pp_bv_query_val { pp_bv_version, pp_bv_release, pp_bv_epoch };
+ string pp_bv_query = "SELECT version, release, epoch "
+
+ "FROM patch_packages_baseversions WHERE patch_package_id = :patch_package_id";
+
+ enum dp_query_val { dp_id, dp_name, dp_version, dp_release, dp_epoch, dp_arch, dp_media_nr, dp_location, dp_checksum, dp_checksum_type, dp_download_size, dp_build_time, dp_baseversion_version, dp_baseversion_release, dp_baseversion_epoch, dp_baseversion_checksum, dp_baseversion_checksum_type, dp_baseversion_build_time, dp_baseversion_sequence_info };
+ string dp_query = "SELECT id, name, version, release, epoch, arch, media_nr, location, checksum, checksum_type, download_size, build_time, baseversion_version, baseversion_release, baseversion_epoch, baseversion_checksum, baseversion_checksum_type, baseversion_build_time, baseversion_sequence_info "
+
+ "FROM delta_packages WHERE repository_id=:repository_id;";
+
{
// bind the master repo id to the query
- sqlite3_command deltas_cmd( con, delta_query);
+ sqlite3_command deltas_cmd( con, dp_query);
deltas_cmd.bind(":repository_id", _options.repository_id);
sqlite3_reader reader = deltas_cmd.executereader();
while ( reader.read() )
{
- zypp::OnMediaLocation on_media( reader.getstring(2), reader.getint(1) );
-
- string checksum_string(reader.getstring(3));
- CheckSum checksum(reader.getstring(4), reader.getstring(3));
+ zypp::OnMediaLocation on_media( reader.getstring(dp_location), reader.getint(dp_media_nr) );
+
+ CheckSum checksum(reader.getstring(dp_checksum_type), reader.getstring(dp_checksum));
if ( checksum.empty() )
{
ERR << "Wrong checksum for delta, skipping..." << endl;
continue;
}
on_media.setChecksum(checksum);
- on_media.setDownloadSize(reader.getint(5));
-
+ on_media.setDownloadSize(reader.getint(dp_download_size));
+
packagedelta::DeltaRpm::BaseVersion baseversion;
- baseversion.setEdition( Edition(reader.getstring(7), reader.getstring(8), reader.getstring(9) ) );
-
- checksum = CheckSum(reader.getstring(11), reader.getstring(10));
+ baseversion.setEdition( Edition(reader.getstring(dp_baseversion_version), reader.getstring(dp_baseversion_release), reader.getstring(dp_baseversion_epoch) ) );
+
+ checksum = CheckSum(reader.getstring(dp_baseversion_checksum_type), reader.getstring(dp_baseversion_checksum));
if ( checksum.empty() )
{
ERR << "Wrong checksum for delta, skipping..." << endl;
continue;
}
baseversion.setChecksum(checksum);
- baseversion.setBuildtime(reader.getint(12));
- baseversion.setSequenceinfo(reader.getstring(13));
-
+ baseversion.setBuildtime(reader.getint(dp_baseversion_build_time));
+ baseversion.setSequenceinfo(reader.getstring(dp_baseversion_sequence_info));
+
zypp::packagedelta::DeltaRpm delta;
+ delta.setName ( reader.getstring(dp_name) );
+ delta.setEdition( Edition( reader.getstring(dp_version), reader.getstring(dp_release), reader.getint(dp_epoch) ) );
+ delta.setArch ( _type_cache.archFor( reader.getint(dp_arch) ) );
delta.setLocation( on_media );
delta.setBaseversion( baseversion );
- delta.setBuildtime(reader.getint(6));
-
+ delta.setBuildtime(reader.getint(dp_build_time));
+
_deltaRpms.push_back(delta);
}
reader.close();
@@ -252,40 +255,45 @@
sqlite3_command pp_bv_cmd( con, pp_bv_query);
pp_cmd.bind(":repository_id", _options.repository_id);
sqlite3_reader reader = pp_cmd.executereader();
-
+
while ( reader.read() )
{
//MIL << "Addining patch rpm " << endl;
- long long patch_package_id = reader.getint64(0);
-
- zypp::OnMediaLocation on_media( reader.getstring(2), reader.getint(1) );
-
- CheckSum checksum(reader.getstring(4), reader.getstring(3));
+ long long patch_package_id = reader.getint64(pp_id);
+
+ zypp::OnMediaLocation on_media( reader.getstring(pp_location), reader.getint(pp_media_nr) );
+
+ CheckSum checksum(reader.getstring(pp_checksum_type), reader.getstring(pp_checksum));
if ( checksum.empty() )
{
ERR << "Wrong checksum for delta, skipping..." << endl;
continue;
}
on_media.setChecksum(checksum);
- on_media.setDownloadSize(reader.getint(5));
-
+ on_media.setDownloadSize(reader.getint(pp_download_size));
+
zypp::packagedelta::PatchRpm patch;
+ patch.setName ( reader.getstring(pp_name) );
+ patch.setEdition( Edition( reader.getstring(pp_version), reader.getstring(pp_release), reader.getint(pp_epoch) ) );
+ patch.setArch ( _type_cache.archFor( reader.getint(pp_arch) ) );
patch.setLocation( on_media );
- patch.setBuildtime(reader.getint(6));
-
+ patch.setBuildtime(reader.getint(pp_build_time));
+
pp_bv_cmd.bind( ":patch_package_id", patch_package_id );
-
+
sqlite3_reader bv_reader = pp_bv_cmd.executereader();
while (bv_reader.read())
{
//MIL << " * Adding baseversion " << endl;
- packagedelta::PatchRpm::BaseVersion baseversion = packagedelta::PatchRpm::BaseVersion( bv_reader.getstring(0) , bv_reader.getstring(1), bv_reader.getint(2) );
+ packagedelta::PatchRpm::BaseVersion baseversion = packagedelta::PatchRpm::BaseVersion( bv_reader.getstring(pp_bv_version) ,
+ bv_reader.getstring(pp_bv_release),
+ bv_reader.getint(pp_bv_epoch) );
patch.addBaseversion(baseversion);
}
-
+
bv_reader.close();
-
- _patchRpms.push_back(patch);
+
+ _patchRpms.push_back(patch);
}
reader.close();
MIL << _patchRpms.size() << " patch rpms read." << endl;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0