Author: tgoettlicher
Date: Wed Aug 8 16:52:45 2007
New Revision: 6530
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6530&view=rev
Log:
- some text changes
- pot file update
Modified:
trunk/updater-kde/po/createPot
trunk/updater-kde/po/opensuseupdater.pot
trunk/updater-kde/updater/HeaderWidget.cpp
trunk/updater-kde/updater/HeaderWidget.h
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/opensuseupdater_settings.kcfg
Modified: trunk/updater-kde/po/createPot
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/createPot?rev=6530&r1=6529&r2=6530&view=diff
==============================================================================
--- trunk/updater-kde/po/createPot (original)
+++ trunk/updater-kde/po/createPot Wed Aug 8 16:52:45 2007
@@ -1,5 +1,8 @@
#!/bin/bash
+extractrc ../updater/*.ui ../updater/*.kcfg >> rc.cpp
+
+
# search for sourcecode-files
SRCFILES=`find .. -type d -name testsuite -prune , \
-type f -name "*.h" \
@@ -7,6 +10,7 @@
-o -name "*.c" \
-o -name "*.cc" \
-o -name "*.cpp"`
+
echo $SRCFILES
#calling xgettext with the sourcefiles
xgettext --no-wrap --add-comments --add-location --keyword=i18n --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=opensuseupdater --output=opensuseupdater.pot $SRCFILES
Modified: trunk/updater-kde/po/opensuseupdater.pot
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/opensuseupdater.pot?rev=6530&r1=6529&r2=6530&view=diff
==============================================================================
--- trunk/updater-kde/po/opensuseupdater.pot (original)
+++ trunk/updater-kde/po/opensuseupdater.pot Wed Aug 8 16:52:45 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-12 19:46-0400\n"
+"POT-Creation-Date: 2007-08-08 16:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,43 +16,104 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../kxmlrpcclient/kxmlrpcquery.cpp:131
-msgid "Received invalid XML markup: %1 at %2:%3"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 16
+#: ../po/rc.cpp:3 ../po/rc.cpp:48
+#, no-c-format
+msgid "Form1"
msgstr ""
-#: ../kxmlrpcclient/kxmlrpcquery.cpp:141
-msgid "Unknown type of XML markup received"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 29
+#: ../po/rc.cpp:6 ../po/rc.cpp:51
+#, no-c-format
+msgid "Check For Updates Every "
msgstr ""
-#: ../udshttp/udshttp.cpp:128
-msgid "There were errors getting data from job"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 32
+#: ../po/rc.cpp:9 ../po/rc.cpp:54
+#, no-c-format
+msgid " Hours"
msgstr ""
-#: ../udshttp/udshttp.cpp:270
-msgid "Timeout on server"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 44
+#: ../po/rc.cpp:12 ../po/rc.cpp:57
+#, no-c-format
+msgid "Show recurring notification every "
msgstr ""
-#: ../udshttp/udshttp.cpp:285
-msgid "Bad url"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 47
+#: ../po/rc.cpp:15 ../po/rc.cpp:60
+#, no-c-format
+msgid " Minutes when updates are available"
msgstr ""
-#: ../udshttp/udshttp.cpp:392
-msgid "Unauthorized access"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 58
+#: ../po/rc.cpp:18 ../po/rc.cpp:63
+#, no-c-format
+msgid "Automa&tically start updater on login"
msgstr ""
-#: ../udshttp/udshttp.cpp:395 ../udshttp/udshttp.cpp:397
-msgid "URL Invalid"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 61
+#: ../po/rc.cpp:21 ../po/rc.cpp:66
+#, no-c-format
+msgid "Alt+T"
msgstr ""
-#: ../udshttp/udshttp.cpp:400
-msgid "Server Error"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 70
+#: ../po/rc.cpp:24 ../po/rc.cpp:69
+#, no-c-format
+msgid "Show available upgrades when backend provides them (for experts only)"
msgstr ""
-#: ../udshttp/udshttp.cpp:403
-msgid "Service unavailable"
+#. i18n: file ../updater/ConfigWidgetUI.ui line 73
+#: ../po/rc.cpp:27 ../po/rc.cpp:72
+#, no-c-format
+msgid "Alt+U"
+msgstr ""
+
+#. i18n: file ../updater/ConfigWidgetUI.ui line 87
+#: ../po/rc.cpp:30 ../po/rc.cpp:75
+#, no-c-format
+msgid "Backend:"
+msgstr ""
+
+#. i18n: file ../updater/opensuseupdater_settings.kcfg line 7
+#: ../po/rc.cpp:33 ../po/rc.cpp:78
+#, no-c-format
+msgid "How often to check for updates."
msgstr ""
-#: ../updater/simpleview.cpp:37 ../updater/simpleview.cpp:183
+#. i18n: file ../updater/opensuseupdater_settings.kcfg line 11
+#: ../po/rc.cpp:36
+#, no-c-format
+msgid "How otfen show recurring warning when updates are available."
+msgstr ""
+
+#. i18n: file ../updater/opensuseupdater_settings.kcfg line 15
+#: ../po/rc.cpp:39 ../po/rc.cpp:84
+#, no-c-format
+msgid "Automatically start the applet on login"
+msgstr ""
+
+#. i18n: file ../updater/opensuseupdater_settings.kcfg line 19
+#: ../po/rc.cpp:42 ../po/rc.cpp:87
+#, no-c-format
+msgid "The backend for connecting to package database."
+msgstr ""
+
+#. i18n: file ../updater/opensuseupdater_settings.kcfg line 22
+#: ../po/rc.cpp:45 ../po/rc.cpp:90
+#, no-c-format
+msgid "Show available upgrades (for experts only)."
+msgstr ""
+
+#. i18n: file ../updater/opensuseupdater_settings.kcfg line 11
+#: ../po/rc.cpp:81
+#, no-c-format
+msgid "How often show recurring warning when updates are available."
+msgstr ""
+
+#: ../updater/simpleview.cpp:37 ../updater/simpleview.cpp:193
+#: ../updater/simpleview.cpp:210
msgid "<b>New software for your system is available</b>"
msgstr ""
@@ -60,7 +121,7 @@
msgid "Choose the updates to be installed:"
msgstr ""
-#: ../updater/simpleview.cpp:48 ../updater/simpleview.cpp:188
+#: ../updater/simpleview.cpp:48 ../updater/simpleview.cpp:215
msgid "Install %1 recommeded updates additionally"
msgstr ""
@@ -70,11 +131,11 @@
#. -------------------- Buttons ------------------------
#: ../updater/simpleview.cpp:61
-msgid "Details ..."
+msgid "Details"
msgstr ""
#: ../updater/simpleview.cpp:65 ../updater/osupdaterpopup.cpp:73
-#: ../updater/MainWindow.cpp:81 ../updater/MainWindow.cpp:207
+#: ../updater/MainWindow.cpp:79 ../updater/MainWindow.cpp:205
msgid "Install"
msgstr ""
@@ -82,27 +143,71 @@
msgid "Close"
msgstr ""
-#: ../updater/simpleview.cpp:146
+#: ../updater/simpleview.cpp:157
msgid "<b>Checking for updates...</b>"
msgstr ""
-#: ../updater/simpleview.cpp:158
+#: ../updater/simpleview.cpp:169
msgid "<b>Error:</b>"
msgstr ""
-#: ../updater/simpleview.cpp:170
+#: ../updater/simpleview.cpp:181
msgid "<b>No Updates Available</b>"
msgstr ""
-#: ../updater/simpleview.cpp:184
+#: ../updater/simpleview.cpp:194
+msgid "Updates that affect your updater itself are available."
+msgstr ""
+
+#: ../updater/simpleview.cpp:211
msgid "%1 security updates are available"
msgstr ""
-#: ../updater/simpleview.cpp:207
+#: ../updater/simpleview.cpp:234
msgid "<b>Updating...</b>"
msgstr ""
-#: ../updater/zypp/ZYppUpdater.cpp:112 ../updater/zypp/ZYppUpdater.cpp:114
+#: ../updater/simpleview.cpp:246
+msgid "<b>Unable to check whether updates are available.</b>"
+msgstr ""
+
+#: ../updater/simpleview.cpp:247
+msgid ""
+"Please use \"Add/Remove Update Sources...\"\n"
+"from the tray icon menu to define a update repository."
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:82
+msgid ""
+"Backend plugin is not properly configured.\n"
+"Please use the configuration dialog to choose the correct one."
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:111
+msgid "Unable to load plugin. ErrNoServiceFound"
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:115
+msgid "Unable to load plugin. ErrServiceProvidesNoLibrary"
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:119
+msgid "Unable to load plugin. ErrNoLibrary: %1"
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:123
+msgid "Unable to load plugin. ErrNoFactory"
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:127
+msgid "Unable to load plugin. ErrNoComponent"
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:131
+msgid "Unable to load plugin. Unknown Error"
+msgstr ""
+
+#: ../updater/zypp/ZYppUpdater.cpp:166 ../updater/zypp/ZYppUpdater.cpp:168
#: ../updater/zypp_traditional/ZYppUpdater.cpp:131
#: ../updater/zypp_traditional/ZYppUpdater.cpp:133
msgid ""
@@ -110,17 +215,25 @@
"%1"
msgstr ""
-#: ../updater/zypp/ZYppUpdater.cpp:230
+#: ../updater/zypp/ZYppUpdater.cpp:297
#: ../updater/zypp_traditional/ZYppUpdater.cpp:233
msgid "Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper package is installed and working."
msgstr ""
-#: ../updater/zypp/ZYppUpdater.cpp:331
+#: ../updater/zypp/ZYppUpdater.cpp:371 ../updater/zypp/ZYppUpdater.cpp:394
+msgid "License of %1"
+msgstr ""
+
+#: ../updater/zypp/ZYppUpdater.cpp:425
msgid "Can't launch install helper program. Make sure zypper package is installed and working."
msgstr ""
-#: ../updater/progresspopup.cpp:25
-msgid "<b>Updating ...<b>"
+#: ../updater/zypp/licensedialog.cpp:25
+msgid "Accept"
+msgstr ""
+
+#: ../updater/zypp/licensedialog.cpp:26
+msgid "Decline"
msgstr ""
#: ../updater/osupdaterpopup.cpp:74
@@ -163,132 +276,152 @@
msgid "%1 Patches and %2 Packages available"
msgstr ""
-#: ../updater/MainWindow.cpp:78 ../updater/MainWindow.cpp:204
+#: ../updater/progresspopup.cpp:25
+msgid "<b>Updating ...<b>"
+msgstr ""
+
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:165
+msgid "Security"
+msgstr ""
+
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:165
+#: ../updater/zmd/ZmdUpdater.cpp:410
+msgid "Patch"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:53 ../updater/TrayIcon.cpp:127
+msgid "New software for your system is available"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:82
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:87
+msgid "Error:\n"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:92
+msgid "No Updates Available"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:96 ../updater/TrayIcon.cpp:103
+msgid "New software updates are available."
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:110
+msgid "Updating..."
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:114
+msgid "Unable to check whether updates are available."
+msgstr ""
+
+#: ../updater/HeaderWidget.cpp:36
+msgid "<h2>Available Updates</h2>"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:76
msgid "Add/Remove Update Sources..."
msgstr ""
-#: ../updater/MainWindow.cpp:79
+#: ../updater/MainWindow.cpp:77
msgid "Configure Applet..."
msgstr ""
-#: ../updater/MainWindow.cpp:80
+#: ../updater/MainWindow.cpp:78
msgid "Check Now"
msgstr ""
-#: ../updater/MainWindow.cpp:120
-msgid "<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>"
-msgstr ""
-
-#: ../updater/MainWindow.cpp:129
-msgid "The following are software patches to fix bugs."
+#: ../updater/MainWindow.cpp:127
+msgid "The following official patches for openSUSE either fix security holes or serious errors in the software.<br>Installing them is highly recommended."
msgstr ""
-#: ../updater/MainWindow.cpp:131 ../updater/MainWindow.cpp:169
+#: ../updater/MainWindow.cpp:130 ../updater/MainWindow.cpp:168
msgid "Name"
msgstr ""
-#: ../updater/MainWindow.cpp:133 ../updater/MainWindow.cpp:171
+#: ../updater/MainWindow.cpp:132 ../updater/MainWindow.cpp:170
msgid "Summary"
msgstr ""
-#: ../updater/MainWindow.cpp:134 ../updater/MainWindow.cpp:172
+#: ../updater/MainWindow.cpp:133 ../updater/MainWindow.cpp:171
msgid "Type"
msgstr ""
-#: ../updater/MainWindow.cpp:135 ../updater/MainWindow.cpp:173
+#: ../updater/MainWindow.cpp:134 ../updater/MainWindow.cpp:172
msgid "New Version"
msgstr ""
-#: ../updater/MainWindow.cpp:136 ../updater/MainWindow.cpp:174
+#: ../updater/MainWindow.cpp:135 ../updater/MainWindow.cpp:173
msgid "Catalog"
msgstr ""
-#: ../updater/MainWindow.cpp:137 ../updater/MainWindow.cpp:175
-msgid "Size"
-msgstr ""
-
-#: ../updater/MainWindow.cpp:138 ../updater/MainWindow.cpp:176
+#: ../updater/MainWindow.cpp:136 ../updater/MainWindow.cpp:174
msgid "Restart"
msgstr ""
-#: ../updater/MainWindow.cpp:143 ../updater/MainWindow.cpp:384
+#: ../updater/MainWindow.cpp:141 ../updater/MainWindow.cpp:401
msgid "Patches"
msgstr ""
-#: ../updater/MainWindow.cpp:148
+#: ../updater/MainWindow.cpp:146
msgid "Select All Patches"
msgstr ""
-#: ../updater/MainWindow.cpp:149
+#: ../updater/MainWindow.cpp:147
msgid "Clear Patch Selection"
msgstr ""
-#: ../updater/MainWindow.cpp:167
-msgid "<b>For experts only!</b><br>The following are software upgrades to add features."
+#: ../updater/MainWindow.cpp:165
+msgid "The following list contains new versions for software packages installed on your system.<br>These updates are provided by the openSUSE community."
msgstr ""
-#: ../updater/MainWindow.cpp:185
+#: ../updater/MainWindow.cpp:183
msgid "Select All Packages"
msgstr ""
-#: ../updater/MainWindow.cpp:186
+#: ../updater/MainWindow.cpp:184
msgid "Clear Package Selection"
msgstr ""
-#: ../updater/MainWindow.cpp:193 ../updater/MainWindow.cpp:385
+#: ../updater/MainWindow.cpp:191 ../updater/MainWindow.cpp:402
msgid "Upgrades"
msgstr ""
-#: ../updater/MainWindow.cpp:242
-msgid "Available Updates"
-msgstr ""
-
-#: ../updater/MainWindow.cpp:460
-msgid "Settings"
-msgstr ""
-
-#: ../updater/zmd/ZmdUpdater.cpp:153
-msgid "Hold Back Package"
-msgstr ""
-
-#: ../updater/zmd/ZmdUpdater.cpp:157
-msgid "Don't Hold Back Package"
+#: ../updater/MainWindow.cpp:202
+msgid "Add/Remove Update Repositories..."
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:372
-msgid "Update"
-msgstr ""
-
-#: ../updater/zmd/ZmdUpdater.cpp:410
-#: ../updater/zypp_traditional/ZYppUpdater.cpp:165
-msgid "Patch"
+#: ../updater/MainWindow.cpp:240
+msgid "Available Updates"
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:457 ../updater/zmd/ZmdUpdater.cpp:471
-msgid "Description: "
+#: ../updater/MainWindow.cpp:477
+msgid "Settings"
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:459
-msgid "<b>Upgrading from old version:</b> "
+#: ../updater/zmd/ZmdServerDialog.cpp:80
+msgid "Please enter server name below"
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:470
-msgid "Patch Category: "
+#: ../updater/zmd/ZmdServerDialog.cpp:81
+msgid "Please enter server URL below"
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:473
-msgid "<b>Upgrading to version:</b> "
+#: ../updater/zmd/ZmdServerDialog.cpp:84
+msgid "Server Type"
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:477
-msgid "<b>Reboot Required</b>"
+#: ../updater/zmd/ZmdServerDialog.cpp:89
+msgid "NU Server"
msgstr ""
-#: ../updater/zmd/ZmdUpdater.cpp:482
-msgid "<b>ZMD Restart Required</b>"
+#: ../updater/zmd/ZmdServerDialog.cpp:90
+msgid "RCE Server"
msgstr ""
-#: ../updater/zmd/ZmdEditServers.cpp:53 ../updater/zmd/ZmdServerDialog.cpp:124
+#: ../updater/zmd/ZmdServerDialog.cpp:124 ../updater/zmd/ZmdEditServers.cpp:53
msgid "Add Server"
msgstr ""
@@ -341,122 +474,56 @@
msgid "Service Removed"
msgstr ""
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:75
-msgid "To use this part of the updater, rug must be in your path"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:85
-msgid "Connection Options"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:88
-msgid "ZMD Is Listening on: "
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:92
-msgid "ZMD TCP Support: "
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:95
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:147
-msgid "On"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:96
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:148
-msgid "Off"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:103
-msgid "Security Options"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:106
-msgid "Require GPG Certificates For Servers: "
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:109
-msgid "Yes"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:110
-msgid "No"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:116
-msgid "Security Level: "
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:121
-msgid "Proxy Options"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:124
-msgid "Proxy Server:"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:128
-msgid "User Name:"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:132
-msgid "Password:"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:137
-msgid "Other Options"
-msgstr ""
-
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:140
-msgid "ZMD Logging Level: "
+#: ../updater/zmd/ZmdConfigWindow.cpp:62 ../updater/zmd/ZmdConfigWindow.cpp:77
+msgid "Add/Remove Servers"
msgstr ""
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:144
-msgid "Rollback Support: "
+#: ../updater/zmd/ZmdConfigWindow.cpp:63
+msgid "Advanced Options"
msgstr ""
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:154
-msgid "Max Simultaneous Downloads"
+#: ../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 ""
-#: ../updater/zmd/ZmdAdvancedConfig.cpp:356
-msgid "Rug must be installed to configure ZMD, is it in your path?"
+#: ../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 ""
-#: ../updater/zmd/ZmdServerDialog.cpp:80
-msgid "Please enter server name below"
+#: ../updater/zmd/ZmdUpdater.cpp:153
+msgid "Hold Back Package"
msgstr ""
-#: ../updater/zmd/ZmdServerDialog.cpp:81
-msgid "Please enter server URL below"
+#: ../updater/zmd/ZmdUpdater.cpp:157
+msgid "Don't Hold Back Package"
msgstr ""
-#: ../updater/zmd/ZmdServerDialog.cpp:84
-msgid "Server Type"
+#: ../updater/zmd/ZmdUpdater.cpp:372
+msgid "Update"
msgstr ""
-#: ../updater/zmd/ZmdServerDialog.cpp:89
-msgid "NU Server"
+#: ../updater/zmd/ZmdUpdater.cpp:457 ../updater/zmd/ZmdUpdater.cpp:471
+msgid "Description: "
msgstr ""
-#: ../updater/zmd/ZmdServerDialog.cpp:90
-msgid "RCE Server"
+#: ../updater/zmd/ZmdUpdater.cpp:459
+msgid "<b>Upgrading from old version:</b> "
msgstr ""
-#: ../updater/zmd/ZmdConfigWindow.cpp:62 ../updater/zmd/ZmdConfigWindow.cpp:77
-msgid "Add/Remove Servers"
+#: ../updater/zmd/ZmdUpdater.cpp:470
+msgid "Patch Category: "
msgstr ""
-#: ../updater/zmd/ZmdConfigWindow.cpp:63
-msgid "Advanced Options"
+#: ../updater/zmd/ZmdUpdater.cpp:473
+msgid "<b>Upgrading to version:</b> "
msgstr ""
-#: ../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>"
+#: ../updater/zmd/ZmdUpdater.cpp:477
+msgid "<b>Reboot Required</b>"
msgstr ""
-#: ../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>"
+#: ../updater/zmd/ZmdUpdater.cpp:482
+msgid "<b>ZMD Restart Required</b>"
msgstr ""
#: ../updater/zmd/ZmdInstallWindow.cpp:73
@@ -544,32 +611,120 @@
msgid "Resolving Dependencies..."
msgstr ""
-#: ../updater/UpdaterApplication.cpp:82
-msgid ""
-"Backend plugin is not properly configured.\n"
-"Please use the configuration dialog to choose the correct one."
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:75
+msgid "To use this part of the updater, rug must be in your path"
msgstr ""
-#: ../updater/zypp_traditional/ZYppUpdater.cpp:165
-msgid "Security"
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:85
+msgid "Connection Options"
msgstr ""
-#: ../updater/TrayIcon.cpp:50 ../updater/TrayIcon.cpp:90
-msgid "New software for your system is available"
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:88
+msgid "ZMD Is Listening on: "
msgstr ""
-#: ../updater/TrayIcon.cpp:72
-msgid "Checking for updates..."
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:92
+msgid "ZMD TCP Support: "
msgstr ""
-#: ../updater/TrayIcon.cpp:77
-msgid "Error:\n"
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:95
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:147
+msgid "On"
msgstr ""
-#: ../updater/TrayIcon.cpp:82
-msgid "No Updates Available"
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:96
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:148
+msgid "Off"
msgstr ""
-#: ../updater/TrayIcon.cpp:125
-msgid "Updating..."
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:103
+msgid "Security Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:106
+msgid "Require GPG Certificates For Servers: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:109
+msgid "Yes"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:110
+msgid "No"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:116
+msgid "Security Level: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:121
+msgid "Proxy Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:124
+msgid "Proxy Server:"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:128
+msgid "User Name:"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:132
+msgid "Password:"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:137
+msgid "Other Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:140
+msgid "ZMD Logging Level: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:144
+msgid "Rollback Support: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:154
+msgid "Max Simultaneous Downloads"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:356
+msgid "Rug must be installed to configure ZMD, is it in your path?"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:128
+msgid "There were errors getting data from job"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:270
+msgid "Timeout on server"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:285
+msgid "Bad url"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:392
+msgid "Unauthorized access"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:395 ../udshttp/udshttp.cpp:397
+msgid "URL Invalid"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:400
+msgid "Server Error"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:403
+msgid "Service unavailable"
+msgstr ""
+
+#: ../kxmlrpcclient/kxmlrpcquery.cpp:131
+msgid "Received invalid XML markup: %1 at %2:%3"
+msgstr ""
+
+#: ../kxmlrpcclient/kxmlrpcquery.cpp:141
+msgid "Unknown type of XML markup received"
msgstr ""
Modified: trunk/updater-kde/updater/HeaderWidget.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/HeaderWidget.cpp?rev=6530&r1=6529&r2=6530&view=diff
==============================================================================
--- trunk/updater-kde/updater/HeaderWidget.cpp (original)
+++ trunk/updater-kde/updater/HeaderWidget.cpp Wed Aug 8 16:52:45 2007
@@ -20,6 +20,7 @@
#include "HeaderWidget.h"
#include
+#include
#include
#include
@@ -27,19 +28,23 @@
HeaderWidget::HeaderWidget(QWidget *parent) : QWidget(parent)
{
- layout = new QHBoxLayout(this);
+// layout = new QHBoxLayout(this);
+ layout = new QGridLayout(this);
suseLogo = new QLabel(this);
- text = new QLabel(this);
+ text = new QLabel(this, "headline", Qt::SingleLine);
pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeHuge));
-
+ text->setText(i18n("<h2>Available Updates</h2>"));
pic->setOptimization(QPixmap::BestOptim);
suseLogo->setPixmap(*pic);
- layout->addWidget(suseLogo);
- layout->addWidget(text);
+// layout->addWidget(suseLogo);
+// layout->addWidget(text);
+// layout->addStretch();
+ layout->addWidget(suseLogo,0,0);
+ layout->addWidget(text,0,1);
+ layout->setColStretch(1,1);
- text->setText("<b>Default</b><br>");
show();
}
Modified: trunk/updater-kde/updater/HeaderWidget.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/HeaderWidget.h?rev=6530&r1=6529&r2=6530&view=diff
==============================================================================
--- trunk/updater-kde/updater/HeaderWidget.h (original)
+++ trunk/updater-kde/updater/HeaderWidget.h Wed Aug 8 16:52:45 2007
@@ -25,6 +25,7 @@
class QLabel;
class QPixmap;
class QHBoxLayout;
+class QGridLayout;
/**
@file
@@ -52,7 +53,8 @@
private:
- QHBoxLayout *layout;
+// QHBoxLayout *layout;
+ QGridLayout *layout;
QPixmap *pic;
QLabel *suseLogo;
QLabel *text;
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6530&r1=6529&r2=6530&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Wed Aug 8 16:52:45 2007
@@ -115,7 +115,7 @@
mainBox = new QVBoxLayout(centralWidget);
header = new HeaderWidget(centralWidget);
- header->setDescription(i18n("<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>"));
+// header->setDescription(i18n("<b>Available Updates:</b>"));
// ------[ Patches - Tab ]---
@@ -124,7 +124,8 @@
//patchWidget = new QWidget(tabwidget);
patchWidget = new QWidget(centralWidget);
patchLabel = new QLabel(patchWidget);
- patchLabel->setText(i18n("The following are software patches to fix bugs."));
+ patchLabel->setText(i18n("The following official patches for openSUSE either fix security holes or serious errors in the software.<br>"
+ "Installing them is highly recommended."));
patchList = new QListView(patchWidget);
patchList->addColumn(i18n("Name"));
patchList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum);
@@ -161,7 +162,8 @@
packageWidget = new QWidget(tabwidget);
packageLabel = new QLabel(packageWidget);
- packageLabel->setText(i18n("<b>For experts only!</b><br>The following are software upgrades to add features."));
+ packageLabel->setText(i18n("The following list contains new versions for software packages installed on your system.<br>"
+ "These updates are provided by the openSUSE community."));
packageList = new QListView(packageWidget);
packageList->addColumn(i18n("Name"));
packageList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum);
Modified: trunk/updater-kde/updater/opensuseupdater_settings.kcfg
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/opensuseupdater_settings.kcfg?rev=6530&r1=6529&r2=6530&view=diff
==============================================================================
--- trunk/updater-kde/updater/opensuseupdater_settings.kcfg (original)
+++ trunk/updater-kde/updater/opensuseupdater_settings.kcfg Wed Aug 8 16:52:45 2007
@@ -8,7 +8,7 @@
<default>24</default>
</entry>
<entry name="WarnInterval" type="Int">
- <label>How otfen show recurring warning when updates are available.</label>
+ <label>How often show recurring warning when updates are available.</label>
<default>15</default>
</entry> -->
<entry name="Autostart" type="Bool">
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
