commit qinternet for openSUSE:Factory

1 May 2009

Hello community,

here is the log from the commit of package qinternet for openSUSE:Factory
checked in at Fri May 1 02:30:59 CEST 2009.



--------

--- KDE/qinternet/qinternet.changes	2008-04-25 16:03:41.000000000 +0200
+++ qinternet/qinternet.changes	2009-04-29 16:42:52.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 29 16:39:07 CEST 2009 - lnussel@suse.de
+
+ - fix use of undefined operation (bnc#498273)
+ - better error handling
+ - do not mention group dialout
+ - update german translation
+ - fix dial prefix menu item not greyed out when it should be
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  qinternet-0.75_git200804251643.tar.bz2

New:
----
  qinternet-0.75_git200904291639.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qinternet.spec ++++++
--- /var/tmp/diff_new_pack.t31410/_old	2009-05-01 02:28:51.000000000 +0200
+++ /var/tmp/diff_new_pack.t31410/_new	2009-05-01 02:28:51.000000000 +0200
@@ -1,10 +1,17 @@
 #
-# spec file for package qinternet (Version 0.75_git200804251643)
+# spec file for package qinternet (Version 0.75_git200904291639)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -17,8 +24,8 @@
 Group:          Productivity/Networking/PPP
 Summary:        Internet Connection Tool
 Requires:       smpppd
-Version:        0.75_git200804251643
-Release:        2
+Version:        0.75_git200904291639
+Release:        1
 Source0:        qinternet-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -60,6 +67,13 @@
 %{_bindir}/qinternet
 %{_datadir}/applications/qinternet.desktop
 %{_datadir}/pixmaps/qinternet.png
+
 %changelog
+* Wed Apr 29 2009 lnussel@suse.de
+- fix use of undefined operation (bnc#498273)
+ - better error handling
+ - do not mention group dialout
+ - update german translation
+ - fix dial prefix menu item not greyed out when it should be
 * Fri Apr 25 2008 lnussel@suse.de
 - initial qt4 version

++++++ qinternet-0.75_git200804251643.tar.bz2 -> qinternet-0.75_git200904291639.tar.bz2 ++++++
++++ 7398 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/Makefile.am new/qinternet-0.75_git200904291639/Makefile.am
--- old/qinternet-0.75_git200804251643/Makefile.am	2008-04-25 15:24:09.000000000 +0200
+++ new/qinternet-0.75_git200904291639/Makefile.am	2009-04-29 16:39:32.000000000 +0200
@@ -2,3 +2,11 @@
 SUBDIRS = src pics po
 
 EXTRA_DIST = AUTHORS COPYING README
+
+package: dist-bzip2
+	@if [ ! -d package/ ]; then echo "*** please check out the sources in directory 'package' (or symlink)"; false; fi
+	@mv $(distdir).tar.bz2 package
+	@sed -i -e 's/^\(Version: *\)\(.*\)/\1'$(VERSION)'/' package/qinternet.spec
+	@d=`awk 'NR==2{FS=" - ";$$0=$$0;print $$1;exit}' < package/qinternet.changes`; \
+	  echo "changes since $$d:"; \
+	git --no-pager log --pretty=format:" - %s" --since="$$d"; echo
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/po/de.po new/qinternet-0.75_git200904291639/po/de.po
--- old/qinternet-0.75_git200804251643/po/de.po	2006-06-27 14:35:04.000000000 +0200
+++ new/qinternet-0.75_git200904291639/po/de.po	2008-04-28 16:54:52.000000000 +0200
@@ -1,876 +1,885 @@
-# translation of de.po to 
+# translation of de.po to Deutsch
+# translation of de.po to
 # translation of de.po to
-# translation of de.po to German
 #
 # Copyright (C) SuSE Linux AG
 # Arvin Schnell 
-# Antje Faber , 2003, 2004, 2005.
 #
+# Antje Faber , 2003, 2004, 2005.
+# Ludwig Nussel , 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-08 12:58+0200\n"
-"PO-Revision-Date: 2006-06-21 16:20\n"
-"Last-Translator: Novell Language \n"
-"Language-Team: Novell Language \n"
+"POT-Creation-Date: 2008-04-28 16:15+0200\n"
+"PO-Revision-Date: 2008-04-28 16:54+0200\n"
+"Last-Translator: Ludwig Nussel \n"
+"Language-Team: Deutsch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. desc: dialog title
-#: check.cpp:69 kinternet.cpp:317
+#: ../src/check.cpp:75 ../src/kinternet.cpp:287
 msgid "Check Connection"
 msgstr "Verbindung prüfen"
 
-#: check.cpp:71
+#: ../src/check.cpp:77
 msgid "Default Route"
 msgstr "Standard-Route"
 
-#: check.cpp:79 check.cpp:233
+#: ../src/check.cpp:86 ../src/check.cpp:238
 msgid "Name Server"
 msgstr "Nameserver"
 
-#: check.cpp:88
+#: ../src/check.cpp:97
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: check.cpp:151
+#: ../src/check.cpp:100 ../src/configview.cpp:59 ../src/datarateview.cpp:118
+#: ../src/logview.cpp:100
+msgid "Close"
+msgstr "Schließen"
+
+#: ../src/check.cpp:156
 msgid "Invalid default route:"
 msgstr "Ungültige Standard-Route:"
 
-#. desc: %1 is a filename, %2 an error message
-#: check.cpp:153 check.cpp:197
+#: ../src/check.cpp:158 ../src/check.cpp:202
+#, qt-format
 msgid "Cannot read `%1': %2"
 msgstr "Kann Datei `%1' nicht lesen: %2"
 
-#: check.cpp:161
+#: ../src/check.cpp:166
 msgid "Default route ok."
 msgstr "Standard-Route ok."
 
-#: check.cpp:177
+#: ../src/check.cpp:182
 msgid "Gateway Address"
 msgstr "Gateway-Adresse"
 
-#: check.cpp:181
+#: ../src/check.cpp:186
 msgid "Own Address"
 msgstr "Eigene Adresse"
 
-#: check.cpp:183
+#: ../src/check.cpp:188
 msgid "Kernel Interface"
 msgstr "Kernel-Interface"
 
-#: check.cpp:195 check.cpp:224 check.cpp:272
+#: ../src/check.cpp:200 ../src/check.cpp:229 ../src/check.cpp:275
 msgid "Name server failure:"
 msgstr "Nameserver-Fehler:"
 
-#: check.cpp:225
+#: ../src/check.cpp:230
+#, qt-format
 msgid "no name server found in `%1'"
 msgstr "kein Nameserver in `%1' gefunden"
 
-#: check.cpp:234
+#: ../src/check.cpp:239
 msgid "waiting for reply"
 msgstr "auf Antwort warten..."
 
-#: check.cpp:245
+#: ../src/check.cpp:250
 msgid "unable to fork (internal error)"
 msgstr "`fork' kann nicht ausgeführt werden (interner Fehler)"
 
-#: check.cpp:249 check.cpp:267
+#: ../src/check.cpp:254 ../src/check.cpp:270
 msgid "Name server ok."
 msgstr "Nameserver ok."
 
-#: check.cpp:250 check.cpp:268
+#: ../src/check.cpp:255 ../src/check.cpp:271
 msgid "Name Server Address"
 msgstr "Nameserver-Adresse"
 
-#: check.cpp:273
+#: ../src/check.cpp:276
 msgid "address lookup does not work"
 msgstr "Adressenabfrage funktioniert nicht"
 
-#: configview.cpp:39
-msgid "Configuration of the selected interface\nand provider:"
-msgstr "Konfiguration des gewählten Interface\nund Providers:"
+#: ../src/configview.cpp:39
+msgid "Configuration"
+msgstr "Konfiguration"
 
-#: configview.cpp:43
+#: ../src/configview.cpp:43
+msgid ""
+"Configuration of the selected interface\n"
+"and provider:"
+msgstr ""
+"Konfiguration des gewählten Interface\n"
+"und Providers:"
+
+#: ../src/configview.cpp:48
 msgid "Parameter"
 msgstr "Parameter"
 
-#: configview.cpp:44
+#: ../src/configview.cpp:49
 msgid "Value"
 msgstr "Wert"
 
-#. desc: B/s means bytes per second
-#: datarateview.cpp:47
+#: ../src/datarateview.cpp:53
+#, qt-format
 msgid "%1 B/s"
 msgstr "%1 B/s"
 
-#. desc: kB/s means kilo bytes per second
-#: datarateview.cpp:49
+#: ../src/datarateview.cpp:55
+#, qt-format
 msgid "%1 kB/s"
 msgstr "%1 KB/s"
 
-#. desc: MB/s means mega bytes per second
-#: datarateview.cpp:51
+#: ../src/datarateview.cpp:57
+#, qt-format
 msgid "%1 MB/s"
 msgstr "%1 MB/s"
 
-#. desc: GB/s means giga bytes per second
-#: datarateview.cpp:53
+#: ../src/datarateview.cpp:59
+#, qt-format
 msgid "%1 GB/s"
 msgstr "%1 GB/s"
 
-#. desc: TB/s means tera bytes per second
-#: datarateview.cpp:55
+#: ../src/datarateview.cpp:61
+#, qt-format
 msgid "%1 TB/s"
 msgstr "%1 TB/s"
 
-#. desc: dialog title
-#: datarateview.cpp:89 settings.cpp:261
+#: ../src/datarateview.cpp:95 ../src/settings.cpp:267
 msgid "Data Rate"
 msgstr "Datenrate"
 
-#: datarateview.cpp:94
-#, 
+#: ../src/datarateview.cpp:101
 msgid "Data rate:"
 msgstr "Datenrate"
 
-#. desc: dialog title
-#: dialprefix.cpp:34
+#: ../src/dialprefix.cpp:36
 msgid "Dial Prefix"
 msgstr "Vorwahl"
 
-#: dialprefix.cpp:36
+#: ../src/dialprefix.cpp:38
+#, qt-format
 msgid "Enter the dial prefix for the interface `%1':"
 msgstr "Geben Sie die Vorwahl für die Schnittstelle `%1' ein:"
 
-#: dialprefix.cpp:153
-msgid "The dial prefix `%1' is not allowed. It must\nmatch the regular expression `%2'."
-msgstr "Die Amtsholung `%1' ist ungültig. Sie muss dem\nregulären Ausdruck `%2' entsprechen."
+#: ../src/dialprefix.cpp:50 ../src/password.cpp:52 ../src/settings.cpp:79
+msgid "&OK"
+msgstr "&OK"
+
+#: ../src/dialprefix.cpp:53 ../src/password.cpp:55 ../src/settings.cpp:85
+msgid "&Cancel"
+msgstr "&Abbrechen"
 
-#. desc: dialog title
-#: kinternet.cpp:77 kinternet.cpp:1087 utils.cpp:84
+#: ../src/dialprefix.cpp:151
+#, qt-format
+msgid ""
+"The dial prefix `%1' is not allowed. It must\n"
+"match the regular expression `%2'."
+msgstr ""
+"Die Amtsholung `%1' ist ungültig. Sie muss dem\n"
+"regulären Ausdruck `%2' entsprechen."
+
+#: ../src/kinternet.cpp:85 ../src/kinternet.cpp:1033 ../src/utils.cpp:87
 msgid "KInternet"
 msgstr "KInternet"
 
-#. desc: dialog title
-#: kinternet.cpp:80 kinternet.cpp:1091 utils.cpp:87
+#: ../src/kinternet.cpp:88 ../src/kinternet.cpp:1037 ../src/utils.cpp:90
 msgid "QInternet"
 msgstr "QInternet"
 
-#. desc: menu title
-#: kinternet.cpp:92 kinternet.cpp:276
+#: ../src/kinternet.cpp:108 ../src/kinternet.cpp:248
 msgid "KInternet - Internet Tool"
 msgstr "KInternet - Internet-Einwahl"
 
-#: kinternet.cpp:179
-#, 
-msgid "smpppd reported an error. Connecting\nto the Internet is not possible. Check\nthe log for a more detailed error\nmessage."
-msgstr "Der smpppd hat einen Fehler gemeldet. Eine\nVerbindung zum Internet ist nicht möglich.\nSie können im Protokoll eine umfangreichere\nFehlermeldung sehen."
+#: ../src/kinternet.cpp:210
+msgid ""
+"smpppd reported an error. Connecting\n"
+"to the Internet is not possible. Check\n"
+"the log for a more detailed error\n"
+"message."
+msgstr ""
+"Der smpppd hat einen Fehler gemeldet. Eine\n"
+"Verbindung zum Internet ist nicht möglich.\n"
+"Sie können im Protokoll eine umfangreichere\n"
+"Fehlermeldung sehen."
 
-#. desc: dialog title
-#: kinternet.cpp:285 settings.cpp:44
+#: ../src/kinternet.cpp:257 ../src/settings.cpp:50
 msgid "Various Settings"
 msgstr "Verschiedene Einstellungen"
 
-#: kinternet.cpp:290
-#, 
+#: ../src/kinternet.cpp:262
 msgid "View Configuration"
 msgstr "Konfiguration anzeigen"
 
-#: kinternet.cpp:294
+#: ../src/kinternet.cpp:265
 msgid "Configure with YaST2..."
 msgstr "Konfigurieren mit YaST2..."
 
-#: kinternet.cpp:298
+#: ../src/kinternet.cpp:268
 msgid "Set Dial Prefix..."
 msgstr "Vorwahl festlegen..."
 
-#: kinternet.cpp:319 settings.cpp:54
+#: ../src/kinternet.cpp:289 ../src/settings.cpp:61
 msgid "View Log"
 msgstr "Protokoll ansehen"
 
-#: kinternet.cpp:321 settings.cpp:55
+#: ../src/kinternet.cpp:291 ../src/settings.cpp:62
 msgid "View Data Rate"
 msgstr "Übertragungsrate ansehen"
 
-#: kinternet.cpp:326
-#, 
+#: ../src/kinternet.cpp:297
 msgid "Wireless Connection..."
 msgstr "Drahtlose Verbindung..."
 
-#: kinternet.cpp:331
+#: ../src/kinternet.cpp:303
 msgid "Reconnect to Server"
 msgstr "Verbindung zum Server wiederherstellen"
 
-#: kinternet.cpp:341
+#: ../src/kinternet.cpp:309 ../src/kinternet.cpp:311
+msgid "&Settings"
+msgstr "&Einstellungen"
+
+#: ../src/kinternet.cpp:313
 msgid "&Interface"
 msgstr "&Schnittstelle"
 
-#: kinternet.cpp:342
+#: ../src/kinternet.cpp:314
 msgid "&Provider"
 msgstr "&Provider"
 
-#: kinternet.cpp:346
+#: ../src/kinternet.cpp:318
 msgid "St&art"
 msgstr "&Start"
 
-#: kinternet.cpp:347
-#, 
+#: ../src/kinternet.cpp:319
 msgid "&Dial-In"
 msgstr "&Einwählen"
 
-#: kinternet.cpp:348
-#, 
+#: ../src/kinternet.cpp:320
 msgid "&Hang-Up"
 msgstr "&Auflegen"
 
-#. desc: menu entry to add a link/channel (e.g. for isdn channel bundling)
-#: kinternet.cpp:354
+#: ../src/kinternet.cpp:321
+msgid "St&op"
+msgstr "St&opp"
+
+#: ../src/kinternet.cpp:326
 msgid "&Add Link"
 msgstr "Link &hinzufügen"
 
-#. desc: menu entry to remove a link/channel (e.g. for isdn channel bundling)
-#: kinternet.cpp:356
+#: ../src/kinternet.cpp:328
 msgid "&Remove Link"
 msgstr "Link &entfernen"
 
-#: kinternet.cpp:486
-msgid "Should KInternet start automatically\nwhen you log in?"
-msgstr "KInternet automatisch beim Anmelden\nstarten?"
+#: ../src/kinternet.cpp:333 ../src/kinternet.cpp:336
+msgid "&Quit"
+msgstr "&Beenden"
+
+#: ../src/kinternet.cpp:460
+msgid ""
+"Should KInternet start automatically\n"
+"when you log in?"
+msgstr ""
+"KInternet automatisch beim Anmelden\n"
+"starten?"
 
-#: kinternet.cpp:488
-#, 
+#: ../src/kinternet.cpp:462
 msgid "Start Automatically"
 msgstr "Automatisch starten"
 
-#: kinternet.cpp:488
+#: ../src/kinternet.cpp:462
 msgid "Do Not Start"
 msgstr "Nicht starten"
 
-#. desc: dialog title
-#: logview.cpp:79
+#: ../src/kinternet.cpp:2083 ../src/utils.cpp:149
+msgid "Error"
+msgstr "Fehler"
+
+#: ../src/logview.cpp:82
 msgid "Log"
 msgstr "Protokoll"
 
-#: logview.cpp:83
+#: ../src/logview.cpp:86
 msgid "This is the complete log:"
 msgstr "Das komplette Protokoll:"
 
-#: logview.cpp:92
+#: ../src/logview.cpp:97
 msgid "Save to File..."
 msgstr "In Datei speichern..."
 
-#: logview.cpp:113 logview.cpp:117
+#: ../src/logview.cpp:120 ../src/logview.cpp:124
 msgid "Save Log As"
 msgstr "Protokoll speichern unter"
 
-#: logview.cpp:126
-#, 
+#: ../src/logview.cpp:133
 msgid "File already exists. Overwrite it?"
 msgstr "Datei existiert bereits. Überschreiben?"
 
-#: logview.cpp:132
+#: ../src/logview.cpp:139
 msgid "Cannot open file for writing."
 msgstr "Kann Datei nicht schreiben."
 
-#: main.cpp:56
-msgid "Be quiet and exit if connection to smpppd failsor KInternet is already running"
-msgstr "Keine Aktion durchführen und beenden, wenn Verbindung mit smpppd nicht zustandekommt oder KInternet bereits läuft"
-
-#: main.cpp:58
-msgid "Wait for kicker application"
-msgstr "Auf Kicker-Anwendung warten"
-
-#: main.cpp:59
-msgid "Don't dock into the kde kicker"
-msgstr "Nicht an kde-Kicker andocken"
-
-#: main.cpp:60
-msgid "Run inside a swallow enviroment, eg. swallow in FVWMButtons"
-msgstr "In einer Swallow-Umgebung ausführen, z. B. Swallow in FVWMButtons"
-
-#: main.cpp:146
-msgid "KInternet is already running. It is the small\nicon showing a connector in your panel."
-msgstr "KInternet läuft bereits. Es ist das kleine\nBild mit Stecker in Ihrer Kontrollleiste."
+#: ../src/main.cpp:147
+msgid ""
+"KInternet is already running. It is the small\n"
+"icon showing a connector in your panel."
+msgstr ""
+"KInternet läuft bereits. Es ist das kleine\n"
+"Bild mit Stecker in Ihrer Kontrollleiste."
+
+#: ../src/main.cpp:150
+msgid "Information"
+msgstr "Information"
 
-#. desc: dialog title
-#: password.cpp:35
+#: ../src/password.cpp:37
 msgid "Password"
 msgstr "Passwort"
 
-#: password.cpp:37
+#: ../src/password.cpp:39
+#, qt-format
 msgid "Enter the password for the provider `%1':"
 msgstr "Geben Sie das Passwort für den Provider `%1' ein:"
 
-#: rc.cpp:3
-#, no-c-format
-msgid "WEP - Key Input Dialog"
-msgstr "WEP - Schlüsseleingabe-Dialog"
-
-#: rc.cpp:14
-#, no-c-format
-msgid "Insert WEP key:"
-msgstr "WEP-Schlüssel einfügen:"
-
-#: rc.cpp:17
-#, no-c-format
-msgid "Select WEP key type:"
-msgstr "WEP-Schlüsseltyp wählen:"
-
-#: rc.cpp:20
-#, no-c-format
-msgid "Select WEP authentication mode:"
-msgstr "WEP-Authentifizierungsmodus wählen:"
-
-#: rc.cpp:23
-#, no-c-format
-msgid "Wireless LAN - Dialog"
-msgstr "Drahtloses LAN - Dialog"
-
-#: rc.cpp:26
-#, , no-c-format
-msgid "Current Connection"
-msgstr "Aktuelle Verbindung"
-
-#: rc.cpp:29
-#, no-c-format
-msgid "Name"
-msgstr "Name"
-
-#: rc.cpp:32
-#, no-c-format
-msgid "Value(s)"
-msgstr "Wert(e)"
-
-#: rc.cpp:35
-#, , no-c-format
-msgid "Signal quality:"
-msgstr "Signalqualität:"
-
-#: rc.cpp:38
-#, no-c-format
-msgid "Associated:"
-msgstr "Zugewiesen:"
-
-#: rc.cpp:41
-#, , no-c-format
-msgid "Lo&g - Signal Strength"
-msgstr "&Protokoll - Signalstärke"
-
-#: rc.cpp:44
-#, no-c-format
-msgid "Scan for Wireless &Networks"
-msgstr "Nach drahtlosen &Netzwerken suchen"
-
-#: rc.cpp:47
-#, , no-c-format
-msgid "Accoustic scan"
-msgstr "Akustischer Scan"
-
-#: rc.cpp:50
-#, no-c-format
-msgid "Auto refresh"
-msgstr "Automatische Aktualisierung"
-
-#: rc.cpp:53
-#, no-c-format
-msgid "Start Active Scan"
-msgstr "Aktiven Scan starten"
-
-#: rc.cpp:56
-#, no-c-format
-msgid "Start &YaST"
-msgstr "&YaST starten"
-
-#: rc.cpp:59
-#, no-c-format
-msgid "Refresh"
-msgstr "Aktualisierung"
-
-#: rc.cpp:62 settings.cpp:302
-#, no-c-format
-msgid "Connect"
-msgstr "Verbinden"
-
-#: rc.cpp:65
-#, no-c-format
-msgid "Name/ESSID"
-msgstr "Name/ESSID"
-
-#: rc.cpp:68 wirelessdialog.cpp:658
-#, no-c-format
-msgid "Signal"
-msgstr "Signal"
-
-#: rc.cpp:71 wirelessdialog.cpp:676
-#, no-c-format
-msgid "Bitrate"
-msgstr "Bitrate"
-
-#: rc.cpp:74
-#, no-c-format
-msgid "WEP"
-msgstr "WEP"
-
-#: rc.cpp:77
-#, , no-c-format
-msgid "MAC Address"
-msgstr "Mac-Adresse"
-
-#: rc.cpp:80 wirelessdialog.cpp:675
-#, no-c-format
-msgid "Frequency"
-msgstr "Frequenz"
-
-#: rc.cpp:83
-#, no-c-format
-msgid "Channel"
-msgstr "Kanal"
-
-#: server.cpp:89
+#: ../src/server.cpp:244
 msgid "Authentication with the server failed."
 msgstr "Authentifizierung bei Server gescheitert."
 
-#: server.cpp:91
+#: ../src/server.cpp:407
 msgid "Connection closed by server."
 msgstr "Die Verbindung wurde vom Server beendet."
 
-#: server.cpp:93
+#: ../src/server.cpp:428 ../src/server.cpp:481
 msgid "Connection to server lost."
 msgstr "Die Verbindung zum Server ist abgebrochen."
 
-#: server.cpp:518
-msgid "Could not connect to local server. Maybe\nsmpppd is not running or you are not\nmember of the group \"dialout\".\nAlso check the server settings in\nthe dialog \"Various Settings\"."
-msgstr "Verbindung zum lokalen Server fehlgeschlagen.\nVermutlich läuft der smpppd nicht oder Sie sind\nnicht in der Gruppe \"dialout\".\nÜberprüfen Sie auch die Server-Einstellungen\nim Dialog \"Verschiedene Einstellungen\"."
-
-#: server.cpp:524
-msgid "Connection to remote server refused.\nMaybe smpppd is not running.\nAlso check the server settings in\nthe dialog \"Various Settings\"."
-msgstr "Die Verbindung zum entfernten Server\nwurde abgelehnt. Vermutlich läuft der smpppd nicht\nÜberprüfen Sie auch die Server-Einstellungen\nim Dialog \"Verschiedene Einstellungen\"."
-
-#: server.cpp:529
-msgid "Connection to local and remote server\nrefused. Maybe smpppd is not running\nor you are not member of the group \"dialout\".\nAlso check the server settings in\nthe dialog \"Various Settings\"."
-msgstr "Die Verbindung zum lokalen und entfernten Server\nwurde abgelehnt. Vermutlich läuft der smpppd nicht\noder Sie sind nicht in der Gruppe \"dialout\".\nÜberprüfem Sie auch die Server-Einstellungen\nim Dialog \"Verschiedene Einstellungen\"."
+#: ../src/server.cpp:733
+msgid ""
+"Could not connect to local server. Maybe\n"
+"smpppd is not running or you are not\n"
+"member of the group \"dialout\".\n"
+"Also check the server settings in\n"
+"the dialog \"Various Settings\"."
+msgstr ""
+"Verbindung zum lokalen Server fehlgeschlagen.\n"
+"Vermutlich läuft der smpppd nicht oder Sie sind\n"
+"nicht in der Gruppe \"dialout\".\n"
+"Überprüfen Sie auch die Server-Einstellungen\n"
+"im Dialog \"Verschiedene Einstellungen\"."
 
-#: settings.cpp:51
+#: ../src/server.cpp:740
+msgid ""
+"Connection to remote server refused.\n"
+"Maybe smpppd is not running.\n"
+"Also check the server settings in\n"
+"the dialog \"Various Settings\"."
+msgstr ""
+"Die Verbindung zum entfernten Server\n"
+"wurde abgelehnt. Vermutlich läuft der smpppd nicht\n"
+"Überprüfen Sie auch die Server-Einstellungen\n"
+"im Dialog \"Verschiedene Einstellungen\"."
+
+#: ../src/server.cpp:747
+msgid ""
+"Connection to local and remote server\n"
+"refused. Maybe smpppd is not running\n"
+"or you are not member of the group \"dialout\".\n"
+"Also check the server settings in\n"
+"the dialog \"Various Settings\"."
+msgstr ""
+"Die Verbindung zum lokalen und entfernten Server\n"
+"wurde abgelehnt. Vermutlich läuft der smpppd nicht\n"
+"oder Sie sind nicht in der Gruppe \"dialout\".\n"
+"Überprüfem Sie auch die Server-Einstellungen\n"
+"im Dialog \"Verschiedene Einstellungen\"."
+
+#: ../src/settings.cpp:58
 msgid "No Action"
 msgstr "Keine Aktion"
 
-#: settings.cpp:52
+#: ../src/settings.cpp:59
 msgid "Menu"
 msgstr "Menü"
 
-#: settings.cpp:53
+#: ../src/settings.cpp:60
 msgid "Start or Stop Connection"
 msgstr "Verbindung starten oder stoppen"
 
-#: settings.cpp:143
+#: ../src/settings.cpp:82
+msgid "&Apply"
+msgstr "&Anwenden"
+
+#: ../src/settings.cpp:149
 msgid "Login"
 msgstr "Anmeldung"
 
-#: settings.cpp:146
-#, 
+#: ../src/settings.cpp:152
 msgid "Start KInternet during KDE login"
 msgstr "KInternet beim KDE-Anmeldevorgang starten"
 
-#: settings.cpp:150
+#: ../src/settings.cpp:156
 msgid "Interface"
 msgstr "Interface"
 
-#: settings.cpp:152
+#: ../src/settings.cpp:158
 msgid "Interface to select on start-up:"
 msgstr "Beim Start zu wählende Schnittstelle:"
 
-#: settings.cpp:167
+#: ../src/settings.cpp:173
 msgid "Provider"
 msgstr "Provider"
 
-#: settings.cpp:169
+#: ../src/settings.cpp:175
 msgid "Provider to select on start-up:"
 msgstr "Beim Start zu wählender Provider:"
 
-#: settings.cpp:174
+#: ../src/settings.cpp:180
 msgid "Keep Active Provider on Start-up"
 msgstr "Aktivierten Provider beim Start übernehmen"
 
-#: settings.cpp:190
-#, 
+#: ../src/settings.cpp:196
 msgid "Start-Up"
 msgstr "Start"
 
-#: settings.cpp:202
+#: ../src/settings.cpp:208
 msgid "Icon"
 msgstr "Icon"
 
-#: settings.cpp:204
+#: ../src/settings.cpp:210
 msgid "Window"
 msgstr "Fenster"
 
-#: settings.cpp:208
-#, 
+#: ../src/settings.cpp:214
 msgid "Colored background"
 msgstr "Farbiger Hintergrund"
 
-#: settings.cpp:212
+#: ../src/settings.cpp:218
 msgid "Mouse Buttons"
 msgstr "Maustasten"
 
-#: settings.cpp:214
-#, 
+#: ../src/settings.cpp:220
 msgid "Left mouse button:"
 msgstr "Linke Maustaste:"
 
-#: settings.cpp:216
-#, 
+#: ../src/settings.cpp:222
 msgid "Middle mouse button:"
 msgstr "Mittlere Maustaste:"
 
-#: settings.cpp:218
-#, 
+#: ../src/settings.cpp:224
 msgid "Right mouse button:"
 msgstr "Rechte Maustaste:"
 
-#: settings.cpp:234
+#: ../src/settings.cpp:229
+msgid "Appearance"
+msgstr "Erscheinungsbild"
+
+#: ../src/settings.cpp:240
 msgid "Chart Type"
 msgstr "Tabellenart"
 
-#: settings.cpp:239
-#, 
+#: ../src/settings.cpp:245
 msgid "Separate charts for RX and TX"
 msgstr "Getrennte Tabellen für RX und TX"
 
-#: settings.cpp:243
-#, 
+#: ../src/settings.cpp:249
 msgid "One chart for sum of RX and TX"
 msgstr "Gemeinsame Tabelle für die Summe von RX und TX"
 
-#: settings.cpp:246
+#: ../src/settings.cpp:252
 msgid "Update Interval"
 msgstr "Aktualisierungsintervall"
 
-#: settings.cpp:273
+#: ../src/settings.cpp:279
 msgid "KDE"
 msgstr "KDE"
 
-#: settings.cpp:276
+#: ../src/settings.cpp:282
 msgid "S&witch KDE network status"
 msgstr "KDE-Netzwerkstatus &umschalten"
 
-#: settings.cpp:279
+#: ../src/settings.cpp:285
 msgid "Trigger connect on request of application"
 msgstr "Verbindung bei Applikationsanfrage starten"
 
-#: settings.cpp:283
+#: ../src/settings.cpp:289
 msgid "Occasion"
 msgstr "Ereignis"
 
-#: settings.cpp:286
+#: ../src/settings.cpp:292
 msgid "When should the scripts be executed:"
 msgstr "Zeitpunkt für das Ausführen der Skripte:"
 
-#: settings.cpp:291
+#: ../src/settings.cpp:297
 msgid "Never"
 msgstr "Niemals"
 
-#: settings.cpp:295
-#, 
+#: ../src/settings.cpp:301
 msgid "Always after connect or disconnect"
 msgstr "Immer nach dem Aufbau bzw. Beenden der Verbindung"
 
-#: settings.cpp:299
-#, 
+#: ../src/settings.cpp:305
 msgid "Only when I started the connection"
 msgstr "Nur wenn ich die Verbindung gestartet habe"
 
-#: settings.cpp:304
+#: ../src/settings.cpp:308
+msgid "Connect"
+msgstr "Verbinden"
+
+#: ../src/settings.cpp:310
 msgid "Script to execute after connect:"
 msgstr "Nach der Verbindung auszuführendes Skript:"
 
-#: settings.cpp:314
+#: ../src/settings.cpp:317 ../src/settings.cpp:328
+msgid "Browse..."
+msgstr "Durchsuchen..."
+
+#: ../src/settings.cpp:320
 msgid "Disconnect"
 msgstr "Verbindung beenden"
 
-#: settings.cpp:316
+#: ../src/settings.cpp:322
 msgid "Script to execute after disconnect:"
 msgstr "Nach dem Beenden der Verbindung auszuführendes Skript:"
 
-#: settings.cpp:329
+#: ../src/settings.cpp:335
 msgid "Scripts"
 msgstr "Skripte"
 
-#: settings.cpp:340
+#: ../src/settings.cpp:346
 msgid "Location of smpppd"
 msgstr "Ort des smpppd"
 
-#: settings.cpp:344
-#, 
+#: ../src/settings.cpp:350
 msgid "Automatic detection"
 msgstr "Automatische Erkennung"
 
-#: settings.cpp:347
-#, 
+#: ../src/settings.cpp:353
 msgid "On local machine"
 msgstr "Auf dem lokalen Rechner"
 
-#: settings.cpp:350
-#, 
+#: ../src/settings.cpp:356
 msgid "Manual settings"
 msgstr "Manuelle Einstellungen"
 
-#: settings.cpp:360
+#: ../src/settings.cpp:366
 msgid "Manual Settings"
 msgstr "Manuelle Einstellungen"
 
-#: settings.cpp:362
+#: ../src/settings.cpp:368
 msgid "Server:"
 msgstr "Server:"
 
-#: settings.cpp:367
-#, 
+#: ../src/settings.cpp:373
 msgid "Port number:"
 msgstr "Port-Nummer:"
 
-#: settings.cpp:375
+#: ../src/settings.cpp:381
 msgid "Password:"
 msgstr "Passwort:"
 
-#: settings.cpp:385
+#: ../src/settings.cpp:391
 msgid "Server"
 msgstr "Server"
 
-#: settings.cpp:397
+#: ../src/settings.cpp:403
 msgid "Host Names"
 msgstr "Rechnernamen"
 
-#: settings.cpp:399
-#, 
+#: ../src/settings.cpp:405
 msgid "Host names to look up in DNS check:"
 msgstr "Rechnernamen für die DNS-Überprüfung:"
 
-#: settings.cpp:411
+#: ../src/settings.cpp:417
 msgid "DNS Check"
 msgstr "DNS-Überprüfung"
 
-#. desc: display of update interval (placed in %n) in seconds
-#: settings.cpp:537
+#: ../src/settings.cpp:543
 #, c-format
-msgid "_n: %n Second\n%n Seconds"
-msgstr "_n: %n Sekunde\n%n Sekunden"
+msgid "%n Second"
+msgid_plural "%n Seconds"
+msgstr[0] "%n Sekunde"
+msgstr[1] "%n Sekunden"
+
+#: ../src/settings.cpp:547
+#, qt-format
+msgid "%1 Second"
+msgid_plural "%1 Seconds"
+msgstr[0] "%1 Sekunde"
+msgstr[1] "%1 Sekunden"
 
-#. desc: display of update interval (placed in %1) in seconds
-#: settings.cpp:541
-msgid "_n: %1 Second\n%1 Seconds"
-msgstr "_n: %1 Sekunde\n%1 Sekunden"
-
-#: settings.cpp:563 settings.cpp:566
+#: ../src/settings.cpp:569 ../src/settings.cpp:572
 msgid "Select Script"
 msgstr "Skript wählen"
 
-#: wirelessdialog.cpp:93
-msgid "Use this button to start YaST for permanent configuration."
-msgstr "Verwenden Sie diesen Button zum Starten von YaST für eine permanente Konfiguration."
-
-#: wirelessdialog.cpp:94
-msgid "Use this button to connect to the above selected accesspoint."
-msgstr "Verwenden Sie diesen Button zum Verbinden mit dem oben gewählten Zugriffspunkt."
-
-#: wirelessdialog.cpp:95
-msgid "This load the list of current known accesspoints and don't start a active scan."
-msgstr "Hiermit wird die Liste der aktuell bekannten Zugriffspunkte geladen und kein aktiver Scan gestartet."
-
-#: wirelessdialog.cpp:96
-msgid "This start a active scan. During a active scan it could happen, that you lost \n your current wireless connection."
-msgstr "Dies startet einen aktiven Scan. Während eines aktiven Scans kann es vorkommen,\ndass Sie Ihre aktuelle drahtlose Verbindung verlieren."
-
-#: wirelessdialog.cpp:98
-msgid "This activate accoustic for the next 'Refresh' or 'Active Scan'. \n To stop this, untoggle this checkbox."
-msgstr "Dies aktiviert Akustik für die nächste 'Aktualisierung' oder den nächsten 'Aktiven Scan'.\nWollen Sie dies stoppen, deselektieren Sie die Checkbox."
-
-#: wirelessdialog.cpp:100
-msgid "This activate auto refresh scan for the next 'Refresh' or 'Active Scan'. \n To stop this, untoggle this checkbox."
-msgstr "Dies aktiviert den automatischen Aktualisierungs-Scan für die nächste 'Aktualisierung' oder den nächsten 'Aktiven Scan'.\nWollen Sie dies stoppen, deselektieren Sie die Checkbox."
-
-#: wirelessdialog.cpp:121 wirelessdialog.cpp:134
-#, 
-msgid "Connection request to: %1 failed."
-msgstr "Verbindungsanforderung an: %1 fehlgeschlagen."
-
-#: wirelessdialog.cpp:122
-msgid "You are currently not associated with this accesspoint. Try again!"
-msgstr "Sie sind diesem Zugriffspunkt zurzeit nicht zugewiesen. Versuchen Sie es erneut!"
-
-#: wirelessdialog.cpp:123 wirelessdialog.cpp:130 wirelessdialog.cpp:135
-#: wirelessdialog.cpp:149
-#, 
-msgid "Connect Result"
-msgstr "Verbindungsergebnis"
-
-#: wirelessdialog.cpp:129
-msgid "You connected successfully to: "
-msgstr "Erfolgreiche Verbindung mit:"
-
-#: wirelessdialog.cpp:148
-#, 
-msgid "Connection request to: "
-msgstr "Verbindungsanforderung an:"
-
-#: wirelessdialog.cpp:148
-msgid "failed."
-msgstr "fehlgeschlagen."
-
-#: wirelessdialog.cpp:242
-msgid "You selected no accesspoint, \n please select one and try again!"
-msgstr "Sie haben keinen Zugriffspunkt ausgewählt. \n Wählen Sie einen aus und versuchen Sie es erneut!"
-
-#: wirelessdialog.cpp:265
-#, 
-msgid "Active Scanning..."
-msgstr "Aktiver Scan..."
-
-#: wirelessdialog.cpp:324
-#, 
-msgid "Scan finished."
-msgstr "Scan abgeschlossen."
-
-#: wirelessdialog.cpp:346 wirelessdialog.cpp:352
-msgid "WARNING"
-msgstr "WARNUNG"
-
-#: wirelessdialog.cpp:347
-msgid "Could not start YaST Network Module. Is it installed?"
-msgstr "Das YaST-Netzwerkmodul konnte nicht gestartet werden. Ist es installiert?"
-
-#: wirelessdialog.cpp:353
-msgid "Could not start YaST Network Module, is it already installed?"
-msgstr "Das YaST-Netzwerkmodul konnte nicht gestartet werden. Ist es bereits installiert?"
-
-#: wirelessdialog.cpp:369
-#, 
-msgid "Scanning..."
-msgstr "Scannen..."
-
-#: wirelessdialog.cpp:484 wirelessdialog.cpp:596
-#, 
-msgid "MBit/s"
-msgstr "MBit/s"
-
-#: wirelessdialog.cpp:496 wirelessdialog.cpp:586
-msgid "MHz"
-msgstr "MHz"
-
-#: wirelessdialog.cpp:604 wirelessdialog.cpp:608
-msgid "dBm"
-msgstr "dBm"
-
-#: wirelessdialog.cpp:614
-msgid "bit"
-msgstr "Bit"
-
-#: wirelessdialog.cpp:641
-msgid "AP ESSID"
-msgstr "AP ESSID"
-
-#: wirelessdialog.cpp:644
-msgid "Networkaddress"
-msgstr "Netzwerkadresse"
-
-#: wirelessdialog.cpp:645
-#, 
-msgid "AP mac"
-msgstr "AP Mac"
-
-#: wirelessdialog.cpp:647
-msgid "IP"
-msgstr "IP"
-
-#: wirelessdialog.cpp:648
-msgid "Netmask"
-msgstr "Netzmaske"
-
-#: wirelessdialog.cpp:649
-msgid "Broadcast"
-msgstr "Broadcast"
-
-#: wirelessdialog.cpp:659
-msgid "Link Quality"
-msgstr "Link-Qualität"
-
-#: wirelessdialog.cpp:662
-msgid "Signal level"
-msgstr "Signal-Level"
-
-#: wirelessdialog.cpp:666
-msgid "Noise level"
-msgstr "Geräusch-Level"
-
-#: wirelessdialog.cpp:674
-msgid "Conntection details"
-msgstr "Verbindungsdetails"
-
-#: wirelessdialog.cpp:682
-msgid "WEP Key"
-msgstr "WEP-Schlüssel"
-
-#: wirelessdialog.cpp:683
-msgid "Encryption"
-msgstr "Verschlüsselung"
-
-#: wirelessdialog.cpp:685
-msgid "WEP Key Size"
-msgstr "WEP-Schlüsselgröße"
-
-#: wirelessdialog.cpp:707
-#, 
-msgid "Not associated!"
-msgstr "Nicht zugewiesen!"
-
-#~ msgid "Close"
-#~ msgstr "Schließen"
-#~ msgid "Configuration"
-#~ msgstr "Konfiguration"
+#~ msgid ""
+#~ "Be quiet and exit if connection to smpppd failsor KInternet is already "
+#~ "running"
+#~ msgstr ""
+#~ "Keine Aktion durchführen und beenden, wenn Verbindung mit smpppd nicht "
+#~ "zustandekommt oder KInternet bereits läuft"
+
+#~ msgid "Wait for kicker application"
+#~ msgstr "Auf Kicker-Anwendung warten"
+
+#~ msgid "Don't dock into the kde kicker"
+#~ msgstr "Nicht an kde-Kicker andocken"
+
+#~ msgid "Run inside a swallow enviroment, eg. swallow in FVWMButtons"
+#~ msgstr "In einer Swallow-Umgebung ausführen, z. B. Swallow in FVWMButtons"
+
+#~ msgid "WEP - Key Input Dialog"
+#~ msgstr "WEP - Schlüsseleingabe-Dialog"
+
+#~ msgid "Insert WEP key:"
+#~ msgstr "WEP-Schlüssel einfügen:"
+
+#~ msgid "Select WEP key type:"
+#~ msgstr "WEP-Schlüsseltyp wählen:"
+
+#~ msgid "Select WEP authentication mode:"
+#~ msgstr "WEP-Authentifizierungsmodus wählen:"
+
+#~ msgid "Wireless LAN - Dialog"
+#~ msgstr "Drahtloses LAN - Dialog"
+
+#~ msgid "Current Connection"
+#~ msgstr "Aktuelle Verbindung"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Value(s)"
+#~ msgstr "Wert(e)"
+
+#~ msgid "Signal quality:"
+#~ msgstr "Signalqualität:"
+
+#~ msgid "Associated:"
+#~ msgstr "Zugewiesen:"
+
+#~ msgid "Lo&g - Signal Strength"
+#~ msgstr "&Protokoll - Signalstärke"
+
+#~ msgid "Scan for Wireless &Networks"
+#~ msgstr "Nach drahtlosen &Netzwerken suchen"
+
+#~ msgid "Accoustic scan"
+#~ msgstr "Akustischer Scan"
+
+#~ msgid "Auto refresh"
+#~ msgstr "Automatische Aktualisierung"
+
+#~ msgid "Start Active Scan"
+#~ msgstr "Aktiven Scan starten"
+
+#~ msgid "Start &YaST"
+#~ msgstr "&YaST starten"
+
+#~ msgid "Refresh"
+#~ msgstr "Aktualisierung"
+
+#~ msgid "Name/ESSID"
+#~ msgstr "Name/ESSID"
+
+#~ msgid "Signal"
+#~ msgstr "Signal"
+
+#~ msgid "Bitrate"
+#~ msgstr "Bitrate"
+
+#~ msgid "WEP"
+#~ msgstr "WEP"
+
+#~ msgid "MAC Address"
+#~ msgstr "Mac-Adresse"
+
+#~ msgid "Frequency"
+#~ msgstr "Frequenz"
+
+#~ msgid "Channel"
+#~ msgstr "Kanal"
+
+#~ msgid ""
+#~ "_n: %n Second\n"
+#~ "%n Seconds"
+#~ msgstr ""
+#~ "_n: %n Sekunde\n"
+#~ "%n Sekunden"
+
+#~ msgid ""
+#~ "_n: %1 Second\n"
+#~ "%1 Seconds"
+#~ msgstr ""
+#~ "_n: %1 Sekunde\n"
+#~ "%1 Sekunden"
+
+#~ msgid "Use this button to start YaST for permanent configuration."
+#~ msgstr ""
+#~ "Verwenden Sie diesen Button zum Starten von YaST für eine permanente "
+#~ "Konfiguration."
+
+#~ msgid "Use this button to connect to the above selected accesspoint."
+#~ msgstr ""
+#~ "Verwenden Sie diesen Button zum Verbinden mit dem oben gewählten "
+#~ "Zugriffspunkt."
+
+#~ msgid ""
+#~ "This load the list of current known accesspoints and don't start a active "
+#~ "scan."
+#~ msgstr ""
+#~ "Hiermit wird die Liste der aktuell bekannten Zugriffspunkte geladen und "
+#~ "kein aktiver Scan gestartet."
+
+#~ msgid ""
+#~ "This start a active scan. During a active scan it could happen, that you "
+#~ "lost \n"
+#~ " your current wireless connection."
+#~ msgstr ""
+#~ "Dies startet einen aktiven Scan. Während eines aktiven Scans kann es "
+#~ "vorkommen,\n"
+#~ "dass Sie Ihre aktuelle drahtlose Verbindung verlieren."
+
+#~ msgid ""
+#~ "This activate accoustic for the next 'Refresh' or 'Active Scan'. \n"
+#~ " To stop this, untoggle this checkbox."
+#~ msgstr ""
+#~ "Dies aktiviert Akustik für die nächste 'Aktualisierung' oder den nächsten "
+#~ "'Aktiven Scan'.\n"
+#~ "Wollen Sie dies stoppen, deselektieren Sie die Checkbox."
+
+#~ msgid ""
+#~ "This activate auto refresh scan for the next 'Refresh' or 'Active "
+#~ "Scan'. \n"
+#~ " To stop this, untoggle this checkbox."
+#~ msgstr ""
+#~ "Dies aktiviert den automatischen Aktualisierungs-Scan für die nächste "
+#~ "'Aktualisierung' oder den nächsten 'Aktiven Scan'.\n"
+#~ "Wollen Sie dies stoppen, deselektieren Sie die Checkbox."
+
+#~ msgid "Connection request to: %1 failed."
+#~ msgstr "Verbindungsanforderung an: %1 fehlgeschlagen."
+
+#~ msgid "You are currently not associated with this accesspoint. Try again!"
+#~ msgstr ""
+#~ "Sie sind diesem Zugriffspunkt zurzeit nicht zugewiesen. Versuchen Sie es "
+#~ "erneut!"
+
+#~ msgid "Connect Result"
+#~ msgstr "Verbindungsergebnis"
+
+#~ msgid "You connected successfully to: "
+#~ msgstr "Erfolgreiche Verbindung mit:"
+
+#~ msgid "Connection request to: "
+#~ msgstr "Verbindungsanforderung an:"
+
+#~ msgid "failed."
+#~ msgstr "fehlgeschlagen."
+
+#~ msgid ""
+#~ "You selected no accesspoint, \n"
+#~ " please select one and try again!"
+#~ msgstr ""
+#~ "Sie haben keinen Zugriffspunkt ausgewählt. \n"
+#~ " Wählen Sie einen aus und versuchen Sie es erneut!"
+
+#~ msgid "Active Scanning..."
+#~ msgstr "Aktiver Scan..."
+
+#~ msgid "Scan finished."
+#~ msgstr "Scan abgeschlossen."
+
+#~ msgid "WARNING"
+#~ msgstr "WARNUNG"
+
+#~ msgid "Could not start YaST Network Module. Is it installed?"
+#~ msgstr ""
+#~ "Das YaST-Netzwerkmodul konnte nicht gestartet werden. Ist es installiert?"
+
+#~ msgid "Could not start YaST Network Module, is it already installed?"
+#~ msgstr ""
+#~ "Das YaST-Netzwerkmodul konnte nicht gestartet werden. Ist es bereits "
+#~ "installiert?"
+
+#~ msgid "Scanning..."
+#~ msgstr "Scannen..."
+
+#~ msgid "MBit/s"
+#~ msgstr "MBit/s"
+
+#~ msgid "MHz"
+#~ msgstr "MHz"
+
+#~ msgid "dBm"
+#~ msgstr "dBm"
+
+#~ msgid "bit"
+#~ msgstr "Bit"
+
+#~ msgid "AP ESSID"
+#~ msgstr "AP ESSID"
+
+#~ msgid "Networkaddress"
+#~ msgstr "Netzwerkadresse"
+
+#~ msgid "AP mac"
+#~ msgstr "AP Mac"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "Netmask"
+#~ msgstr "Netzmaske"
+
+#~ msgid "Broadcast"
+#~ msgstr "Broadcast"
+
+#~ msgid "Link Quality"
+#~ msgstr "Link-Qualität"
+
+#~ msgid "Signal level"
+#~ msgstr "Signal-Level"
+
+#~ msgid "Noise level"
+#~ msgstr "Geräusch-Level"
+
+#~ msgid "Conntection details"
+#~ msgstr "Verbindungsdetails"
+
+#~ msgid "WEP Key"
+#~ msgstr "WEP-Schlüssel"
+
+#~ msgid "Encryption"
+#~ msgstr "Verschlüsselung"
+
+#~ msgid "WEP Key Size"
+#~ msgstr "WEP-Schlüsselgröße"
+
+#~ msgid "Not associated!"
+#~ msgstr "Nicht zugewiesen!"
+
 #~ msgid "OK"
 #~ msgstr "OK"
-#~ msgid "Cancel"
-#~ msgstr "Abbrechen"
+
 #~ msgid "Various Settings..."
 #~ msgstr "Verschiedene Einstellungen..."
+
 #~ msgid "View Log..."
 #~ msgstr "Protokoll ansehen..."
+
 #~ msgid "View Data Rate..."
 #~ msgstr "Übertragungsrate ansehen..."
-#~ msgid "&Settings..."
-#~ msgstr "&Einstellungen..."
-#~ msgid "St&op"
-#~ msgstr "St&opp"
-#~ msgid "&Quit"
-#~ msgstr "&Beenden"
-#~ msgid "Information"
-#~ msgstr "Information"
-#~ msgid "Apply"
-#~ msgstr "Anwenden"
-#~ msgid "Appearance"
-#~ msgstr "Erscheinungsbild"
-#~ msgid "Browse..."
-#~ msgstr "Durchsuchen..."
-#~ msgid "%n Second"
-#~ msgstr "%n Sekunde"
-#~ msgid "%1 Second"
-#~ msgstr "%1 Sekunde"
-#~ msgid "Error"
-#~ msgstr "Fehler"
-#~ msgid "&OK"
-#~ msgstr "&OK"
+
 #~ msgid "C&ancel"
 #~ msgstr "&Verwerfen"
+
 #~ msgid "Alt+A"
 #~ msgstr "Alt+A"
+
 #~ msgid "mac address"
 #~ msgstr "Mac-Adresse"
+
 #~ msgid "&Close"
 #~ msgstr "&Schließen"
+
 #~ msgid "Alt+C"
 #~ msgstr "Alt+C"
+
 #~ msgid "Warning"
 #~ msgstr "Warnung"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/po/Makefile.am new/qinternet-0.75_git200904291639/po/Makefile.am
--- old/qinternet-0.75_git200804251643/po/Makefile.am	2008-04-25 16:28:25.000000000 +0200
+++ new/qinternet-0.75_git200904291639/po/Makefile.am	2008-04-28 16:25:49.000000000 +0200
@@ -1,3 +1,25 @@
+XGETTEXT = xgettext
+MSGMERGE = msgmerge
+
+POTFILES =			\
+	src/check.cpp		\
+	src/configview.cpp	\
+	src/datarateview.cpp	\
+	src/dialprefix.cpp	\
+	src/kinternet.cpp	\
+	src/lists.cpp		\
+	src/logview.cpp		\
+	src/main.cpp		\
+	src/myconfig.cpp	\
+	src/myslp.cpp		\
+	src/mywallet.cpp	\
+	src/parse.cpp		\
+	src/password.cpp	\
+	src/route.cpp		\
+	src/server.cpp		\
+	src/settings.cpp	\
+	src/utils.cpp
+
 POFILES = \
 	bg.po \
 	cs.po \
@@ -32,7 +54,16 @@
 all: $(MOFILES)
 
 %.mo: %.po
-	msgfmt -o $@ $<
+	msgfmt -v -o $@ $<
+
+qinternet.pot: $(POTFILES:%=$(top_srcdir)/%)
+	$(XGETTEXT) --qt --c++ --keyword=i18n:1,2 --keyword=i18n -o $@ $^
+
+update-po: qinternet.pot
+	for i in $(POFILES); do \
+		echo -n "$$i: "; \
+		$(MSGMERGE) -v -U $$i qinternet.pot; \
+	done
 
 install-data-local:
 	@for i in $(MOFILES:.mo=); do \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/src/kinternet.cpp new/qinternet-0.75_git200904291639/src/kinternet.cpp
--- old/qinternet-0.75_git200804251643/src/kinternet.cpp	2008-04-25 14:56:13.000000000 +0200
+++ new/qinternet-0.75_git200904291639/src/kinternet.cpp	2009-04-29 09:33:02.000000000 +0200
@@ -410,9 +410,9 @@
 #endif
     menu->setItemEnabled (id_log, vital && myInterfaces.active);
     menu->setItemEnabled (id_datarate, vital && myInterfaces.active);
-    menu->setItemEnabled (id_config, vital && myInterfaces.active);
+    menu_conf->setItemEnabled (id_config, vital && myInterfaces.active);
 
-    menu->setItemEnabled (id_prefix, vital && action_flags & 0x100);
+    menu_conf->setItemEnabled (id_prefix, vital && action_flags & 0x100);
 
     menu->setItemEnabled (id_reconnect, autoserver->can_start_connect ());
 
@@ -891,7 +891,7 @@
 void
 KInternet::transfer_draw_icon ()
 {
-    transfer_icon_nr = ++transfer_icon_nr % 5;
+    transfer_icon_nr = (transfer_icon_nr + 1) % 5;
     update_icon ();
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/src/Makefile.am new/qinternet-0.75_git200904291639/src/Makefile.am
--- old/qinternet-0.75_git200804251643/src/Makefile.am	2008-04-25 16:00:35.000000000 +0200
+++ new/qinternet-0.75_git200904291639/src/Makefile.am	2008-04-28 14:50:39.000000000 +0200
@@ -124,17 +124,6 @@
 
 INCLUDES = $(all_includes)
 
-WITHMESSAGES = check.cpp configview.cpp datarateview.cpp dialprefix.cpp		\
-	kinternet.cpp lists.cpp logview.cpp main.cpp myconfig.cpp myslp.cpp	\
-	mywallet.cpp parse.cpp password.cpp route.cpp server.cpp settings.cpp	\
-	utils.cpp wepkey_inputdialog.cpp wepkeyinputdialog.cpp			\
-	wireless_dialog.cpp wirelessdialog.cpp wirelesslog.cpp
-
-messages:
-	$(XGETTEXT) --c++ --keyword=i18n:1,2 --add-comments=desc:		\
-		--keyword=tr2i18n:1,2 $(WITHMESSAGES)
-	mv messages.po ../po/kinternet.pot
-
 noinst_HEADERS = wepkeyinputdialog.h
 
 menudir = $(datadir)/applications
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/src/server.cpp new/qinternet-0.75_git200904291639/src/server.cpp
--- old/qinternet-0.75_git200804251643/src/server.cpp	2008-04-25 14:56:13.000000000 +0200
+++ new/qinternet-0.75_git200904291639/src/server.cpp	2008-09-10 15:40:54.000000000 +0200
@@ -238,11 +238,11 @@
 	    continue;
 	}
 
-	if (line == "error: failed to authenticated")
+	if (line == "error: failed to authenticated" || line.startsWith ("error: unprivileged"))
 	{
 	    if (!quiet)
 		emit error (i18n ("Authentication with the server failed."));
-	    set_status (FAILURE);
+	    set_status (NOTHING); // set to nothing so the auto search continues
 	    continue;
 	}
 
@@ -294,6 +294,7 @@
 
 	    if (line.startsWith ("error:")) {
 		buffer.clear ();
+		emit error (i18n ("Server returned an error: ")+line.mid(7));
 		continue;
 	    }
 	}
@@ -731,8 +732,8 @@
 	    if (tl && !tr)
 		emit error( i18n (
 			"Could not connect to local server. Maybe\n"
-			"smpppd is not running or you are not\n"
-			"member of the group \"dialout\".\n"
+			"smpppd is not running or you do not\n"
+			"have sufficient privileges.\n"
 			"Also check the server settings in\n"
 			"the dialog \"Various Settings\"."));
 	    else if (!tl && tr)
@@ -746,7 +747,7 @@
 		emit error( i18n (
 			"Connection to local and remote server\n"
 			"refused. Maybe smpppd is not running\n"
-			"or you are not member of the group \"dialout\".\n"
+			"or you do not have sufficient privileges.\n"
 			"Also check the server settings in\n"
 			"the dialog \"Various Settings\"."));
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qinternet-0.75_git200804251643/version.m4 new/qinternet-0.75_git200904291639/version.m4
--- old/qinternet-0.75_git200804251643/version.m4	2008-04-25 16:43:38.000000000 +0200
+++ new/qinternet-0.75_git200904291639/version.m4	2009-04-29 16:40:09.000000000 +0200
@@ -10,6 +10,6 @@
 [define([VERS], VERS[_SVN]esyscmd([LANG=C svnversion . | tr -d '\n']))],dnl
 syscmd(test -e .git)dnl
 ifelse(sysval, 0,dnl
-[define([VERS], VERS[_git]esyscmd([LANG=C date +%Y%m%d%H%M -d "1970-01-01 00:00 UTC `git-rev-list --timestamp HEAD^..HEAD|(read a b; echo $a)` seconds" | tr -d '\n']))],dnl
+[define([VERS], VERS[_git]esyscmd([LANG=C date +%Y%m%d%H%M -d "1970-01-01 00:00 UTC `git rev-list --timestamp HEAD^..HEAD|(read a b; echo $a)` seconds" | tr -d '\n']))],dnl
 )dnl
 )dnl


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit qinternet for openSUSE:Factory

root＠Hilbert.suse.de