Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/wlassistant
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/wlassistant/

10 files changed, 4992 insertions, 4600 deletions

diff --git a/po/ar/wlassistant.po b/po/ar/wlassistant.po
index 488d5f0..d08fc69 100644
--- a/po/ar/wlassistant.po
+++ b/po/ar/wlassistant.po
@@ -7,20 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2006-07-10 17:40+0300\n"
 "Last-Translator: Mohammed Gamal <[email protected]>\n"
 "Language-Team: Arabic\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "محمد جمال"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "مساعد الشبكة اللاسلكية"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>لقد تم تغيير اعدادات الأمن لهذه الشبكة.</p><p>فضلا اذهب الى "
+"باب<i>الأمن</i> في صندوق الحوار الخالي و قم بتهيئة اعدادات WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>لم يتم تعيين مفتاخ WEP الخاص بك بالشكل المناسب.</p><p>فضلا اذهب الى "
+"باب <i>الأمن</i> في صندوق الحوار هذا و أدخل المفتاح المطلوب.</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>لقد أوقفت الشبكة بث الـESSID الخاص بها منذ آخر مرة اتصلت بها.</"
+"p><p>هل تريد استخدام '<b>%1</b>'كـESSID لهذه الشبكة ؟</p><p><i>ملحوظة: اذا "
+"أجبت بلا, سيظهر مربع حوار يسمح لك باختيار ESSID مختلف  .</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "جاري التحميل..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -28,7 +74,7 @@ msgstr ""
 "الإصدار 2.6 من النواة غير موجود.\n"
 "مساعد الشبكات اللاسلكية لن يغلق."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -36,7 +82,7 @@ msgstr ""
 "لم يتم العثور على أي أجهزة لاسلكية.\n"
 "سيقوم مساعد الشبكات اللاسلكية بالخروج الآن."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -44,7 +90,7 @@ msgstr ""
 "<qt><p>ربما لا تكون لديك التصاريح الكافية لكي يعمل مساعد الشبكات اللاسلكية "
 "كي يعملبالشكل الصحيح.</p><p>هل قمت بتشغيله باستخدام '<tt>sudo</tt>'؟</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -52,17 +98,17 @@ msgstr ""
 "لم يتم العثور على الملفات التنفيذية '%1'.\n"
 "سيقوم مساعد الشبكات اللاسلكية بالخروج الآن."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
 msgstr "تم فقد الإتصال '%1'!<br> هل تريد اعادة الاتصال؟"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "تم فقد الاتصال"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -70,11 +116,11 @@ msgstr ""
 "<qt><p>أنت على وشك حذف اعدادت الشبكة '<b>%1</b>'.</p><p>هل  تريد المتابعة؟</"
 "p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "تم حذف الإعدادات"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -82,29 +128,27 @@ msgstr ""
 "<qt><p>تعذر فتح الملف '<i>%1</i>' للكتابة.</p><p>لم يتم تعيين خوادم الأسماء "
 "و/أو النظاق.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "جاري تشغيل الواجهة %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "جاري البحث..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "انتهى."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "لم يتم العثور على أي شبكة."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -115,22 +159,22 @@ msgstr ""
 "الكمبيوتر الخاص بك.\n"
 "يجب عليك تشغيله كي تتمكن من استخدام الشبكات اللاسلكية."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "التردد (هيرتز)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "معالج الإتصال الأول"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -138,44 +182,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - معالج الإتصال الأول"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "تم تحدبث اعدادات الشبكة."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "فشل الإتصال."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "جاري الإتصال بـ '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "تم فقد الاتصال"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "معالج الإتصال الأول"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "جاري اختبار الإتصال..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "تم الإتصال بـ'%1' بنجاح."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -183,11 +225,11 @@ msgstr ""
 "فشال الاتصال.\n"
 "هل تريد مراجعة الإعدادت لهذه الشبكة؟"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "هل تريد مراجعة الإعدادات؟"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -195,50 +237,50 @@ msgstr ""
 "<qt><p>أنت على وشك قطع الاتصال بـ  '<b>%1</b>'.</p><p>هل تريد المتابعة؟<p></"
 "qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "فشل الإتصال."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "جاري قطع الإتصال..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "جاري انتظار اغلاق عميل DHCP..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "معالج الإتصال الأول"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "ملغى."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "ا&قطع الإتصال"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "قطع الاتصال عن الشبكة المختارة."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "ا&تصل"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "اتصال بالشبكة المختارة"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "أق&ف"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -246,395 +288,286 @@ msgstr ""
 "انهاء العملية الحالية\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "خروج من البرنامج"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "اقطع الاتصال..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "اتصل"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "تجاهل الإعدادات..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "تحرير الإعدادات..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "اعدّ و اتصل..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "اعدادات %1"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "محمد جمال"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "مساعد الشبكة اللاسلكية"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>لقد تم تغيير اعدادات الأمن لهذه الشبكة.</p><p>فضلا اذهب الى "
-"باب<i>الأمن</i> في صندوق الحوار الخالي و قم بتهيئة اعدادات WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>لم يتم تعيين مفتاخ WEP الخاص بك بالشكل المناسب.</p><p>فضلا اذهب الى "
-"باب <i>الأمن</i> في صندوق الحوار هذا و أدخل المفتاح المطلوب.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>لقد أوقفت الشبكة بث الـESSID الخاص بها منذ آخر مرة اتصلت بها.</"
-"p><p>هل تريد استخدام '<b>%1</b>'كـESSID لهذه الشبكة ؟</p><p><i>ملحوظة: اذا "
-"أجبت بلا, سيظهر مربع حوار يسمح لك باختيار ESSID مختلف  .</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "اظهار و أخفاء قائمة/خيارات تاشبكة"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "ملغى."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>زر الخيارات</b></p>\n"
-"<p>نقر هذا الزر سيظهر الخيارات المتوفرة بالبرنامج.</p>\n"
-"<p><i>تلميح: نقر هذا الزر مرة أخرى يعود الى قائمة الشبكات.</i></p>"
+msgid "I&nterface"
+msgstr "ال&واجهة"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>زر الخروج</b></p>\n"
-"<p>نقر هذا الزر سينهي البرنامج.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "اتصل"
+msgid "Configuration"
+msgstr "اعدادات WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "أوتوماتيكي (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>زر الإتصال/قطع الاتصال</b></p>\n"
-"<p>نقر هذا الزر سيؤدي الى الإتصال/قطع الاتصال بالشبكة المختارة حاليا من "
-"قائمة الشبكات.</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "يدوي"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "اعد التحميل"
+msgid "Netmask:"
+msgstr "قناع الشبكة (netmask):"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "اعد تحميل قائمة الشبكات"
+msgid "IP:"
+msgstr "عنوان IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>زر البحث</b></p>\n"
-"<p>نقر هذا الزر سيقوم بالبحث عن الشبكات اللاسلكية و سيعيد تحميل قائمة "
-"الشبكات.</p>"
+msgid "Broadcast:"
+msgstr "عنوان البث Broadcast:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "الجهاز:"
+msgid "Gateway:"
+msgstr "البوابة:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "اختر جهاز الشبكة الذي سيتم استخدامه"
+msgid "Domain:"
+msgstr "النطاق:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>اختيار الجهاز</b></p>\n"
-"<p>هذه القائمة تسمح لك باختيار البطاقة اللاسلكية التي تريد استخدامها..</p>\n"
-"<p><i>ملحوظة: اختيار بطاقة مختلفة سيؤدي الى اعادة تحميل قائمة الشبكات.</i></"
-"p>"
+msgid "Secondary DNS:"
+msgstr "DNS الثانوي:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "DNS الأساسي:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "القناة"
+msgid "Securit&y"
+msgstr "الأ&من"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "جودة الوصلة"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "اعدادات %1"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "المفتاح:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "نقطة الاتصال"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>قائمة الشبكات</b></p>\n"
-"<p>هذه القائمة تظهر جميع الشبكات اللاسلكية التي وجدخا البرنامج.</p>\n"
-"<p><i>تلنيح: نقر زر التحديث سيعيد تحميل هذه القائمة.</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>شريط الحالة</b></p>\n"
-"<p>الرسائل التي تصف العملية الحالية ستظهر في هذا المكان.</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "اعدادات %1"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "نظام مفتوح"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "مفتاح مشترك"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>الخروج عند النجاح في الاتصال</b></p>\n"
-"<p>التأشير على هذا الصندوق سيغلق البرنامج بعد النجاح في إنشاء اتصال بشبكة "
-"لاسلكية.</p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "اخرج عند النجاح في الاتصال"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "فشل الإتصال."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>الخروج عند النجاح في الاتصال</b></p>\n"
-"<p>التأشير على هذا الصندوق سيغلق البرنامج بعد النجاح في إنشاء اتصال بشبكة "
-"لاسلكية.</p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "يحدد الحد الأقضى لانتظار الحصول على عنوان IP"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>الوقت الأقصى لعميل DHCP</b></p>\n"
-"<p>هذا الخيار يحدد مقدار الوقت الذي يجب في أن يتوقف البرنامج عن انتظار "
-"الحصول على عنوان IP و أن يعتبر أنه فشل في انشاءاتصال.</p>\n"
-"<p><i>تلميح: زيادة هذا الرقم قد تساعدك اذا كانت لديك مشاكل في الاتصالببعض "
-"الشبكات.</i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "الوقت الأقصى لعميل DHCP:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
 
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "يحدد الحد الأقضى لانتظار الحصول على عنوان IP"
+msgid "Command:"
+msgstr "النطاق:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>الوقت الأقصى لعميل DHCP</b></p>\n"
-"<p>هذا الخيار يحدد مقدار الوقت الذي يجب في أن يتوقف البرنامج عن انتظار "
-"الحصول على عنوان IP و أن يعتبر أنه فشل في انشاءاتصال.</p>\n"
-"<p><i>تلميح: زيادة هذا الرقم قد تساعدك اذا كانت لديك مشاكل في الاتصالببعض "
-"الشبكات.</i></p>"
+msgid "Post-Connection Command"
+msgstr "معالج الإتصال الأول"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>انقر هذا الزر لتمكين جميع الرسائل التي تم تعطيلها عند اختيار عدم اظهارها "
-"مرة أخرى.</i>"
 
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "تمكين جميع الرسائل"
-
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>تمكين جميع الرسائل</b></p>\n"
-"<p>نقر هذا الزر سيمكن جميع الرسائل التي تم تعطيلها عند اختيار عدم اظهارها "
-"مرة أخرى.</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "معالج الإتصال الأول"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "أهلا بك في معالج الإتصال الأول"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -647,7 +580,7 @@ msgstr ""
 "<p>سيتم سؤالك بعض الأسئلة الضرورية لإعداد هذا الاتصال.</p>\n"
 "<p><i>انقر التالي للمتابعة.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -660,27 +593,17 @@ msgstr ""
 "<p>Please specify ESSID that you would like to use when connecting to this "
 "access point.</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "اعدادات الواجهة"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "أوتوماتيكي (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "يدوي"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -692,47 +615,12 @@ msgstr ""
 "بأيشبكة.</b></p>\n"
 "<p>أي خيار تريد استخدامه عند الاتصال بهذه  الشبكة؟</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "معاملات الواجهة"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "DNS الثانوي:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "عنوان IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "قناع الشبكة (netmask):"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "DNS الأساسي:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "البوابة:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "النطاق:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "عنوان البث Broadcast:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -743,12 +631,12 @@ msgstr ""
 "p>\n"
 "<p>يمكنك ترك بعض الحقول فارغة.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "اعدادات WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -758,39 +646,34 @@ msgstr ""
 "<p><b>الشبكة التي تحاول الاتصال بها تحتاج الى مصادقة WEP.</b></p>\n"
 "<p>ما هو وضع WEP الذي تريد استخدامه؟</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "نظام مفتوح"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "مفتاح مشترك"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>فضلا أدخل المفتاخ الذي سيستخدم مع هذه الشبكة.</b></p>\n"
 "يمكن استخدام أي نسق مدعوم من iwconfig."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "مفتاح WEP:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "اعدادات WEP"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -799,28 +682,17 @@ msgstr ""
 "<p><b>الشبكة التي تحاول الاتصال بها تحتاج الى مصادقة WEP.</b></p>\n"
 "<p>ما هو وضع WEP الذي تريد استخدامه؟</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "مفتاح WEP"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "انتهى!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -831,133 +703,300 @@ msgstr ""
 "<p>لقد قمت بإعداد هذا الاتصال بنجاح.</p>\n"
 "<p><b>اضغط زر الإنهاء للاتصال!</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "ال&واجهة"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "يدوي"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "اظهار و أخفاء قائمة/خيارات تاشبكة"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "الأ&من"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>زر الخيارات</b></p>\n"
+"<p>نقر هذا الزر سيظهر الخيارات المتوفرة بالبرنامج.</p>\n"
+"<p><i>تلميح: نقر هذا الزر مرة أخرى يعود الى قائمة الشبكات.</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "اعدادات %1"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "المفتاح:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>زر الخروج</b></p>\n"
+"<p>نقر هذا الزر سينهي البرنامج.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "اعدادات %1"
+msgid "Co&nnect"
+msgstr "اتصل"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "نظام مفتوح"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>زر الإتصال/قطع الاتصال</b></p>\n"
+"<p>نقر هذا الزر سيؤدي الى الإتصال/قطع الاتصال بالشبكة المختارة حاليا من "
+"قائمة الشبكات.</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "مفتاح مشترك"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "اعد التحميل"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "اعد تحميل قائمة الشبكات"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>زر البحث</b></p>\n"
+"<p>نقر هذا الزر سيقوم بالبحث عن الشبكات اللاسلكية و سيعيد تحميل قائمة "
+"الشبكات.</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "الجهاز:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "اختر جهاز الشبكة الذي سيتم استخدامه"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
+msgstr ""
+"<p><b>اختيار الجهاز</b></p>\n"
+"<p>هذه القائمة تسمح لك باختيار البطاقة اللاسلكية التي تريد استخدامها..</p>\n"
+"<p><i>ملحوظة: اختيار بطاقة مختلفة سيؤدي الى اعادة تحميل قائمة الشبكات.</i></"
+"p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "القناة"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "جودة الوصلة"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
 msgstr ""
 
-#: rc.cpp:403
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "نقطة الاتصال"
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>قائمة الشبكات</b></p>\n"
+"<p>هذه القائمة تظهر جميع الشبكات اللاسلكية التي وجدخا البرنامج.</p>\n"
+"<p><i>تلنيح: نقر زر التحديث سيعيد تحميل هذه القائمة.</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "فشل الإتصال."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>شريط الحالة</b></p>\n"
+"<p>الرسائل التي تصف العملية الحالية ستظهر في هذا المكان.</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
+msgstr ""
+
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
 msgstr ""
+"<p><b>الخروج عند النجاح في الاتصال</b></p>\n"
+"<p>التأشير على هذا الصندوق سيغلق البرنامج بعد النجاح في إنشاء اتصال بشبكة "
+"لاسلكية.</p>"
+
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "اخرج عند النجاح في الاتصال"
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
 msgstr ""
+"<p><b>الخروج عند النجاح في الاتصال</b></p>\n"
+"<p>التأشير على هذا الصندوق سيغلق البرنامج بعد النجاح في إنشاء اتصال بشبكة "
+"لاسلكية.</p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "يحدد الحد الأقضى لانتظار الحصول على عنوان IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>الوقت الأقصى لعميل DHCP</b></p>\n"
+"<p>هذا الخيار يحدد مقدار الوقت الذي يجب في أن يتوقف البرنامج عن انتظار "
+"الحصول على عنوان IP و أن يعتبر أنه فشل في انشاءاتصال.</p>\n"
+"<p><i>تلميح: زيادة هذا الرقم قد تساعدك اذا كانت لديك مشاكل في الاتصالببعض "
+"الشبكات.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "الوقت الأقصى لعميل DHCP:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "النطاق:"
+msgid "Specify how long to wait before scanning"
+msgstr "يحدد الحد الأقضى لانتظار الحصول على عنوان IP"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "معالج الإتصال الأول"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>الوقت الأقصى لعميل DHCP</b></p>\n"
+"<p>هذا الخيار يحدد مقدار الوقت الذي يجب في أن يتوقف البرنامج عن انتظار "
+"الحصول على عنوان IP و أن يعتبر أنه فشل في انشاءاتصال.</p>\n"
+"<p><i>تلميح: زيادة هذا الرقم قد تساعدك اذا كانت لديك مشاكل في الاتصالببعض "
+"الشبكات.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>انقر هذا الزر لتمكين جميع الرسائل التي تم تعطيلها عند اختيار عدم اظهارها "
+"مرة أخرى.</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "تمكين جميع الرسائل"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>تمكين جميع الرسائل</b></p>\n"
+"<p>نقر هذا الزر سيمكن جميع الرسائل التي تم تعطيلها عند اختيار عدم اظهارها "
+"مرة أخرى.</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "وضع WEP"
diff --git a/po/ca/wlassistant.po b/po/ca/wlassistant.po
index f549756..423d96c 100644
--- a/po/ca/wlassistant.po
+++ b/po/ca/wlassistant.po
@@ -11,26 +11,75 @@
 # ClawLinux, 2005.
 # Daniel Nascimento <[email protected]>, 2005.
 # ClawLinux, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2005-10-06 22:40+0200\n"
 "Last-Translator: ClawLinux\n"
 "Language-Team:  <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Adonay Sanz Alsina"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Asistent de xarxes inalàmbriques"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>La xarxa ha canviat la seva configuració de seguretat.</p><p>Si us "
+"plau ves a la pestanya<i>Seguretat</i> del següent diàleg i configura els "
+"paràmetres WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>La seva clau WEP no està configurada correctament.</p><p>Si us plau "
+"ves a la pestanya <i>Seguretat</i> i introdueixi la clau necessària.</p></"
+"qt> "
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>La red ha parat el d'enviar el seu ESSID des de l'última vegada que "
+"s'ha connectat.</p><p>Vol utilitzar '<b>$1</b> com ESSID d'aquesta xarxa?</"
+"p><p><i>NOTA: Si respon NO, un quadre de dialeg apareixerà on podrà indicar "
+"un ESSID diferent..</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Engegant..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -38,7 +87,7 @@ msgstr ""
 "Kernel 2.6 o superior no trobat.\n"
 "L'assistent de xarxes inalàmbriques es tancarà ara."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -46,7 +95,7 @@ msgstr ""
 "No s'ha trobat cap dispositiu inalàmbric.\n"
 "L'assistent de xarxes inalàmbriques es tancarà ara."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -55,7 +104,7 @@ msgstr ""
 "Inalàmbriques satisfactoriament.</p><p>L'ha executat amb '<tt>sudo</tt>'?</"
 "p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -63,7 +112,7 @@ msgstr ""
 "Programa(s) '%1' no troba(s).\n"
 "L'assistent de xarxes inalàmbriques es tancarà ara."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -71,11 +120,11 @@ msgstr ""
 "La connexió a '%1' s'ha perdut!\n"
 "Vol tornar a connectar?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Connexió Perduda"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -83,11 +132,11 @@ msgstr ""
 "<qt><p>Les configuracions de xarxa '<b>%1</b>' seran esborrades.</p><p>Vol "
 "continuar?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Configuracions esborrades."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -95,29 +144,27 @@ msgstr ""
 "<qt><p>Arxiu '<i>%1</i>' no pot ser obert per la escriptura.</p><p>Servidor "
 "de nom(s) i/o domini no pot ser configurat.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Activant interfície %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Cercant..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Fet."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "No s'ha trobat xarxes."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -129,22 +176,22 @@ msgstr ""
 "Es necessari que activi l'interrumptor per utilitzar les xarxes "
 "inalàmbriques."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "Freq (Hz)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "Assistent de Primera Connexió"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -152,44 +199,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Assistent de primera connexió"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Configuracións de xarxa actualitzades."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "Connexió fallida."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Connectant a '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "Connexió Perduda"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "Assistent de Primera Connexió"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Comprobant connexió..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Connectat satisfactoriament a '%1'."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -197,11 +242,11 @@ msgstr ""
 "La connexió ha fallit.\n"
 "Vol revisar la configuració d'aquesta xarxa?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "Revisar configuracions?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -209,50 +254,50 @@ msgstr ""
 "<qt><p>Està a punt de desconnectar-se de '<b>%1</b>'.</p><p>Vol continuar?"
 "<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "Connexió fallida."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Desconnectant..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "Esperant a que el client DHCP finalitzi..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "Assistent de Primera Connexió"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Cancel·lat."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&Desconnectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Desconnectar de la xarxa sel·lecionada"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "&Connectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Connectar a la xarxa sel·leccionada"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&Parar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -260,403 +305,286 @@ msgstr ""
 "Finalitzar el procés actual\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Sortir de l'aplicació"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Desconnectar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "Connectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Oblidar Configuracions..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Editar Configuracions..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Configurar y Connectar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "%1 Configuracions"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Adonay Sanz Alsina"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Asistent de xarxes inalàmbriques"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>La xarxa ha canviat la seva configuració de seguretat.</p><p>Si us "
-"plau ves a la pestanya<i>Seguretat</i> del següent diàleg i configura els "
-"paràmetres WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>La seva clau WEP no està configurada correctament.</p><p>Si us plau "
-"ves a la pestanya <i>Seguretat</i> i introdueixi la clau necessària.</p></"
-"qt> "
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>La red ha parat el d'enviar el seu ESSID des de l'última vegada que "
-"s'ha connectat.</p><p>Vol utilitzar '<b>$1</b> com ESSID d'aquesta xarxa?</"
-"p><p><i>NOTA: Si respon NO, un quadre de dialeg apareixerà on podrà indicar "
-"un ESSID diferent..</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Alternar llista de xarxes/opciones"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Cancel·lat."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>Opcions</b></p>\n"
-"<p>Prement aquest botó de dos posicions, podrà visualitzar les opcions del "
-"programa.</p>\n"
-"<p><i>NOTA: Prement novament el botó, tornarà a la llista de xarxes.</i></p>"
+msgid "I&nterface"
+msgstr "I&nterfície"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>Sortir</b></p>\n"
-"<p>Prement aquest botó l'aplicació es tancarà.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "Connectar"
+msgid "Configuration"
+msgstr "Configuració WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automàtic (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Connectar/Desconnectar</b></p>\n"
-"<p>Prement aquest botó es Connecta/Desconnecta de la xarxa sel·leccionada en "
-"la llista de xarxes inalàmbriques trobadesred.</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "Manual"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Actualizar"
+msgid "Netmask:"
+msgstr "Màscara de xarxa:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Actualizar llista de xarxes"
+msgid "IP:"
+msgstr "IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Botó d'Actualizar</b></p>\n"
-"<p>Prement aquest botó es buscaran les xarxes inalàmbriques disponibles i "
-"s'actualitzarà la llista de xarxes.</p>"
+msgid "Broadcast:"
+msgstr "Broadcast:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Dispositiu:"
+msgid "Gateway:"
+msgstr "Porta d'enllaç:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Sel·leccionar un dispositiu de xarxa"
+msgid "Domain:"
+msgstr "Domini:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Sel·lecciño de dispositiu</b></p>\n"
-"<p>Aquest menú desplegable permet sel·leccionar el dispositiu inalàmbric a "
-"utilitzar.</p>\n"
-"<p><i>NOTA: Si sel·lecciona un dispositiu diferent la llista de xarxes "
-"s'actualizarà.</i></p>"
+msgid "Secondary DNS:"
+msgstr "DNS secundària:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "DNS primària:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Canal"
+msgid "Securit&y"
+msgstr "Se&guretat"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "Calitat de la senyal"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "%1 Configuracions"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "Clau:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "AP"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Llista de xarxes</b></p>\n"
-"<p>Aquesta llista mostra les xarxes inalàmbriques que s'ha trobat.</p>\n"
-"<p><i>NOTA: Premi en el botó per actualizar aquesta llista.</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>Barra d'Estatat</b></p>\n"
-"<p>Els missatges que expliquen el procés actual seran mostrats en aquesta "
-"part.</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "%1 Configuracions"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "Red Oberta"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "Clau compartida"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Sortir un cop connectat correctament.</b></p>\n"
-"<p>Activant aquesta opció el programa es tancarà si la connexió a la xarxa "
-"inalàmbrica s'ha establert correctament.</p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Sortir un cop connectat correctament"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "Connexió fallida."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>Sortir un cop connectat correctament.</b></p>\n"
-"<p>Activant aquesta opció el programa es tancarà si la connexió a la xarxa "
-"inalàmbrica s'ha establert correctament.</p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Especifiqui el temps d'espera per obtenir la adreça IP"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>Temps d'espera del client HCP</b></p>\n"
-"<p>Aquesta opció especifica l'interval de temps que aquest programa ha "
-"d'esperar per parar de buscar una direcció IP i assumirà que la connexió ha "
-"fallat.</p>\n"
-"<p><i>NOTA: Augmentant aquest número pot ajudar a connectar-se a reds amb "
-"problemes de temps d'espera.</i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Temps d'espera del client DHCP:"
 
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
-
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Especifiqui el temps d'espera per obtenir la adreça IP"
+msgid "Command:"
+msgstr "Domini:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>Temps d'espera del client HCP</b></p>\n"
-"<p>Aquesta opció especifica l'interval de temps que aquest programa ha "
-"d'esperar per parar de buscar una direcció IP i assumirà que la connexió ha "
-"fallat.</p>\n"
-"<p><i>NOTA: Augmentant aquest número pot ajudar a connectar-se a reds amb "
-"problemes de temps d'espera.</i></p>"
+msgid "Post-Connection Command"
+msgstr "Assistent de Primera Connexió"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>Prement aquest botó tots els missatges del programa que s'hagin "
-"deshabilitat amb la opció 'No mostrar de nou' seran mostrats.</i>"
-
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "Habilitar tots els missatges"
 
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>Habilitar tots els missatges</b></p>\n"
-"<p>Prement aquest botó tots els missatges del programa que s'hagin "
-"deshabilitat amb la opció 'No mostrar de nou' seran mostrats.</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Assistent de Primera Connexió"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Benvingut a l'Assistent de Primera Connexió"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -671,7 +599,7 @@ msgstr ""
 "aquesta connexió.</p>\n"
 "<p><i>Premi Següent per continuar.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -684,27 +612,17 @@ msgstr ""
 "<p>Si us plau, indica el ESSID que vol tenir quant es connecti a aquest punt "
 "d'accés.</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Configuració d'Interfície"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automàtic (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Manual"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -717,47 +635,12 @@ msgstr ""
 "<p>Quina opció de configuració desitja usar per connectar-se a aquesta xarxa?"
 "</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Paràmetres de l'interfície"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "DNS secundària:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Màscara de xarxa:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "DNS primària:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Porta d'enllaç:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Domini:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Broadcast:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -768,12 +651,12 @@ msgstr ""
 "aquesta xarxa.</b></p>\n"
 "<p>Pot deixar algún camp en blanc.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "Configuració WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -784,17 +667,17 @@ msgstr ""
 "p>\n"
 "<p>Quin mode WEP desitja utilitzar?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "Red Oberta"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
@@ -802,22 +685,17 @@ msgstr ""
 "b></p>\n"
 "Qualsevol format suportat per \"iwconfig\" pot ser utilitzat."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "Clau WEP:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "Configuració WEP"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -827,28 +705,17 @@ msgstr ""
 "p>\n"
 "<p>Quin mode WEP desitja utilitzar?</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "Clau WEP"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "Fet!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -859,133 +726,305 @@ msgstr ""
 "<p>Ha configurat correctament aquesta connexió.</p>\n"
 "<p><b>Prem Finalitzar per connectar!</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "I&nterfície"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "Manual"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "Alternar llista de xarxes/opciones"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "Se&guretat"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Opcions</b></p>\n"
+"<p>Prement aquest botó de dos posicions, podrà visualitzar les opcions del "
+"programa.</p>\n"
+"<p><i>NOTA: Prement novament el botó, tornarà a la llista de xarxes.</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "%1 Configuracions"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Clau:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Sortir</b></p>\n"
+"<p>Prement aquest botó l'aplicació es tancarà.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "%1 Configuracions"
+msgid "Co&nnect"
+msgstr "Connectar"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "Red Oberta"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Connectar/Desconnectar</b></p>\n"
+"<p>Prement aquest botó es Connecta/Desconnecta de la xarxa sel·leccionada en "
+"la llista de xarxes inalàmbriques trobadesred.</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "Clau compartida"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "Actualizar"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "Actualizar llista de xarxes"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Botó d'Actualizar</b></p>\n"
+"<p>Prement aquest botó es buscaran les xarxes inalàmbriques disponibles i "
+"s'actualitzarà la llista de xarxes.</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "Dispositiu:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Sel·leccionar un dispositiu de xarxa"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
 msgstr ""
+"<p><b>Sel·lecciño de dispositiu</b></p>\n"
+"<p>Aquest menú desplegable permet sel·leccionar el dispositiu inalàmbric a "
+"utilitzar.</p>\n"
+"<p><i>NOTA: Si sel·lecciona un dispositiu diferent la llista de xarxes "
+"s'actualizarà.</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "Canal"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "Calitat de la senyal"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
+msgstr ""
+
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "AP"
 
-#: rc.cpp:403
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>Llista de xarxes</b></p>\n"
+"<p>Aquesta llista mostra les xarxes inalàmbriques que s'ha trobat.</p>\n"
+"<p><i>NOTA: Premi en el botó per actualizar aquesta llista.</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Connexió fallida."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>Barra d'Estatat</b></p>\n"
+"<p>Els missatges que expliquen el procés actual seran mostrats en aquesta "
+"part.</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
 msgstr ""
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
+msgstr ""
+"<p><b>Sortir un cop connectat correctament.</b></p>\n"
+"<p>Activant aquesta opció el programa es tancarà si la connexió a la xarxa "
+"inalàmbrica s'ha establert correctament.</p>"
+
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "Sortir un cop connectat correctament"
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
 msgstr ""
+"<p><b>Sortir un cop connectat correctament.</b></p>\n"
+"<p>Activant aquesta opció el programa es tancarà si la connexió a la xarxa "
+"inalàmbrica s'ha establert correctament.</p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Especifiqui el temps d'espera per obtenir la adreça IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Temps d'espera del client HCP</b></p>\n"
+"<p>Aquesta opció especifica l'interval de temps que aquest programa ha "
+"d'esperar per parar de buscar una direcció IP i assumirà que la connexió ha "
+"fallat.</p>\n"
+"<p><i>NOTA: Augmentant aquest número pot ajudar a connectar-se a reds amb "
+"problemes de temps d'espera.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Temps d'espera del client DHCP:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "Domini:"
+msgid "Specify how long to wait before scanning"
+msgstr "Especifiqui el temps d'espera per obtenir la adreça IP"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "Assistent de Primera Connexió"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Temps d'espera del client HCP</b></p>\n"
+"<p>Aquesta opció especifica l'interval de temps que aquest programa ha "
+"d'esperar per parar de buscar una direcció IP i assumirà que la connexió ha "
+"fallat.</p>\n"
+"<p><i>NOTA: Augmentant aquest número pot ajudar a connectar-se a reds amb "
+"problemes de temps d'espera.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>Prement aquest botó tots els missatges del programa que s'hagin "
+"deshabilitat amb la opció 'No mostrar de nou' seran mostrats.</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "Habilitar tots els missatges"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>Habilitar tots els missatges</b></p>\n"
+"<p>Prement aquest botó tots els missatges del programa que s'hagin "
+"deshabilitat amb la opció 'No mostrar de nou' seran mostrats.</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "Mode WEP"
diff --git a/po/es/wlassistant.po b/po/es/wlassistant.po
index 33c36f9..ca57593 100644
--- a/po/es/wlassistant.po
+++ b/po/es/wlassistant.po
@@ -9,20 +9,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2006-08-17 20:54+0200\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
+"Language: es\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"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Mario Izquierdo (mariodebian),Enrique Matías Sánchez (Quique)"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected],[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Asistente de redes inalámbricas"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>La red ha cambiado sus opciones de seguridad.</p><p>Por favor, vaya a "
+"la solapa <i>Seguridad</i> del siguiente diálogo y configure los parámetros "
+"WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>Su clave WEP no está configurada correctamente.</p><p>Por favor, vaya "
+"a la solapa <i>Seguridad</i> e introduzca la clave necesaria.</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>La red ha dejado de difundir su ESSID desde la última vez que se "
+"conectó.</p><p>¿Quiere usar «<b>$1</b>» como ESSID de esta red'?</"
+"p><p><i>NOTA: Si contesta NO, aparecerá un cuadro de diálogo donde podrá "
+"indicar otro ESSID.</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Inicializando..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -30,7 +78,7 @@ msgstr ""
 "Núcleo 2.6 o superior no encontrado.\n"
 "El Asistente de redes inalámbricas se cerrará ahora."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -38,7 +86,7 @@ msgstr ""
 "No se han encontrado dispositivos inalámbricos.\n"
 "El Asistente de redes inalámbricas se cerrará ahora."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -47,7 +95,7 @@ msgstr ""
 "redes inalámbricas funcione correctamente.</p><p>¿Ejecutó esta aplicación "
 "usando «<tt>sudo</tt>»?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -55,7 +103,7 @@ msgstr ""
 "No se ha encontrado el/los ejecutable(s) «%1».\n"
 "El Asistente de redes inalámbricas se cerrará ahora."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -63,11 +111,11 @@ msgstr ""
 "¡Se ha perdido la conexión a «%1»!\n"
 "¿Quiere volver a conectar?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Conexión perdida"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -75,11 +123,11 @@ msgstr ""
 "<qt><p>Se van a borrar las configuraciones de la red «<b>%1</b>».</"
 "p><p>¿Quiere continuar?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Configuraciones borradas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -87,29 +135,27 @@ msgstr ""
 "<qt><p>No se puede escribir en el fichero «<i>%1</i>».</p><p>No se ha "
 "configurado el servidor de nombres y/o el dominio.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Activando la interfaz %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Explorando..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Hecho."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "No se ha encontrado ninguna red."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -120,22 +166,22 @@ msgstr ""
 "externo de su computadora.\n"
 "Necesita activarla para poder usar redes inalámbricas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "Frec (Hz)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "Asistente de primera conexión"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -143,44 +189,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Asistente de primera conexión"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Se han actualizado las configuraciones de red."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "Conexión fallida."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Conectando a «%1»..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión perdida"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "Asistente de primera conexión"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Comprobando la conexión..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Conectado correctamente a «%1»."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -188,11 +232,11 @@ msgstr ""
 "La conexión ha fallado.\n"
 "¿Quiere revisar la configuración de esta red?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "¿Revisar las configuraciones?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -200,50 +244,50 @@ msgstr ""
 "<qt><p>Está a punto de desconectarse de ' «<b>%1</b>».</p><p>¿Desea "
 "continuar?<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "Conexión fallida."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Desconectando..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "Esperando finalización del cliente DHCP..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "Asistente de primera conexión"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&Desconectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Desconectar de la red selecionada"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "&Conectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Conectar a la red seleccionada"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&Parar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -251,400 +295,286 @@ msgstr ""
 "Terminar el proceso actual\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Salir de la aplicación"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Desconectar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "Conectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Olvidar las opciones..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Editar las opciones..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Configurar y conectar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "Opciones de %1"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Mario Izquierdo (mariodebian),Enrique Matías Sánchez (Quique)"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected],[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Asistente de redes inalámbricas"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>La red ha cambiado sus opciones de seguridad.</p><p>Por favor, vaya a "
-"la solapa <i>Seguridad</i> del siguiente diálogo y configure los parámetros "
-"WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>Su clave WEP no está configurada correctamente.</p><p>Por favor, vaya "
-"a la solapa <i>Seguridad</i> e introduzca la clave necesaria.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>La red ha dejado de difundir su ESSID desde la última vez que se "
-"conectó.</p><p>¿Quiere usar «<b>$1</b>» como ESSID de esta red'?</"
-"p><p><i>NOTA: Si contesta NO, aparecerá un cuadro de diálogo donde podrá "
-"indicar otro ESSID.</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Conmutar lista de redes/opciones"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Cancelada."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>Opciones</b></p>\n"
-"<p>Presionando este botón de dos posiciones podrá ver las opciones "
-"disponibles del programa.</p>\n"
-"<p><i>NOTA: Presionando nuevamente el botón regresará a la lista de redes.</"
-"i></p>"
+msgid "I&nterface"
+msgstr "I&nterfaz"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>Salir</b></p>\n"
-"<p>Al pulsar este botón se cerrará la aplicación.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "Conectar"
+msgid "Configuration"
+msgstr "Configuración WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automático (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Conectar/Desconectar</b></p>\n"
-"<p>Presionando este botón se conecta/desconecta de la red seleccionada en la "
-"lista de redes.</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "Manual"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Actualizar"
+msgid "Netmask:"
+msgstr "Máscara de red:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Actualizar la lista de redes"
+msgid "IP:"
+msgstr "IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Explorar</b></p>\n"
-"<p>Al pulsar este botón se buscarán redes inalámbricas y se actualizará la "
-"lista de redes.</p>"
+msgid "Broadcast:"
+msgstr "Difusión:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Dispositivo:"
+msgid "Gateway:"
+msgstr "Puerta de enlace:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Seleccionar un dispositivo de red"
+msgid "Domain:"
+msgstr "Dominio:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Selección de dispositivo</b></p>\n"
-"<p>Este menú desplegable le permite seleccionar qué tarjeta inalámbricausar."
-"</p>\n"
-"<p><i>NOTA: Si selecciona una tarjeta diferente la lista de redes se "
-"actualizará.</i></p>"
+msgid "Secondary DNS:"
+msgstr "DNS secundario:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "DNS primario:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Canal"
+msgid "Securit&y"
+msgstr "&Seguridad"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "Calidad del enlace"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "Opciones de %1"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "Clave:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "AP"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Lista de redes</b></p>\n"
-"<p>Esta lista muestra las redes inalámbricas que se han encontrado.</p>\n"
-"<p><i>NOTA: Pulse el botón «Actualizar» para actualizar esta lista.</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>Barra de estado</b></p>\n"
-"<p>En este área se muestran los mensajes que explican el proceso actual.</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "Opciones de %1"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "Red abierta"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "Clave compartida"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Salir una vez conectado correctamente.</b></p>\n"
-"<p>Si se marca esta casilla, la aplicación se cerrará tras establecer con "
-"éxito una conexión a una red inalámbrica.</p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Salir una vez conectado correctamente"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "Conexión fallida."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>Salir una vez conectado correctamente.</b></p>\n"
-"<p>Si se marca esta casilla, la aplicación se cerrará tras establecer con "
-"éxito una conexión a una red inalámbrica.</p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Indique cuanto tiempo esperar para obtener una IP"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>Tiempo de espera del cliente DHCP</b></p>\n"
-"<p>Esta opción indica la cantidad de tiempo tras la que la aplicación dejará "
-"de esperar una dirección IP y supondrá que la conexión ha fallado.</p>\n"
-"<p><i>NOTA: Aumentar este número puede ayudar si tiene problemas para "
-"conectarse a algunas redes.</i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Tiempo de espera del cliente DHCP:"
 
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
-
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Indique cuanto tiempo esperar para obtener una IP"
+msgid "Command:"
+msgstr "Dominio:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>Tiempo de espera del cliente DHCP</b></p>\n"
-"<p>Esta opción indica la cantidad de tiempo tras la que la aplicación dejará "
-"de esperar una dirección IP y supondrá que la conexión ha fallado.</p>\n"
-"<p><i>NOTA: Aumentar este número puede ayudar si tiene problemas para "
-"conectarse a algunas redes.</i></p>"
+msgid "Post-Connection Command"
+msgstr "Asistente de primera conexión"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>Pulse el botón inferior para habilitar todos los mensajes que han sido "
-"desactivados con la opción «No mostrar de nuevo».</i>"
-
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "Habilitar todos los mensajes"
 
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>Habilitar todos los mensajes</b></p>\n"
-"<p>Al pulsar este botón se habilitarán todos los mensajes que han sido "
-"desactivados con la opción «No mostrar de nuevo».</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Asistente de primera conexión"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Bienvenido al Asistente de primera conexión"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -659,7 +589,7 @@ msgstr ""
 "</p>\n"
 "<p><i>Pulse «Siguiente» para continuar.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -672,27 +602,17 @@ msgstr ""
 "<p>Por favor, indique el ESSID que quiere usar al conectarse a este punto de "
 "accesso.</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Configuración de la interfaz"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automático (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Manual"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -704,47 +624,12 @@ msgstr ""
 "cualquier red.</b></p>\n"
 "<p>¿Que opción de configuración desea usar para conectarse a esta red?</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Parámetros de la interfaz"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "DNS secundario:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Máscara de red:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "DNS primario:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Puerta de enlace:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Dominio:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Difusión:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -755,12 +640,12 @@ msgstr ""
 "conectarse a esta red.</b></p>\n"
 "<p>Puede dejar algún campo en blanco.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "Configuración WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -771,39 +656,34 @@ msgstr ""
 "p>\n"
 "<p>¿Qué modo WEP desea usar?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "Red abierta"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "Clave compartida"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>Por favor, indique la clave que se usará para esta red.</b></p>\n"
 "Se puede usar cualquier formato admitido por iwconfig."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "Clave WEP:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "Configuración WEP"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -813,28 +693,17 @@ msgstr ""
 "p>\n"
 "<p>¿Qué modo WEP desea usar?</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "Clave WEP"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "¡Hecho!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -845,133 +714,303 @@ msgstr ""
 "<p>Ha configurado correctamente esta conexión.</p>\n"
 "<p><b>¡Presione «Finalizar» para conectar!</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "I&nterfaz"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "Manual"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "Conmutar lista de redes/opciones"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "&Seguridad"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Opciones</b></p>\n"
+"<p>Presionando este botón de dos posiciones podrá ver las opciones "
+"disponibles del programa.</p>\n"
+"<p><i>NOTA: Presionando nuevamente el botón regresará a la lista de redes.</"
+"i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "Opciones de %1"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Clave:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Salir</b></p>\n"
+"<p>Al pulsar este botón se cerrará la aplicación.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "Opciones de %1"
+msgid "Co&nnect"
+msgstr "Conectar"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "Red abierta"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Conectar/Desconectar</b></p>\n"
+"<p>Presionando este botón se conecta/desconecta de la red seleccionada en la "
+"lista de redes.</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "Clave compartida"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "Actualizar"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "Actualizar la lista de redes"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Explorar</b></p>\n"
+"<p>Al pulsar este botón se buscarán redes inalámbricas y se actualizará la "
+"lista de redes.</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "Dispositivo:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Seleccionar un dispositivo de red"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
+msgstr ""
+"<p><b>Selección de dispositivo</b></p>\n"
+"<p>Este menú desplegable le permite seleccionar qué tarjeta inalámbricausar."
+"</p>\n"
+"<p><i>NOTA: Si selecciona una tarjeta diferente la lista de redes se "
+"actualizará.</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "Canal"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "Calidad del enlace"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
 msgstr ""
 
-#: rc.cpp:403
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "AP"
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>Lista de redes</b></p>\n"
+"<p>Esta lista muestra las redes inalámbricas que se han encontrado.</p>\n"
+"<p><i>NOTA: Pulse el botón «Actualizar» para actualizar esta lista.</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Conexión fallida."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>Barra de estado</b></p>\n"
+"<p>En este área se muestran los mensajes que explican el proceso actual.</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
 msgstr ""
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
+msgstr ""
+"<p><b>Salir una vez conectado correctamente.</b></p>\n"
+"<p>Si se marca esta casilla, la aplicación se cerrará tras establecer con "
+"éxito una conexión a una red inalámbrica.</p>"
+
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "Salir una vez conectado correctamente"
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
+msgstr ""
+"<p><b>Salir una vez conectado correctamente.</b></p>\n"
+"<p>Si se marca esta casilla, la aplicación se cerrará tras establecer con "
+"éxito una conexión a una red inalámbrica.</p>"
+
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
 msgstr ""
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Indique cuanto tiempo esperar para obtener una IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Tiempo de espera del cliente DHCP</b></p>\n"
+"<p>Esta opción indica la cantidad de tiempo tras la que la aplicación dejará "
+"de esperar una dirección IP y supondrá que la conexión ha fallado.</p>\n"
+"<p><i>NOTA: Aumentar este número puede ayudar si tiene problemas para "
+"conectarse a algunas redes.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Tiempo de espera del cliente DHCP:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "Dominio:"
+msgid "Specify how long to wait before scanning"
+msgstr "Indique cuanto tiempo esperar para obtener una IP"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "Asistente de primera conexión"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Tiempo de espera del cliente DHCP</b></p>\n"
+"<p>Esta opción indica la cantidad de tiempo tras la que la aplicación dejará "
+"de esperar una dirección IP y supondrá que la conexión ha fallado.</p>\n"
+"<p><i>NOTA: Aumentar este número puede ayudar si tiene problemas para "
+"conectarse a algunas redes.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>Pulse el botón inferior para habilitar todos los mensajes que han sido "
+"desactivados con la opción «No mostrar de nuevo».</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "Habilitar todos los mensajes"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>Habilitar todos los mensajes</b></p>\n"
+"<p>Al pulsar este botón se habilitarán todos los mensajes que han sido "
+"desactivados con la opción «No mostrar de nuevo».</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "Modo WEP"
diff --git a/po/fr/wlassistant.po b/po/fr/wlassistant.po
index d484a6c..731adec 100644
--- a/po/fr/wlassistant.po
+++ b/po/fr/wlassistant.po
@@ -4,26 +4,75 @@
 # This file is distributed under the same license as the wlassistant package.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Daniel Nascimento <[email protected]>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2005-09-05 11:55+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Olivier Butler"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Assistant WiFi"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Le réseau a changé ses réglages de sécurité.</p><p>Cliquez sur "
+"l'onglet <i>Sécurité</i> de la fenêtre suivante et configurer les réglages "
+"WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>Votre clé WEP n'est pas configurée correctement.</p><p>Cliquez sur "
+"l'onglet <i>Sécurité</i> de la fenêtre suivante et tapez la clé demandée.</"
+"p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>Le réseau ne diffuse plus son ESSID depuis votre dernière connexion.</"
+"p><p> Voulez vous utiliser '<b>%1</b>' comme ESSID pour ce réseau ?</"
+"p><p><i>NOTE: Si vous répondez Non, une boîte de dialogue apparaîtra où vous "
+"pourrez spécifier un autre ESSID.</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -31,7 +80,7 @@ msgstr ""
 "Kernel 2.6 ou supérieur non présent.\n"
 "Assistant Wifi va maintenant quitter."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -39,7 +88,7 @@ msgstr ""
 "Aucun adaptateur réseau sans-fil trouvé.\n"
 "Assistant Wifi va maintenant quitter."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -48,7 +97,7 @@ msgstr ""
 "Wifi fonctionne correctement.</p><p>L'avez vous exécuté en utilisant "
 "'<tt>sudo</tt>' ?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -56,7 +105,7 @@ msgstr ""
 "Programme(s) '%1' non trouvé(s).\n"
 "Assistant Wifi va maintenant quitter."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -64,11 +113,11 @@ msgstr ""
 "Connexion à '%1' a été perdu !\n"
 "Voulez vous vous reconnecter ?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Connexion perdue"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -76,11 +125,11 @@ msgstr ""
 "<qt><p>les réglages du réseau '<b>%1</b>' vont être effacés.</p><p> Voulez "
 "vous continuez ?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Réglages effacées."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -88,29 +137,27 @@ msgstr ""
 "<qt><p>Le fichier '<i>%1</i>' n'a pu être ouvert en écriture.</p><p>Nom du/"
 "des serveur(s) et/ou de domaine non configurés.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Activation de l'interface %1 ..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Recherche..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Fait."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "Aucun réseau."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -121,22 +168,22 @@ msgstr ""
 "ordinateur.\n"
 "Vous devez l'activer pour pouvoir utiliser les réseaux sans-fils."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "Freq (Hz)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "Assistant de Première Connexion"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -144,44 +191,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Assistant de première connexion"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Configuration du réseau mis à jour."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "Echec de connexion."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Connexion à '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "Connexion perdue"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "Assistant de Première Connexion"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Test de la connexion..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Connecté avec succès à '%1'."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -189,11 +234,11 @@ msgstr ""
 "Echec de connexion.\n"
 "Voulez vous modifer les configurations de ce réseau ?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "Modifier les configurations ?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -201,50 +246,50 @@ msgstr ""
 "<qt><p>Vous allez vous déconnecter de '<b>%1</b>'.</p><p>Voulez vous "
 "continuer ?<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "Echec de connexion."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Déconnection..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "En attente de l'arrêt du client DHCP..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "Assistant de Première Connexion"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Annuler."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&Déconnecter"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Déconnecter le réseau sélectionné"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "Se &Connecter"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Connexion au réseau sélectionné"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&Stop"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -252,402 +297,286 @@ msgstr ""
 "Terminer le processus en cours\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Quitter l'application"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Déconnecter..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "Connecter"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Effacer les réglages..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Editer les réglages..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Configurer et connecter..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "Réglages de %1"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Olivier Butler"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Assistant WiFi"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>Le réseau a changé ses réglages de sécurité.</p><p>Cliquez sur "
-"l'onglet <i>Sécurité</i> de la fenêtre suivante et configurer les réglages "
-"WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>Votre clé WEP n'est pas configurée correctement.</p><p>Cliquez sur "
-"l'onglet <i>Sécurité</i> de la fenêtre suivante et tapez la clé demandée.</"
-"p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>Le réseau ne diffuse plus son ESSID depuis votre dernière connexion.</"
-"p><p> Voulez vous utiliser '<b>%1</b>' comme ESSID pour ce réseau ?</"
-"p><p><i>NOTE: Si vous répondez Non, une boîte de dialogue apparaîtra où vous "
-"pourrez spécifier un autre ESSID.</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Basculer la liste/options réseau"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Annuler."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>Options</b></p>\n"
-"<p>Ce bouton permet d'afficher les options de l'application.</p>\n"
-"<p><i>ASTUCE: Une nouvelle pression permet de revenir à la liste des réseaux."
-"</i></p>"
+msgid "I&nterface"
+msgstr "I&nterface"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>Quitter</b></p>\n"
-"<p>Ce bouton permet de quitter l'application.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "Connecter"
+msgid "Configuration"
+msgstr "Configuration WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automatique (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Connection/Déconnection</b></p>\n"
-"<p>Ce bouton permet de se connecter/déconnecter du réseau sélectionné dans "
-"la liste.</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "Manuel"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Actualiser"
+msgid "Netmask:"
+msgstr "Masque réseau:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Actualiser la liste des réseaux"
+msgid "IP:"
+msgstr "IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Bouton Actualiser</b></p>\n"
-"<p>Ce bouton permet de scanner le réseau sans-fil et de rafraîchir la liste "
-"des réseaux.</p>"
+msgid "Broadcast:"
+msgstr "Broadcast:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Périphérique:"
+msgid "Gateway:"
+msgstr "Passerelle:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Sélectionner le périphérique à utiliser"
+msgid "Domain:"
+msgstr "Domaine:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Sélection des périphériques</b></p>\n"
-"<p>Cette liste vous permet de sélectionner quelle carte réseau sans-fil vous "
-"voulez utiliser.</p>\n"
-"<p><i>NOTE: Choisir une carte différente provoque le rafraichissement de la "
-"liste des réseaux.</i></p>"
+msgid "Secondary DNS:"
+msgstr "DNS secondaire:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "DNS primaire:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Canal"
+msgid "Securit&y"
+msgstr "Sé&curité"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "Qualité du lien"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "Réglages de %1"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "Clé:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "Point d'accès"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Liste des réseaux</b></p>\n"
-"<p>Cette liste affiche tous les réseaux qui ont été trouvés.</p>\n"
-"<p><i>NOTE: Cliquez sur le bouton Actualiser pour mettre à jour la liste.</"
-"i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>Barre d'état</b></p>\n"
-"<p>Les messages décrivant les processus en cours sont affichés dans cette "
-"zone.</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "Réglages de %1"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "Système Ouvert"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "Clé partagée"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Quitter après une connexion réussie.</b></p>\n"
-"<p>Cochez cette case pour permettre à l'application de quitter après une "
-"connexion réussie au réseau sans-fil. </p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Quitter après une connexion réussie"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "Echec de connexion."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>Quitter après une connexion réussie.</b></p>\n"
-"<p>Cochez cette case pour permettre à l'application de quitter après une "
-"connexion réussie au réseau sans-fil. </p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Spécifier le durée d'attente pour obtenir l'adresse IP"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>Timeout du client DHCP</b></p>\n"
-"<p>Cette option spécifie la durée après laquelle l'application doit arrêter "
-"d'attendre une adresse IP et de déclarer une connexion en échec.</p>\n"
-"<p><i>ASTUCE: Augmenter cette valeur peuvent aider si vous avez des "
-"difficultés à vous connecter à certains réseaux.</i></p>"
 
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Timeout du client DHCP:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
-
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Spécifier le durée d'attente pour obtenir l'adresse IP"
+msgid "Command:"
+msgstr "Domaine:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>Timeout du client DHCP</b></p>\n"
-"<p>Cette option spécifie la durée après laquelle l'application doit arrêter "
-"d'attendre une adresse IP et de déclarer une connexion en échec.</p>\n"
-"<p><i>ASTUCE: Augmenter cette valeur peuvent aider si vous avez des "
-"difficultés à vous connecter à certains réseaux.</i></p>"
+msgid "Post-Connection Command"
+msgstr "Assistant de Première Connexion"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>Ce bouton permet d'activer tous les messages qui ont été déactivés par la "
-"fonction 'Ne plus afficher'..</i>"
-
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "Activer tous les messages"
 
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>Activer tous les messages</b></p>\n"
-"<p>Ce bouton permet d'activer tous les messages qui ont été déactivés par la "
-"fonction 'Ne plus afficher'.</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Assistant de Première Connexion"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Bienvenue à l'assistant de Première Connexion"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -662,7 +591,7 @@ msgstr ""
 "p>\n"
 "<p><i>Pressez sur Suivant pour continuer.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -675,27 +604,17 @@ msgstr ""
 "<p>SVP veuillez préciser le ESSID que vous voulez utiliser pour vous "
 "connecter à ce point d'accès.</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Configuration de l'interface"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automatique (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Manuel"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -708,47 +627,12 @@ msgstr ""
 "<p>Quelles options de configuration voulez vous utiliser pour vous connecter "
 "à ce réseau ?</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Paramètres de l'interface"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "DNS secondaire:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Masque réseau:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "DNS primaire:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Passerelle:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Domaine:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Broadcast:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -759,12 +643,12 @@ msgstr ""
 "à ce réseau.</b></p>\n"
 "<p>Certains champs peuvent être laisser incomplet.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "Configuration WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -775,39 +659,34 @@ msgstr ""
 "authentification WEP.</b></p>\n"
 "<p>Quel mode WEP voulez vous utiliser ?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "Système Ouvert"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "Clé partagée"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>SVP, indiquez une clé pour utiliser ce réseau.</b></p>\n"
 "Les formats supportés par \"iwconfig\" peuvent être utilisés."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "Clé WEP:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "Configuration WEP"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -817,28 +696,17 @@ msgstr ""
 "authentification WEP.</b></p>\n"
 "<p>Quel mode WEP voulez vous utiliser ?</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "Clé WEP"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "Fait !"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -849,133 +717,304 @@ msgstr ""
 "<p>Vous avez configuré avec succès votre connexion.</p>\n"
 "<p><b>Pressez sur Terminé pour vous connecter !</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "I&nterface"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "Manuel"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "Basculer la liste/options réseau"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "Sé&curité"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Options</b></p>\n"
+"<p>Ce bouton permet d'afficher les options de l'application.</p>\n"
+"<p><i>ASTUCE: Une nouvelle pression permet de revenir à la liste des réseaux."
+"</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "Réglages de %1"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Clé:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Quitter</b></p>\n"
+"<p>Ce bouton permet de quitter l'application.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "Réglages de %1"
+msgid "Co&nnect"
+msgstr "Connecter"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "Système Ouvert"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Connection/Déconnection</b></p>\n"
+"<p>Ce bouton permet de se connecter/déconnecter du réseau sélectionné dans "
+"la liste.</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "Clé partagée"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "Actualiser"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "Actualiser la liste des réseaux"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Bouton Actualiser</b></p>\n"
+"<p>Ce bouton permet de scanner le réseau sans-fil et de rafraîchir la liste "
+"des réseaux.</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "Périphérique:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Sélectionner le périphérique à utiliser"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
 msgstr ""
+"<p><b>Sélection des périphériques</b></p>\n"
+"<p>Cette liste vous permet de sélectionner quelle carte réseau sans-fil vous "
+"voulez utiliser.</p>\n"
+"<p><i>NOTE: Choisir une carte différente provoque le rafraichissement de la "
+"liste des réseaux.</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "Canal"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "Qualité du lien"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
+msgstr ""
+
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "Point d'accès"
 
-#: rc.cpp:403
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>Liste des réseaux</b></p>\n"
+"<p>Cette liste affiche tous les réseaux qui ont été trouvés.</p>\n"
+"<p><i>NOTE: Cliquez sur le bouton Actualiser pour mettre à jour la liste.</"
+"i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Echec de connexion."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>Barre d'état</b></p>\n"
+"<p>Les messages décrivant les processus en cours sont affichés dans cette "
+"zone.</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
 msgstr ""
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
+msgstr ""
+"<p><b>Quitter après une connexion réussie.</b></p>\n"
+"<p>Cochez cette case pour permettre à l'application de quitter après une "
+"connexion réussie au réseau sans-fil. </p>"
+
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "Quitter après une connexion réussie"
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
 msgstr ""
+"<p><b>Quitter après une connexion réussie.</b></p>\n"
+"<p>Cochez cette case pour permettre à l'application de quitter après une "
+"connexion réussie au réseau sans-fil. </p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Spécifier le durée d'attente pour obtenir l'adresse IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Timeout du client DHCP</b></p>\n"
+"<p>Cette option spécifie la durée après laquelle l'application doit arrêter "
+"d'attendre une adresse IP et de déclarer une connexion en échec.</p>\n"
+"<p><i>ASTUCE: Augmenter cette valeur peuvent aider si vous avez des "
+"difficultés à vous connecter à certains réseaux.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Timeout du client DHCP:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "Domaine:"
+msgid "Specify how long to wait before scanning"
+msgstr "Spécifier le durée d'attente pour obtenir l'adresse IP"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "Assistant de Première Connexion"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Timeout du client DHCP</b></p>\n"
+"<p>Cette option spécifie la durée après laquelle l'application doit arrêter "
+"d'attendre une adresse IP et de déclarer une connexion en échec.</p>\n"
+"<p><i>ASTUCE: Augmenter cette valeur peuvent aider si vous avez des "
+"difficultés à vous connecter à certains réseaux.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>Ce bouton permet d'activer tous les messages qui ont été déactivés par la "
+"fonction 'Ne plus afficher'..</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "Activer tous les messages"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>Activer tous les messages</b></p>\n"
+"<p>Ce bouton permet d'activer tous les messages qui ont été déactivés par la "
+"fonction 'Ne plus afficher'.</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "Mode WEP"
diff --git a/po/nb/wlassistant.po b/po/nb/wlassistant.po
index eba38fd..26900c4 100644
--- a/po/nb/wlassistant.po
+++ b/po/nb/wlassistant.po
@@ -7,20 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2006-10-01 16:10+0200\n"
 "Last-Translator: Alexander Nicolaysen Sørnes <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Alexander N. Sørnes"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Wireless Assistant"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Nettverket endret sikkerhetsinnstillinger.</p><p>Gå til <i>Sikkerhet</"
+"i>-fanen i neste vindu og sett opp WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>WEP-nøkkelen din er ikke angitt ordentlig.</p><p>Gå til <i>Sikkerhet</"
+"i>-fanen i det neste vinduet og skriv inn den påkrevde nøkkelen.</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>Nettverket har sluttet å kringkaste en ESSID siden sist du koblet til."
+"</p><p>Vil du bruke «<b>%1</b>» som en ESSID for dette nettverket?</"
+"p><p><i>MERK: Hvis du svarer nei kan du oppgi en annen ESSID.</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Laster inn . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -28,7 +74,7 @@ msgstr ""
 "Kjene 2.6 eller nyere er ikke tilstede.\n"
 "Wireless Assistant avsluttes."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -36,7 +82,7 @@ msgstr ""
 "Ingen brukbare trådløse enhet ble funnet.\n"
 "Wireless Assistant avsluttes."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -45,7 +91,7 @@ msgstr ""
 "Assistant kan fungere ordentlig.</p><p>Kjørte du det med «<tt>sudo</tt>»?</"
 "p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -53,7 +99,7 @@ msgstr ""
 "Fant ikke programfilen(e) «%s».\n"
 "Wireless Assistant avsluttes."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -61,11 +107,11 @@ msgstr ""
 "Forbindelsen til «%1» er tapt\n"
 "Vil du koble til på nytt?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Mistet forbindelsen"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -73,41 +119,39 @@ msgstr ""
 "<qt><p>Innstillinger for nettverket «<b>%1/<b>» er i ferd med å bli slettet."
 "</p><p>VIl du fortsette?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Innstillinger slettet."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
 msgstr ""
-"<qt><p>Klarte ikke åpne filen «<i><%1</i>» for skriving.</p><p>Navnetjener"
-"(e) og/eller domene er ikke angitt.</p></qt>"
+"<qt><p>Klarte ikke åpne filen «<i><%1</i>» for skriving.</"
+"p><p>Navnetjener(e) og/eller domene er ikke angitt.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Bringer kort %1 opp . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Søker . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Ferdig."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "Ingen nettverk funnet."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -118,22 +162,22 @@ msgstr ""
 "bryter på maskinen.\n"
 "Du må slå den på for å bruke trådløse nettverk."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "Frek. (Hz)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "Veiviser for første tilkobling"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -141,44 +185,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Veiviser for første tilkobling"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Nettverksinnstillinger oppdatert."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "Tilkobling feilet."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Kobler til «%1» . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "Mistet forbindelsen"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "Veiviser for første tilkobling"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Tester forbindelse . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Koblet til «%1»."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -186,11 +228,11 @@ msgstr ""
 "Tilkobling feilet.\n"
 "Vil du se på innstillingene for nettverket?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "Se på innstillingene?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -198,50 +240,50 @@ msgstr ""
 "<qt><p>Du er i ferd med å koble fra «<b>%1</b>».</p><p>Vil du fortsette?</"
 "p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "Tilkobling feilet."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Kobler fra . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "Venter på at DHCP-klienten skal slås av . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "Veiviser for første tilkobling"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "Koble &fra"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Koble fra det valgte nettverket"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "K&oble til"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Koble til valgte nettverk"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&Stopp"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -249,394 +291,286 @@ msgstr ""
 "Avbrytt gjeldende prosess\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Avslutt programmet"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Koble fra . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "Koble til"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Glem innstillinger . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Rediger innstillinger . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Sett opp og koble til . . ."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "%1 Innstillinger"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Alexander N. Sørnes"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Wireless Assistant"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>Nettverket endret sikkerhetsinnstillinger.</p><p>Gå til <i>Sikkerhet</"
-"i>-fanen i neste vindu og sett opp WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>WEP-nøkkelen din er ikke angitt ordentlig.</p><p>Gå til <i>Sikkerhet</"
-"i>-fanen i det neste vinduet og skriv inn den påkrevde nøkkelen.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>Nettverket har sluttet å kringkaste en ESSID siden sist du koblet til."
-"</p><p>Vil du bruke «<b>%1</b>» som en ESSID for dette nettverket?</"
-"p><p><i>MERK: Hvis du svarer nei kan du oppgi en annen ESSID.</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Bytt mellom nettverksliste/innstillinger"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Avbrutt."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>Innstillinger</b></p>\n"
-"<p>Denne knappen viser tilgjengelige innstillinger i programmet.</p>\n"
-"<p><i>HINET: Trykk på denne knappen igjen for å gå tilbake til "
-"nettverkslisten.</i></p>"
+msgid "I&nterface"
+msgstr "&Kort"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>Avslutt-knappen</b></p>\n"
-"<p>Denne knappen avslutter programmet.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "Koble til"
+msgid "Configuration"
+msgstr "WEP-oppsett"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automatisk (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Koble til/fra</b></p>\n"
-"<p>Denne knappen kobler til/fra nettverket som er valgt.</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "Manuelt"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Oppdater"
+msgid "Netmask:"
+msgstr "Nettmaske:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Oppdater nettverksliste"
+msgid "IP:"
+msgstr "IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Søkeknapp</b></p>\n"
-"<p>Denne knappen søker etter trådløse nettverk og oppdaterer nettverkslisten."
-"</p>"
+msgid "Broadcast:"
+msgstr "Kringkasting:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Enhet:"
+msgid "Gateway:"
+msgstr "Portvei:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Velg et nettverksenhet du vil bruke"
+msgid "Domain:"
+msgstr "Domene:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Enhetsvalg</b></p>\n"
-"<p>Denne boksen lar deg velge hvilket nettverkskort som brukes.</p>\n"
-"<p><i>MERK: NettverksIsten oppdateres hvis du velger at annet kort.</i></p>"
+msgid "Secondary DNS:"
+msgstr "Sekundær DNS:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "Primær DNS:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Kanal"
+msgid "Securit&y"
+msgstr "Sikkerhe&t"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "Kvalitet"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "%1 Innstillinger"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "Nøkkel:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "TP"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Nettverksliste</b></p>\n"
-"<p>Denne listen viser alle de trådløse nettverkene som er funnet.</p>\n"
-"<p><i>HINT: Trykk på oppdater-knappen for å oppdatere listen.</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>Statuslinje</b></p>\n"
-"<p>Meldinger fra den gjelgende prosessen vises i dette området.</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "%1 Innstillinger"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "Åpent system"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "Delt nøkkel"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Avslutt etter vellykket tilkobling</b></p>\n"
-"<p>Dette gjør at programmet avsluttes etter at en forbindelse er opprettet.</"
-"p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Avslutt etter vellykket tilkobling"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "Tilkobling feilet."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>Avslutt etter vellykket tilkobling</b></p>\n"
-"<p>Dette gjør at programmet avsluttes etter at en forbindelse er opprettet.</"
-"p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Hvor lenge det ventes på en IP"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>Tidsavbrudd for DHCP-klient</b></p>\n"
-"<p>Denne innstillinger bestemmer hvor lenge programmet skal vente på en IP-"
-"adresse og anta at tilkoblingen feilet.</p>\n"
-"<p><i>HINT: Det kan hjelpe å øke denne grensen hvis du har problemer med å "
-"koble til noen nettverk.</i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Tidsavbrudd for DHCP-klient:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
 
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Hvor lenge det ventes på en IP"
+msgid "Command:"
+msgstr "Domene:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>Tidsavbrudd for DHCP-klient</b></p>\n"
-"<p>Denne innstillinger bestemmer hvor lenge programmet skal vente på en IP-"
-"adresse og anta at tilkoblingen feilet.</p>\n"
-"<p><i>HINT: Det kan hjelpe å øke denne grensen hvis du har problemer med å "
-"koble til noen nettverk.</i></p>"
+msgid "Post-Connection Command"
+msgstr "Veiviser for første tilkobling"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>Trykk på knappen under for å slå på alle meldinger som er slått av med "
-"«Ikke vis igjen»-funksjonen.</i>"
 
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "Slå på alle meldinger"
-
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>Slå på alle meldinger</b></p>\n"
-"<p>Denne knappen slår på alle meldinger som er slått av med «Ikke vis igjen»-"
-"funksjonen.</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Veiviser for første tilkobling"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Velkommen til veiviseren for første tilkobling"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -651,7 +585,7 @@ msgstr ""
 "</p>\n"
 "<p><i>Trykk «Neste» for å fortsette.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -663,27 +597,17 @@ msgstr ""
 "p>\n"
 "<p>Oppgi en ESSID som du vil bruke når du kobler til tilgangspunktet.</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Oppsett av kort"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automatisk (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Manuelt"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -696,47 +620,12 @@ msgstr ""
 "<p>Hvilket oppsettsalternativ vil du bruke når du kobler til dette "
 "nettverket?</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Kortinnstillinger"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "Sekundær DNS:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Nettmaske:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "Primær DNS:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Portvei:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Domene:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Kringkasting:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -747,12 +636,12 @@ msgstr ""
 "nettverket.</b></p>\n"
 "<p>Du trenger ikke fylle ut alt.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "WEP-oppsett"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -762,39 +651,34 @@ msgstr ""
 "<p><b>Nettverket du prøver å koble til krever WEP-autentisering.</b></p>\n"
 "<p>Hvilken WEP-modus vil du bruke?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "Åpent system"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>Oppgi en nøkkel for bruk med nettverket.</b></p>\n"
 "Du kan bruke ethvert format som støttes av «iwconfig»."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "WEP-nøkkel:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "WEP-oppsett"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -803,28 +687,17 @@ msgstr ""
 "<p><b>Nettverket du prøver å koble til krever WEP-autentisering.</b></p>\n"
 "<p>Hvilken WEP-modus vil du bruke?</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "WEP-nøkkel"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "Ferdig"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -835,133 +708,299 @@ msgstr ""
 "<p>Du er endelig ferdig med å sette opp denne forbindelsen</p>\n"
 "<p><b>Trykk «Fullfør» for å koble til.</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "&Kort"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "Manuelt"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "Bytt mellom nettverksliste/innstillinger"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "Sikkerhe&t"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Innstillinger</b></p>\n"
+"<p>Denne knappen viser tilgjengelige innstillinger i programmet.</p>\n"
+"<p><i>HINET: Trykk på denne knappen igjen for å gå tilbake til "
+"nettverkslisten.</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "%1 Innstillinger"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Nøkkel:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Avslutt-knappen</b></p>\n"
+"<p>Denne knappen avslutter programmet.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "%1 Innstillinger"
+msgid "Co&nnect"
+msgstr "Koble til"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "Åpent system"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Koble til/fra</b></p>\n"
+"<p>Denne knappen kobler til/fra nettverket som er valgt.</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "Delt nøkkel"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "Oppdater"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "Oppdater nettverksliste"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Søkeknapp</b></p>\n"
+"<p>Denne knappen søker etter trådløse nettverk og oppdaterer nettverkslisten."
+"</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "Enhet:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Velg et nettverksenhet du vil bruke"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
+msgstr ""
+"<p><b>Enhetsvalg</b></p>\n"
+"<p>Denne boksen lar deg velge hvilket nettverkskort som brukes.</p>\n"
+"<p><i>MERK: NettverksIsten oppdateres hvis du velger at annet kort.</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "Kanal"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "Kvalitet"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
 msgstr ""
 
-#: rc.cpp:403
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "TP"
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>Nettverksliste</b></p>\n"
+"<p>Denne listen viser alle de trådløse nettverkene som er funnet.</p>\n"
+"<p><i>HINT: Trykk på oppdater-knappen for å oppdatere listen.</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Tilkobling feilet."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>Statuslinje</b></p>\n"
+"<p>Meldinger fra den gjelgende prosessen vises i dette området.</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
+msgstr ""
+
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
 msgstr ""
+"<p><b>Avslutt etter vellykket tilkobling</b></p>\n"
+"<p>Dette gjør at programmet avsluttes etter at en forbindelse er opprettet.</"
+"p>"
+
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "Avslutt etter vellykket tilkobling"
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
 msgstr ""
+"<p><b>Avslutt etter vellykket tilkobling</b></p>\n"
+"<p>Dette gjør at programmet avsluttes etter at en forbindelse er opprettet.</"
+"p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Hvor lenge det ventes på en IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Tidsavbrudd for DHCP-klient</b></p>\n"
+"<p>Denne innstillinger bestemmer hvor lenge programmet skal vente på en IP-"
+"adresse og anta at tilkoblingen feilet.</p>\n"
+"<p><i>HINT: Det kan hjelpe å øke denne grensen hvis du har problemer med å "
+"koble til noen nettverk.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Tidsavbrudd for DHCP-klient:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "Domene:"
+msgid "Specify how long to wait before scanning"
+msgstr "Hvor lenge det ventes på en IP"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "Veiviser for første tilkobling"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Tidsavbrudd for DHCP-klient</b></p>\n"
+"<p>Denne innstillinger bestemmer hvor lenge programmet skal vente på en IP-"
+"adresse og anta at tilkoblingen feilet.</p>\n"
+"<p><i>HINT: Det kan hjelpe å øke denne grensen hvis du har problemer med å "
+"koble til noen nettverk.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>Trykk på knappen under for å slå på alle meldinger som er slått av med "
+"«Ikke vis igjen»-funksjonen.</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "Slå på alle meldinger"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>Slå på alle meldinger</b></p>\n"
+"<p>Denne knappen slår på alle meldinger som er slått av med «Ikke vis igjen»-"
+"funksjonen.</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "WEP-modus"
diff --git a/po/pl/wlassistant.po b/po/pl/wlassistant.po
index dec8518..8982479 100644
--- a/po/pl/wlassistant.po
+++ b/po/pl/wlassistant.po
@@ -8,20 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2007-04-02 20:39+0200\n"
 "Last-Translator: Paweł Nawrocki <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
+"Language: pl\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"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Paweł Nawrocki"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Wireless Assistant"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Ustawienia zabezpieczeń tej sieci zostały zmienione.</p><p>Przejdź do "
+"zakładki <i>Bezpieczeństwo</i> w oknie, które zaraz się pojawi i ustaw "
+"właściwości WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>Klucz WEP nie został prawidłowo ustawiony.</p><p>Przejdź do zakładki "
+"<i>Bezpieczeństwo</i> i wpisz wymagany klucz.</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>ESSID sieci, do której chcesz się podłączyć, przestał być jawny.</"
+"p><p>Czy chcesz użyć '<b>%1</b>' jako ESSID dla tej sieci?</"
+"p><p><i>INDORMACJA: Jeśli odpowiesz nie, pojawi się okno, w którym będzie "
+"można wpisać inne ESSID.</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Wstępne konfigurowanie..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -29,7 +77,7 @@ msgstr ""
 "Nie wykryto jądra 2.6 lub nowszego\n"
 "Program Wireless Assistant zakończy działanie."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -37,7 +85,7 @@ msgstr ""
 "Nie znaleziono żadnych dostępnych kart sieciowych.\n"
 "Program Wireless Assistant zakończy działanie."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -46,7 +94,7 @@ msgstr ""
 "poprawnego funkcjonowania.</p><p>Czy program został uruchomiony z użyciem "
 "komendy '<tt>sudo</tt>'?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -54,7 +102,7 @@ msgstr ""
 "Nie znaleziono programu(ów) '%1'.\n"
 "Program Wireless Assistant zakończy działanie."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -62,11 +110,11 @@ msgstr ""
 "Połączenie z '%1' zostało przerwane!\n"
 "Czy chcesz połączyć ponownie?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Połączenie przerwane"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -74,11 +122,11 @@ msgstr ""
 "<qt><p>Ustawienia dla sieci '<b>%1</b>' za chwilę zostaną usunięte.</"
 "p><p>Czy chcesz kontynuować?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Ustawienia zostały usunięte."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -86,29 +134,27 @@ msgstr ""
 "<qt><p>Otwiarcie pliku '<i>%1</i>' z możliwością zapisu nie powiodło się.</"
 "p><p>Serwer(y) DNS i/lub domena nie mogły zostać skonfigurowane.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Włączanie urządzenia sieciowego %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr "Czekanie przed skanowaniem..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Skanowanie..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Gotowe."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "Nie znaleziono żadnej sieci."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
 "on your computer.\n"
@@ -118,21 +164,21 @@ msgstr ""
 "przełącznika na komputerze.\n"
 "Włącz je aby umożliwić korzystanie z sieci bezprzewodowych."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "Częstotliwość (Hz)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr "Radio Twojej karty sieciowej jest wyłączone.<br>Czy chcesz je włączyć?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 msgid "Auto connection failed."
 msgstr "Automatyczne połączenie nie powiodło się."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -145,41 +191,39 @@ msgstr ""
 "Zainstaluj <i>wpa_supplicant</i> i uruchom ponownie program Wireless "
 "Assistant by nawiązać to połączenie.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Asystent Pierwszego Połączenia"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Ustawienia zaktualizowane."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 msgid "Running pre-connection command..."
 msgstr "Wykonywanie polecenia przed połączeniem..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Nawiązywanie połączenia z '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 msgid "Connection failed."
 msgstr "Połączenie nie powiodło się."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 msgid "Running post-connection command..."
 msgstr "Wykonywanie polecenia po połączeniu..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Testowanie połączenia..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Połączono z '%1'."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -187,11 +231,11 @@ msgstr ""
 "Połączenie nie powiodło się.\n"
 "Czy chcesz sprawdzić ustawienia dla tej sieci?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "Sprawdzić Ustawienia?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -199,48 +243,48 @@ msgstr ""
 "<qt><p>Połączenie z '<b>%1</b>' za chwilę zostanie zakończone.</p><p>Czy "
 "chcesz kontynuować?<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 msgid "Running pre-disconnection command..."
 msgstr "Wykonywanie polecenia przed rozłączeniem..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Rozłączanie..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "Czekanie na zakończenie działania klienta DHCP..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 msgid "Running post-disconnection command..."
 msgstr "Wykonywanie polecenia po rozłączeniu..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "Rozłącz"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Zakończ połączenie z wybraną siecią"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "Połącz"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Połącz z wybraną siecią"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "Stop"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -248,405 +292,294 @@ msgstr ""
 "Przerwij wykonywany proces\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Zakończ program"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Rozłącz..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 msgid "Connect"
 msgstr "Połącz"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Usuń Ustawienia..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Zmień Ustawienia..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Konfiguruj i Połącz..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 msgid "%1 Settings"
 msgstr "Ustawienia %1"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Paweł Nawrocki"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Wireless Assistant"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>Ustawienia zabezpieczeń tej sieci zostały zmienione.</p><p>Przejdź do "
-"zakładki <i>Bezpieczeństwo</i> w oknie, które zaraz się pojawi i ustaw "
-"właściwości WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>Klucz WEP nie został prawidłowo ustawiony.</p><p>Przejdź do zakładki "
-"<i>Bezpieczeństwo</i> i wpisz wymagany klucz.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
 msgstr ""
-"<qt><p>ESSID sieci, do której chcesz się podłączyć, przestał być jawny.</"
-"p><p>Czy chcesz użyć '<b>%1</b>' jako ESSID dla tej sieci?</"
-"p><p><i>INDORMACJA: Jeśli odpowiesz nie, pojawi się okno, w którym będzie "
-"można wpisać inne ESSID.</i></p></qt>"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Przełącz między listą sieci a opcjami"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Anulowano."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>Opcje</b></p>\n"
-"<p>Naciśnięcie tego przycisku pokaże dostępne opcje programu.</p>\n"
-"<p><i>WSKAZÓWKA: Naciśnij ten przycisk ponownie by powrócić do listy sieci.</"
-"i></p>"
+msgid "I&nterface"
+msgstr "Interfejs"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>Zakończ</b></p>\n"
-"<p>Wciśnięcia tego przycisku zakończy działanie programu.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
-#, no-c-format
-msgid "Co&nnect"
-msgstr "Połącz"
+#: ui_NetParamsEdit.ui:179
+#, fuzzy, no-c-format
+msgid "Configuration"
+msgstr "Konfiguracja WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automatyczna (DHCP)"
 
-#: rc.cpp:42
+#: ui_NetParamsEdit.ui:206
 #, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Połącz/Rozłącz</b></p>\n"
-"<p>Naciśnięcie tego przycisku spowoduje połączenie z lub odłączenie od "
-"wybranej sieci.</p>"
+msgid "&Manual"
+msgstr "Ręczna"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Odśwież"
+msgid "Netmask:"
+msgstr "Maska sieci:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Odśwież listę sieci"
+msgid "IP:"
+msgstr "Adres IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Odśwież</b></p>\n"
-"<p>Naciśnięcie tego przycisku spowoduje wyszukanie dostępnych sieci "
-"bezprzewodowych i odświeżenie listy sieci.</p>"
+msgid "Broadcast:"
+msgstr "Transmitowany IP:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Karta sieciowa:"
+msgid "Gateway:"
+msgstr "Brama sieci:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Wybierz kartę sieciową"
+msgid "Domain:"
+msgstr "Domena:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Wybór Kary Sieciowej</b></p>\n"
-"<p>To pole pozwala na wybranie aktywnej karty sieciowej.</p>\n"
-"<p><i>INFORMACJA: Zmiana aktywnej karty spowoduje odświeżenie listy "
-"dostępnych sieci.</i></p>"
+msgid "Secondary DNS:"
+msgstr "Dodatkowy DNS:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "DNS:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Kanał"
+msgid "Securit&y"
+msgstr "Bezpieczeństwo"
 
-#: rc.cpp:74
+#: ui_NetParamsEdit.ui:372
 #, no-c-format
-msgid "Link Quality"
-msgstr "Jakość Połączenia"
+msgid "WPA Settings"
+msgstr "Ustawienia WPA"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr "WEP/WPA"
+msgid "Key:"
+msgstr "Klucz:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "AP"
+msgid "ASCII"
+msgstr "ASCII"
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Lista Sieci</b></p>\n"
-"<p>Lista ta pokazuje wszystkie znalezione sieci bezprzewodowe.</p>\n"
-"<p><i>WSKAZÓWKA: Naciśnij przycisk Odśwież w celu zaktualizowania listy.</"
-"i></p>"
+"Wersja WPA:<br>Szyfrowanie grupowe:<br>Szyfrowanie pojedyncze:<br>Metoda "
+"uwierzytelniania:"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
+#: ui_NetParamsEdit.ui:486
 #, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>Pasek Statusu</b></p>\n"
-"<p>W tym obszarze pokazywane są wiadomości o wykonywanych przez program "
-"działaniach.</p>"
+msgid "WEP Settings"
+msgstr "Ustawienia WEP"
 
-#: rc.cpp:95
+#: ui_NetParamsEdit.ui:497
 #, no-c-format
-msgid "Automatically connect on startup"
-msgstr "Połącz automatycznie przy uruchomieniu programu"
+msgid "Open Syste&m"
+msgstr "System Otwarty"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
-"<p><b>Połącz Automatycznie przy Uruchomieniu Programu</b></p>\n"
-"<p>Zaznaczenie tej opcji spowoduje próbę połączenia z najlepszą dostępną "
-"siecią przy uruchomieniu programu. Jedynie skonfigurowane wcześniej sieci są "
-"brane pod uwagę.</p>"
-
-#: rc.cpp:103
-#, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
-msgstr "Automatycznie wznów połączenie w razie jego zerwania"
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:550
 #, no-c-format
-msgid "Alt+Y"
-msgstr ""
+msgid "Shared &Key"
+msgstr "Klucz Publiczny"
 
-#: rc.cpp:109
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+msgid "Alt+K"
 msgstr ""
-"<p><b>Automatycznie Wznów Połączenie w Razie Jego Przerwania</b></p>\n"
-"<p>Zaznaczenie tego pola spowoduje, że Wireless Assistant spróbuje połączyć "
-"się ponownie do sieci, z którą połączenie zostało zerwane.</p>"
 
-#: rc.cpp:113
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Zakończ program po uzyskaniu połączenia"
+msgid "Advanced"
+msgstr "Zaawansowane"
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:576
 #, no-c-format
 msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Zakończ Program po Uzyskaniu Połączenia</b></p>\n"
-"<p>Zaznaczenie tego pola spowoduje zakończenie działania programu po "
-"uzyskaniu połączenia z siecią bezprzewodową.</p>"
-
-#: rc.cpp:121
-#, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr "Grupuj punkty dostępowe o takim samym ESSID"
+"<b>Ostrzeżenie o zabezpieczeniach:</b> poniższe komendy zostaną uruchomione "
+"z takimi samymi uprawnieniami, jakie ma Wireless Assistant."
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:584
 #, no-c-format
-msgid "Alt+G"
-msgstr ""
+msgid "Pre-Connection Command"
+msgstr "Polecenie przed połączeniem"
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
-msgstr ""
-"<p><b>Grupuj Punkty Dostępowe o Takim Samym ESSID</b></p>\n"
-"<p>Zaznaczenie tej opcji spowoduje pokazanie wszystkich sieci o takim samym ESSID jako jednego elementu na liście sieci.</p>"
+msgid "Timeout:"
+msgstr "Limit czasu:"
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "Delay before scanning:"
-msgstr "Opóźnienie przed skanowaniem:"
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Określ jak długo czekać na uzyskanie adresu IP"
+msgid "Amount of time after which the process will be killed."
+msgstr "Ilość czasu, po której upływie proces zostanie przerwany."
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
-"<p><b>Limit czasu klienta DHCP</b></p>\n"
-"<p>Opcja ta pozwala na określenie czasu, po którym program przestanie czekać "
-"na przydzielenie adresu IP i uzna, że połączenie nie powiodło się.</p>\n"
-"<p><i>WSKAZÓWKA: Zwiększenie tej wartości może pomóc połączyć się z "
-"niektórymi sieciami.</i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Limit czasu klienta DHCP:"
+"<p><b>Limit czasu</b></p>\n"
+"<p>Opcja ta określa, jak długo Wireless Assistant powinien czekać na "
+"zakończenie procesu, zanim zostanie on przerwany.</p>"
 
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "s"
-msgstr "s"
+msgid "Run detached"
+msgstr "Uruchom w oddzielnym procesie"
 
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Określ jak długo czekać przed skanowaniem"
+msgid "Don't wait for the process to finish."
+msgstr "Nie czekaj na zakończenie procesu"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>Opóźnienie przed Skanowaniem</b></p>\n"
-"<p>Opcja ta pozwala na określenie czasu pomiędzy aktywacją karty sieciowej, "
-"a wykonaniem skanowania.</p>\n"
-"<p><i>WSKAZÓWKA: Zwiększenie tej wartości może pomóc w przypadku, gdy w celu "
-"zobaczenia wszystkich dostępnych sieci, konieczne jest ręczne odświeżenie "
-"listy.</i></p>"
+"<p><b>Uruchom w Oddzielnym Procesie</b></p>\n"
+"<p>Jeśli opcja ta jest zaznaczona, Wireless Assistant nie będzie czekał na "
+"zakończenie procesu.</p>"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
-msgstr ""
-"<i>Naciśnij poniższy przycisk aby włączyć wszystkie wiadomości wyłączone za "
-"pomocą funkcji 'Nie pytaj ponownie'.</i>"
+msgid "Command:"
+msgstr "Polecenie:"
 
-#: rc.cpp:178
+#: ui_NetParamsEdit.ui:694
 #, no-c-format
-msgid "E&nable All Messages"
-msgstr "Włącz wszystkie wiadomości"
+msgid "Post-Connection Command"
+msgstr "Polecenie po połączeniu"
 
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
-msgstr ""
-"<p><b>Włącz wszystkie wiadomości</b></p>\n"
-"<p>Naciśnięcia poniższego przycisku spowoduje włączenie wszystkich "
-"wiadomości wyłączonych za pomocą funkcji 'Nie pytaj ponownie'.</p>"
+msgid "Pre-Disconnection Command"
+msgstr "Polecenie przed rozłączeniem"
+
+#: ui_NetParamsEdit.ui:914
+#, no-c-format
+msgid "Post-Disconnection Command"
+msgstr "Polecenie po rozłączeniu"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Asystent Pierwszego Połączenia"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Witaj w Asystencie Pierwszego Połączenia"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -660,7 +593,7 @@ msgstr ""
 "połączenia.</p>\n"
 "<p><i>Naciśnij Dalej aby kontynuować.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -672,27 +605,17 @@ msgstr ""
 "<p>Wpisz ESSID, którego chcesz używać łącząc się z tym punktem dostępowym.</"
 "p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Konfiguracja Sieci"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automatyczna (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Ręczna"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -704,47 +627,12 @@ msgstr ""
 "zostać ustawione.</b></p>\n"
 "<p>Jaka metoda konfiguracji ma być używana dla połączenia z tą siecią?</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Parametry Sieci"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "Dodatkowy DNS:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "Adres IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Maska sieci:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "DNS:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Brama sieci:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Domena:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Transmitowany IP:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -754,12 +642,12 @@ msgstr ""
 "<p><b>Wpisz parametry dla połączenia z tą siecią.</b></p>\n"
 "<p>Niektóre pola mogą zostać puste.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "Konfiguracja WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -770,37 +658,33 @@ msgstr ""
 "</b></p>\n"
 "<p>Jakiego trybu WEP chcesz używać dla tego połączenia?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, no-c-format
 msgid "Open S&ystem"
 msgstr "System Otwarty"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "Klucz publiczny"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
-msgstr "<p><b>Wpisz klucz, którego chcesz używać łącząc się z tą siecią.</b></p>"
+msgstr ""
+"<p><b>Wpisz klucz, którego chcesz używać łącząc się z tą siecią.</b></p>"
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "Klucz WEP:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr "ASCII"
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, no-c-format
 msgid "WPA Configuration"
 msgstr "Konfiguracja WPA"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -809,29 +693,17 @@ msgstr ""
 "<p><b>Sieć, z którą chcesz się połączyć, wymaga uwierzytelnienia metodą WPA."
 "</b></p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, no-c-format
 msgid "WPA Key:"
 msgstr "Klucz WPA:"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid "WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-"Wersja WPA:<br>Szyfrowanie grupowe:<br>Szyfrowanie pojedyncze:<br>Metoda "
-"uwierzytelniania:"
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "Gotowe!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -842,139 +714,308 @@ msgstr ""
 "<p>Pomyślnie zakończono konfigurowanie tego połączenia.</p>\n"
 "<p><b>Naciśnij Zakończ by nawiązać połączenie!</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
+msgid "&Options"
 msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "Interfejs"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
+#: ui_main.ui:42
 #, no-c-format
-msgid "&Manual"
-msgstr "Ręczna"
+msgid "Toggle network list/options"
+msgstr "Przełącz między listą sieci a opcjami"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "Bezpieczeństwo"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Opcje</b></p>\n"
+"<p>Naciśnięcie tego przycisku pokaże dostępne opcje programu.</p>\n"
+"<p><i>WSKAZÓWKA: Naciśnij ten przycisk ponownie by powrócić do listy sieci.</"
+"i></p>"
 
-#: rc.cpp:364
+#: ui_main.ui:58
 #, no-c-format
-msgid "WPA Settings"
-msgstr "Ustawienia WPA"
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Klucz:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Zakończ</b></p>\n"
+"<p>Wciśnięcia tego przycisku zakończy działanie programu.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, no-c-format
-msgid "WEP Settings"
-msgstr "Ustawienia WEP"
+msgid "Co&nnect"
+msgstr "Połącz"
 
-#: rc.cpp:382
+#: ui_main.ui:88 ui_main.ui:697
 #, no-c-format
-msgid "Open Syste&m"
-msgstr "System Otwarty"
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Połącz/Rozłącz</b></p>\n"
+"<p>Naciśnięcie tego przycisku spowoduje połączenie z lub odłączenie od "
+"wybranej sieci.</p>"
 
-#: rc.cpp:394
+#: ui_main.ui:106
 #, no-c-format
-msgid "Shared &Key"
-msgstr "Klucz Publiczny"
+msgid "Refresh"
+msgstr "Odśwież"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "Odśwież listę sieci"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Odśwież</b></p>\n"
+"<p>Naciśnięcie tego przycisku spowoduje wyszukanie dostępnych sieci "
+"bezprzewodowych i odświeżenie listy sieci.</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
-msgstr "Zaawansowane"
+msgid "Device:"
+msgstr "Karta sieciowa:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Wybierz kartę sieciową"
 
-#: rc.cpp:403
+#: ui_main.ui:222
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
 msgstr ""
-"<b>Ostrzeżenie o zabezpieczeniach:</b> poniższe komendy zostaną uruchomione "
-"z takimi samymi uprawnieniami, jakie ma Wireless Assistant."
+"<p><b>Wybór Kary Sieciowej</b></p>\n"
+"<p>To pole pozwala na wybranie aktywnej karty sieciowej.</p>\n"
+"<p><i>INFORMACJA: Zmiana aktywnej karty spowoduje odświeżenie listy "
+"dostępnych sieci.</i></p>"
 
-#: rc.cpp:406
+#: ui_main.ui:281
 #, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Polecenie przed połączeniem"
+msgid "Channel"
+msgstr "Kanał"
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:292
 #, no-c-format
-msgid "Timeout:"
-msgstr "Limit czasu:"
+msgid "Link Quality"
+msgstr "Jakość Połączenia"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:303
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
-msgstr "Ilość czasu, po której upływie proces zostanie przerwany."
+msgid "WEP/WPA"
+msgstr "WEP/WPA"
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "AP"
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
-"<p><b>Limit czasu</b></p>\n"
-"<p>Opcja ta określa, jak długo Wireless Assistant powinien czekać na "
-"zakończenie procesu, zanim zostanie on przerwany.</p>"
+"<p><b>Lista Sieci</b></p>\n"
+"<p>Lista ta pokazuje wszystkie znalezione sieci bezprzewodowe.</p>\n"
+"<p><i>WSKAZÓWKA: Naciśnij przycisk Odśwież w celu zaktualizowania listy.</"
+"i></p>"
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:363
 #, no-c-format
-msgid "Run detached"
-msgstr "Uruchom w oddzielnym procesie"
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:369
 #, no-c-format
-msgid "Don't wait for the process to finish."
-msgstr "Nie czekaj na zakończenie procesu"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
+msgstr ""
+"<p><b>Pasek Statusu</b></p>\n"
+"<p>W tym obszarze pokazywane są wiadomości o wykonywanych przez program "
+"działaniach.</p>"
+
+#: ui_main.ui:399
+#, no-c-format
+msgid "Automatically connect on startup"
+msgstr "Połącz automatycznie przy uruchomieniu programu"
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
-"<p><b>Uruchom w Oddzielnym Procesie</b></p>\n"
-"<p>Jeśli opcja ta jest zaznaczona, Wireless Assistant nie będzie czekał na "
-"zakończenie procesu.</p>"
+"<p><b>Połącz Automatycznie przy Uruchomieniu Programu</b></p>\n"
+"<p>Zaznaczenie tej opcji spowoduje próbę połączenia z najlepszą dostępną "
+"siecią przy uruchomieniu programu. Jedynie skonfigurowane wcześniej sieci są "
+"brane pod uwagę.</p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:414
 #, no-c-format
-msgid "Command:"
-msgstr "Polecenie:"
+msgid "Automaticall&y reconnect if connection is lost"
+msgstr "Automatycznie wznów połączenie w razie jego zerwania"
 
-#: rc.cpp:435
+#: ui_main.ui:417
 #, no-c-format
-msgid "Post-Connection Command"
-msgstr "Polecenie po połączeniu"
+msgid "Alt+Y"
+msgstr ""
 
-#: rc.cpp:464
+#: ui_main.ui:420
 #, no-c-format
-msgid "Pre-Disconnection Command"
-msgstr "Polecenie przed rozłączeniem"
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
+msgstr ""
+"<p><b>Automatycznie Wznów Połączenie w Razie Jego Przerwania</b></p>\n"
+"<p>Zaznaczenie tego pola spowoduje, że Wireless Assistant spróbuje połączyć "
+"się ponownie do sieci, z którą połączenie zostało zerwane.</p>"
 
-#: rc.cpp:493
+#: ui_main.ui:429
 #, no-c-format
-msgid "Post-Disconnection Command"
-msgstr "Polecenie po rozłączeniu"
+msgid "Quit upon successful connection"
+msgstr "Zakończ program po uzyskaniu połączenia"
+
+#: ui_main.ui:435
+#, no-c-format
+msgid ""
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
+msgstr ""
+"<p><b>Zakończ Program po Uzyskaniu Połączenia</b></p>\n"
+"<p>Zaznaczenie tego pola spowoduje zakończenie działania programu po "
+"uzyskaniu połączenia z siecią bezprzewodową.</p>"
 
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr "Grupuj punkty dostępowe o takim samym ESSID"
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+"<p><b>Grupuj Punkty Dostępowe o Takim Samym ESSID</b></p>\n"
+"<p>Zaznaczenie tej opcji spowoduje pokazanie wszystkich sieci o takim samym "
+"ESSID jako jednego elementu na liście sieci.</p>"
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr "Opóźnienie przed skanowaniem:"
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Określ jak długo czekać na uzyskanie adresu IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Limit czasu klienta DHCP</b></p>\n"
+"<p>Opcja ta pozwala na określenie czasu, po którym program przestanie czekać "
+"na przydzielenie adresu IP i uzna, że połączenie nie powiodło się.</p>\n"
+"<p><i>WSKAZÓWKA: Zwiększenie tej wartości może pomóc połączyć się z "
+"niektórymi sieciami.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Limit czasu klienta DHCP:"
+
+#: ui_main.ui:575
+#, no-c-format
+msgid "Specify how long to wait before scanning"
+msgstr "Określ jak długo czekać przed skanowaniem"
+
+#: ui_main.ui:578
+#, no-c-format
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Opóźnienie przed Skanowaniem</b></p>\n"
+"<p>Opcja ta pozwala na określenie czasu pomiędzy aktywacją karty sieciowej, "
+"a wykonaniem skanowania.</p>\n"
+"<p><i>WSKAZÓWKA: Zwiększenie tej wartości może pomóc w przypadku, gdy w celu "
+"zobaczenia wszystkich dostępnych sieci, konieczne jest ręczne odświeżenie "
+"listy.</i></p>"
+
+#: ui_main.ui:661
+#, no-c-format
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
+msgstr ""
+"<i>Naciśnij poniższy przycisk aby włączyć wszystkie wiadomości wyłączone za "
+"pomocą funkcji 'Nie pytaj ponownie'.</i>"
+
+#: ui_main.ui:694
+#, no-c-format
+msgid "E&nable All Messages"
+msgstr "Włącz wszystkie wiadomości"
+
+#: ui_main.ui:700
+#, no-c-format
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
+msgstr ""
+"<p><b>Włącz wszystkie wiadomości</b></p>\n"
+"<p>Naciśnięcia poniższego przycisku spowoduje włączenie wszystkich "
+"wiadomości wyłączonych za pomocą funkcji 'Nie pytaj ponownie'.</p>"
diff --git a/po/pt_BR/wlassistant.po b/po/pt_BR/wlassistant.po
index 208a945..ac81fe8 100644
--- a/po/pt_BR/wlassistant.po
+++ b/po/pt_BR/wlassistant.po
@@ -7,20 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2006-02-15 04:33-0000\n"
 "Last-Translator: Bruno Gonçalves Araujo <[email protected]>\n"
 "Language-Team: Polish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Assistente sem fio"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Essa é uma rede segura.</p><p>Favor ir em <i>Segurança</i> e inserir "
+"uma chave WEP.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>Sua chave WEP não foi inserida corretamente.</p><p>Favor ir em "
+"<i>Segurança</i> e inserir a chave requerida.</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>A conexão está parada.</p><p>Deseja reconectar utilizando o ESSID '<b>"
+"%1</b>' para essa conexão?</p><p><i>NOTA: Caso clique em não será aberta uma "
+"janela para especificar um novo ESSID.</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Iniciando..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -28,7 +74,7 @@ msgstr ""
 "Kernel 2.6 ou mais novo não encontrado.\n"
 "O Assistente de rede sem fio irá finalizar."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -36,7 +82,7 @@ msgstr ""
 "Nenhum dispositivo de rede sem fio encontrado.\n"
 "O Assistente de rede sem fio irá finalizar."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -45,7 +91,7 @@ msgstr ""
 "rede sem fio funcionar corretamente.</p><p>Você o rodou usando'<tt>sudo</"
 "tt>'?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -53,7 +99,7 @@ msgstr ""
 "Executável(eis) '%1' não encontrado(s).\n"
 "O Assistente de rede sem fio irá finalizar."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -61,11 +107,11 @@ msgstr ""
 "Conexão a '%1' foi perdida!\n"
 "Você deseja reconectar?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Conexão perdida"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -73,11 +119,11 @@ msgstr ""
 "<qt><p>Configurações da rede '<b>%1</b>' serão deletadas.</p><p>Você deseja "
 "continuar?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Configurações apagadas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -85,29 +131,27 @@ msgstr ""
 "<qt><p>Arquivo '<i>%1</i>' não pôde ser aberto para escrita.</p><p>O Nome do "
 "servidor e/ou domínio não foram colocados.  </p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Subindo interface %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Procurando..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Feito."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "Nenhuma rede encontrada."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -118,22 +162,22 @@ msgstr ""
 "computador.\n"
 "Você precisa habilitá-lo para poder usar as redes sem fio."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "Assistente da primeira conexão"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -141,44 +185,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Assistente da primeira conexão"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Configurações de rede atualizadas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "Conexão falhou."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Conectando à '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexão perdida"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "Assistente da primeira conexão"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Testando conexão..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Conectado à '%1'."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -186,11 +228,11 @@ msgstr ""
 "Conexão falhou.\n"
 "Você gostaria de revisar as configurações para esta rede?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "Revisar configurações?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -198,50 +240,50 @@ msgstr ""
 "<qt><p>Você está prestes a se desconectar de '<b>%1</b>'.</p><p>Você "
 "gostaria de continuar?<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "Conexão falhou."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Desconectando..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "Esperando o término do cliente DHCP..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "Assistente da primeira conexão"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&Desconectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Desconectar da rede selecionada"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "&Conectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Conecta à rede selecionada"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&Parar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -249,397 +291,286 @@ msgstr ""
 "Terminar o processo corrente\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Sair da aplicação"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Desconectar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "Conectar"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Ignorar Configurações..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Editar Configurações..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Configurar e Conectar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "%1 Configurações"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
+#: ui_NetParamsEdit.ui:24
+#, no-c-format
+msgid "Properties"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:58
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Assistente sem fio"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "&Help"
 msgstr ""
-"<qt><p>Essa é uma rede segura.</p><p>Favor ir em <i>Segurança</i> e inserir "
-"uma chave WEP.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
 msgstr ""
-"<qt><p>Sua chave WEP não foi inserida corretamente.</p><p>Favor ir em "
-"<i>Segurança</i> e inserir a chave requerida.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>A conexão está parada.</p><p>Deseja reconectar utilizando o ESSID '<b>"
-"%1</b>' para essa conexão?</p><p><i>NOTA: Caso clique em não será aberta uma "
-"janela para especificar um novo ESSID.</i></p></qt>"
-
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Alternar rede lista/opções"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Cancelada."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgid "I&nterface"
 msgstr ""
-"<p><b>Opções</b></p>\n"
-"<p>Este botão irá mostrar as opções de aplicações disponíveis.</p>\n"
-"<p><i>DICA: Apertar este botão novamente para retornar para a lista de rede."
-"</i></p>"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
+msgid "ESSID"
 msgstr ""
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
+msgid "ESSID:"
 msgstr ""
-"<p><b>Sair</b></p>\n"
-"<p>Apertando este botão sairá do aplicativo.</p>"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "Conectar"
+msgid "Configuration"
+msgstr "Configuração WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automático (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Conectar/Desconectar</b></p>\n"
-"<p>Conecta/Desconecta da rede selecionada na lista da rede.</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "Manual"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Atualizar"
+msgid "Netmask:"
+msgstr "Máscara de rede:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Atualizar lista de redes"
+msgid "IP:"
+msgstr "IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Procurar</b></p>\n"
-"<p>Tenta encontrar redes sem fio e atualiza as informações na lista de "
-"redes</p>"
+msgid "Broadcast:"
+msgstr "Broadcast:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Dispositivo:"
+msgid "Gateway:"
+msgstr "Gateway:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Escolha um dispositivo de rede"
+msgid "Domain:"
+msgstr "Domínio:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Seleção de Dispositivo</b></p>\n"
-"<p>Esta opção te permite selecionar qual placa de rede sem fio selecionar.</"
-"p>\n"
-"<p><i>OBS: Selecionando uma placa de rede sem fio diferente irá atualizar a "
-"lista de rede.</i></p>"
+msgid "Secondary DNS:"
+msgstr "DNS secundário:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr ""
+msgid "Primary DNS:"
+msgstr "DNS primário:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Canal"
+msgid "Securit&y"
+msgstr "Se&gurança"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "Qualidade da conexão"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "%1 Configurações"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "Chave:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
+msgid "ASCII"
 msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Lista de rede</b></p>\n"
-"<p>Esta lista mostra todas as placas de rede sem fio que foram encontradas.</"
-"p>\n"
-"<p><i>DICA: Clique no botão Procurar para atualizar esta lista.</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "%1 Configurações"
+
+#: ui_NetParamsEdit.ui:497
 #, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
+msgid "Open Syste&m"
 msgstr ""
-"<p><b>Barra de Status</b></p>\n"
-"<p>Mensagens descrevendo o processo corrente são mostrados nesta área</p>"
 
-#: rc.cpp:95
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid "Automatically connect on startup"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:550
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Shared &Key"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Saída da conexão com sucesso.</b></p>\n"
-"<p>Checando esta janela irá fechar a aplicação após estabelecer uma conexão "
-"bem sucedida em uma rede sem fio. </p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Saída da conexão com sucesso."
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "Conexão falhou."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>Saída da conexão com sucesso.</b></p>\n"
-"<p>Checando esta janela irá fechar a aplicação após estabelecer uma conexão "
-"bem sucedida em uma rede sem fio. </p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
+msgid "s"
 msgstr ""
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
-#, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Especifique quanto tempo esperar por um IP"
-
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+msgid "Don't wait for the process to finish."
 msgstr ""
-"<p><b>Tempo de espera do cliente DHCP</b></p>\n"
-"<p>Esta opção especifica quanto tempo a aplicação deveria parar ao esperar "
-"por um endereço de IP e informar que a conexão falhou.</p>\n"
-"<p><i>DICA: Aumentando este numero pode ajudar se você tiver problemas ao "
-"conectar em algumas redes.</i></p>"
 
-#: rc.cpp:142
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Tempo de espera do cliente DHCP:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
+msgid ""
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
 
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Especifique quanto tempo esperar por um IP"
+msgid "Command:"
+msgstr "Domínio:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>Tempo de espera do cliente DHCP</b></p>\n"
-"<p>Esta opção especifica quanto tempo a aplicação deveria parar ao esperar "
-"por um endereço de IP e informar que a conexão falhou.</p>\n"
-"<p><i>DICA: Aumentando este numero pode ajudar se você tiver problemas ao "
-"conectar em algumas redes.</i></p>"
+msgid "Post-Connection Command"
+msgstr "Assistente da primeira conexão"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>Aperte este botão abaixo para habilitar todas as mensagens que foram "
-"desligadas com a opção 'Não mostre novamente'</i>"
-
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "Habilitar todas as mensagens"
 
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>Habilitar todas as mensagens</b></p>\n"
-"<p>Apertando este botão irá habilitar todas as mensagens que foram "
-"desligadas com a opção 'Não mostre novamente'</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Assistente da primeira conexão"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Bem Vindo ao Assitente da Primeira Conexão"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -654,7 +585,7 @@ msgstr ""
 "p>\n"
 "<p><i>Aperte Próximo para continuar.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -667,27 +598,17 @@ msgstr ""
 "<p>Por Favor especifique o ESSID que você gostaria de usar ao conectar a "
 "este ponto de acesso.</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr ""
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Configuração da Interface"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automático (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Manual"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -700,47 +621,12 @@ msgstr ""
 "<p>Qual opção de configuração você gostaria de usar ao conectar a esta rede?"
 "</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Parâmetros da interface"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "DNS secundário:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Máscara de rede:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "DNS primário:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Domínio:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Broadcast:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -751,12 +637,12 @@ msgstr ""
 "conectar a esta rede.</b></p>\n"
 "<p>Você poderá deixar alguns campos em branco.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "Configuração WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -767,39 +653,34 @@ msgstr ""
 "</b></p>\n"
 "<p>Qual modo WEP você gostaria de usar?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, no-c-format
 msgid "Open S&ystem"
 msgstr ""
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr ""
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>Por Favor informe uma chave a ser usada para esta rede.</b></p>\n"
 "Qualquer formato suportado pelo iwconfig pode ser usado."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "Chave WEP:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "Configuração WEP"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -809,28 +690,17 @@ msgstr ""
 "</b></p>\n"
 "<p>Qual modo WEP você gostaria de usar?</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "Chave WEP"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "Feito!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -841,133 +711,302 @@ msgstr ""
 "<p>Você acabou de configurar esta conexão com sucesso.</p>\n"
 "<p><b>Aperte Fim para conectar!</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
+msgid "&Options"
 msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
+msgid "Alt+O"
 msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "Manual"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "Alternar rede lista/opções"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "Se&gurança"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Opções</b></p>\n"
+"<p>Este botão irá mostrar as opções de aplicações disponíveis.</p>\n"
+"<p><i>DICA: Apertar este botão novamente para retornar para a lista de rede."
+"</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "%1 Configurações"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Chave:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Sair</b></p>\n"
+"<p>Apertando este botão sairá do aplicativo.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "%1 Configurações"
+msgid "Co&nnect"
+msgstr "Conectar"
 
-#: rc.cpp:382
+#: ui_main.ui:88 ui_main.ui:697
 #, no-c-format
-msgid "Open Syste&m"
+msgid "Alt+N"
 msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Conectar/Desconectar</b></p>\n"
+"<p>Conecta/Desconecta da rede selecionada na lista da rede.</p>"
 
-#: rc.cpp:394
+#: ui_main.ui:106
 #, no-c-format
-msgid "Shared &Key"
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: ui_main.ui:115
+#, no-c-format
+msgid "Refresh network list"
+msgstr "Atualizar lista de redes"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Procurar</b></p>\n"
+"<p>Tenta encontrar redes sem fio e atualiza as informações na lista de "
+"redes</p>"
 
-#: rc.cpp:397
+#: ui_main.ui:194
 #, no-c-format
-msgid "Alt+K"
+msgid "Device:"
+msgstr "Dispositivo:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Escolha um dispositivo de rede"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
 msgstr ""
+"<p><b>Seleção de Dispositivo</b></p>\n"
+"<p>Esta opção te permite selecionar qual placa de rede sem fio selecionar.</"
+"p>\n"
+"<p><i>OBS: Selecionando uma placa de rede sem fio diferente irá atualizar a "
+"lista de rede.</i></p>"
 
-#: rc.cpp:400
+#: ui_main.ui:281
 #, no-c-format
-msgid "Advanced"
+msgid "Channel"
+msgstr "Canal"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "Qualidade da conexão"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
 msgstr ""
 
-#: rc.cpp:403
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr ""
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>Lista de rede</b></p>\n"
+"<p>Esta lista mostra todas as placas de rede sem fio que foram encontradas.</"
+"p>\n"
+"<p><i>DICA: Clique no botão Procurar para atualizar esta lista.</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Conexão falhou."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>Barra de Status</b></p>\n"
+"<p>Mensagens descrevendo o processo corrente são mostrados nesta área</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
+msgstr ""
+
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
 msgstr ""
+"<p><b>Saída da conexão com sucesso.</b></p>\n"
+"<p>Checando esta janela irá fechar a aplicação após estabelecer uma conexão "
+"bem sucedida em uma rede sem fio. </p>"
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "Saída da conexão com sucesso."
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
+msgstr ""
+"<p><b>Saída da conexão com sucesso.</b></p>\n"
+"<p>Checando esta janela irá fechar a aplicação após estabelecer uma conexão "
+"bem sucedida em uma rede sem fio. </p>"
+
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
 msgstr ""
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Especifique quanto tempo esperar por um IP"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Tempo de espera do cliente DHCP</b></p>\n"
+"<p>Esta opção especifica quanto tempo a aplicação deveria parar ao esperar "
+"por um endereço de IP e informar que a conexão falhou.</p>\n"
+"<p><i>DICA: Aumentando este numero pode ajudar se você tiver problemas ao "
+"conectar em algumas redes.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Tempo de espera do cliente DHCP:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "Domínio:"
+msgid "Specify how long to wait before scanning"
+msgstr "Especifique quanto tempo esperar por um IP"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "Assistente da primeira conexão"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Tempo de espera do cliente DHCP</b></p>\n"
+"<p>Esta opção especifica quanto tempo a aplicação deveria parar ao esperar "
+"por um endereço de IP e informar que a conexão falhou.</p>\n"
+"<p><i>DICA: Aumentando este numero pode ajudar se você tiver problemas ao "
+"conectar em algumas redes.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>Aperte este botão abaixo para habilitar todas as mensagens que foram "
+"desligadas com a opção 'Não mostre novamente'</i>"
+
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "Habilitar todas as mensagens"
 
-#: rc.cpp:493
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>Habilitar todas as mensagens</b></p>\n"
+"<p>Apertando este botão irá habilitar todas as mensagens que foram "
+"desligadas com a opção 'Não mostre novamente'</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "Modo WEP"
diff --git a/po/sv/wlassistant.po b/po/sv/wlassistant.po
index 52da9f5..3c5c731 100644
--- a/po/sv/wlassistant.po
+++ b/po/sv/wlassistant.po
@@ -7,19 +7,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wlassistant 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2006-09-09 18:06+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Daniel Nylander"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "Assistent för trådlösa nätverk"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Nätverket har ändrats sin säkerhetsinställningar.</p><p>Gå till "
+"fliken <i>Säkerhet</i> i nästkommande dialogruta och konfigurera WEP-"
+"inställningarna.</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>Din WEP-nyckel är inte korrekt inställd.</p><p>Gå till fliken "
+"<i>Säkerhet</i> i följande dialog och ange den nödvändiga nyckeln.</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>Nätverket har slutat att annonsera sitt ESSID sedan senaste gången du "
+"anslöt till det.</p><p>Vill du använda \"<b>%1</b>\" som ett ESSID för detta "
+"nätverk?</p><p><i>NOTERA: Om du svarar Nej kommer en dialogruta att visas "
+"där du kan ange ett annat ESSID.</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "Initierar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -27,7 +75,7 @@ msgstr ""
 "2.6-kärna eller senare används inte.\n"
 "Assistent för trådlösa nätverk kommer nu att avslutas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -35,7 +83,7 @@ msgstr ""
 "Inga användbara trådlösa enheter hittades.\n"
 "Assistant för trådlösa nätverk kommer nu att avslutas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -44,7 +92,7 @@ msgstr ""
 "trådlösa nätverk ska fungera korrekt.</p><p>Startade du det med \"<tt>sudo</"
 "tt>\"?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -52,7 +100,7 @@ msgstr ""
 "Körbara filen \"%1\" kunde inte hittas.\n"
 "Assistent för trådlösa nätverk kommer nu att avslutas."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -60,11 +108,11 @@ msgstr ""
 "Anslutningen till \"%1\" har förlorats!\n"
 "Vill du återansluta?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "Anslutningen förlorades"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
@@ -72,11 +120,11 @@ msgstr ""
 "<qt><p>Inställningar för nätverket \"<b>%1</b>\" är på väg att tas bort.</"
 "p><p>Vill du fortsätta?</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "Inställningar borttagna."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
@@ -84,29 +132,27 @@ msgstr ""
 "<qt><p>Filen \"<i>%1</i>\" kunde inte öppnas för skrivning.</"
 "p><p>Namnservrar och/eller domän har inte ställts in.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "Tar upp gränssnittet %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "Söker av..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "Klar."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "Inga nätverk hittades."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -116,22 +162,22 @@ msgstr ""
 "Radio för ditt trådlösa kort är avstängt med en extern knapp på din dator.\n"
 "Du behöver slå på den för att kunna använda trådlösa nätverk."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "Frekvens (Hz)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "Guide för din första anslutning"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -139,44 +185,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - Guide för första anslutningen"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "Nätverksinställningarna uppdaterade."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "Anslutning misslyckades."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "Ansluter till \"%1\"..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "Anslutningen förlorades"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "Guide för din första anslutning"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "Testar anslutning..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "Anslutning till \"%1\" lyckades."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -184,11 +228,11 @@ msgstr ""
 "Anslutningen misslyckades.\n"
 "Vill du granska inställningarna för detta nätverk?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "Granska inställningarna?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
@@ -196,50 +240,50 @@ msgstr ""
 "<qt><p>Du är på väg att koppla ner från \"<b>%1</b>\".</p><p>Vill du "
 "fortsätta?<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "Anslutning misslyckades."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "Kopplar ner..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "Väntar på att DHCP-klienten ska avslutas..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "Guide för din första anslutning"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&Koppla ner"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "Koppla ner från markerat nätverk"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "&Anslut"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "Anslut till markerat nätverk"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&Stopp"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
@@ -247,400 +291,286 @@ msgstr ""
 "Avsluta aktuell process\n"
 "(%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "Avsluta programmet"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "Koppla ner..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "Anslut"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "Glöm inställningar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "Redigera inställningar..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "Konfigurera och anslut..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "Inställningar för %1"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Daniel Nylander"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "Assistent för trådlösa nätverk"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>Nätverket har ändrats sin säkerhetsinställningar.</p><p>Gå till "
-"fliken <i>Säkerhet</i> i nästkommande dialogruta och konfigurera WEP-"
-"inställningarna.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>Din WEP-nyckel är inte korrekt inställd.</p><p>Gå till fliken "
-"<i>Säkerhet</i> i följande dialog och ange den nödvändiga nyckeln.</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>Nätverket har slutat att annonsera sitt ESSID sedan senaste gången du "
-"anslöt till det.</p><p>Vill du använda \"<b>%1</b>\" som ett ESSID för detta "
-"nätverk?</p><p><i>NOTERA: Om du svarar Nej kommer en dialogruta att visas "
-"där du kan ange ett annat ESSID.</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "Växla nätverkslista/alternativ"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Avbruten."
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>Alternativknapp</b></p>\n"
-"<p>Tryck på denna knapp för att växla visning av tillgängliga "
-"programalternativ.</p>\n"
-"<p><i>TIPS: Tryck denna knapp igen för att återgå till nätverkslistan.</i></"
-"p>"
+msgid "I&nterface"
+msgstr "Grä&nssnitt"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "ESSID"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>Avslutningsknapp</b></p>\n"
-"<p>Tryck på denna knapp för att avsluta programmet.</p>"
+msgid "ESSID:"
+msgstr "ESSID:"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "Anslut"
+msgid "Configuration"
+msgstr "Konfiguration av WEP"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "Automatisk (DHCP)"
 
-#: rc.cpp:42
+#: ui_NetParamsEdit.ui:206
 #, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>Anslut/Koppla ner-knappen</b></p>\n"
-"<p>Tryck på denna knapp för att ansluta till/koppla ner från nätverket som "
-"för närvarande markerats i nätverkslistan.</p>"
+msgid "&Manual"
+msgstr "Manuell"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "Uppdatera"
+msgid "Netmask:"
+msgstr "Nätmask:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "Uppdatera nätverkslistan"
+msgid "IP:"
+msgstr "IP:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>Sökknapp</b></p>\n"
-"<p>Tryck på denna knapp för att söka efter trådlösa nätverk och uppdatera "
-"nätverkslistan.</p>"
+msgid "Broadcast:"
+msgstr "Broadcast:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "Enhet:"
+msgid "Gateway:"
+msgstr "Gateway:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "Välj en nätverksenhet att använda"
+msgid "Domain:"
+msgstr "Domän:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>Enhetsväljare</b></p>\n"
-"<p>Denna kombinationsruta låter dig välja vilket trådlöst kort som ska "
-"användas.</p>\n"
-"<p><i>NOTERA: Om du väljer ett annat kort innebär det att nätverkslistan "
-"uppdateras.</i></p>"
+msgid "Secondary DNS:"
+msgstr "Sekundär DNS:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "ESSID"
+msgid "Primary DNS:"
+msgstr "Primär DNS:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "Kanal"
+msgid "Securit&y"
+msgstr "Säker&het"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "Länkkvalitet"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "Inställningar för %1"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "Nyckel:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "AP"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>Nätverkslista</b></p>\n"
-"<p>Denna lista visar alla trådlösa nätverk som har hittats.</p>\n"
-"<p><i>TIPS: Klicka på knappen Uppdatera för att uppdatera listan.</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>Statusrad</b></p>\n"
-"<p>Meddelanden som beskriver aktuell process visas i detta område.</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "Inställningar för %1"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "Öppet system"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "Delad nyckel"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>Avsluta vid lyckad anslutning</b></p>\n"
-"<p>Kryssa i denna ruta för att programmet ska stängas efter lyckad "
-"etablering av anslutning till ett trådlöst nätverk.</p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "Avsluta vid lyckad anslutning"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "Anslutning misslyckades."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>Avsluta vid lyckad anslutning</b></p>\n"
-"<p>Kryssa i denna ruta för att programmet ska stängas efter lyckad "
-"etablering av anslutning till ett trådlöst nätverk.</p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "Ange hur lång väntetiden på en IP-adress skall vara"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>Tidsgräns för DHCP-klient överstigen</b></p>\n"
-"<p>Detta alternativ anger den tidsgräns efter vilken programmet ska sluta "
-"vänta på en IP-adress och anta att anslutningen har misslyckats.</p>\n"
-"<p><i>TIPS: Öka denna gräns kan hjälpa dig om du har problem med att ansluta "
-"till vissa nätverk.</i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "Tidsgräns för DHCP-klient:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
 
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "Ange hur lång väntetiden på en IP-adress skall vara"
+msgid "Command:"
+msgstr "Domän:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>Tidsgräns för DHCP-klient överstigen</b></p>\n"
-"<p>Detta alternativ anger den tidsgräns efter vilken programmet ska sluta "
-"vänta på en IP-adress och anta att anslutningen har misslyckats.</p>\n"
-"<p><i>TIPS: Öka denna gräns kan hjälpa dig om du har problem med att ansluta "
-"till vissa nätverk.</i></p>"
+msgid "Post-Connection Command"
+msgstr "Guide för din första anslutning"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>Tryck på knappen nedan för att aktivera alla meddelanden som har stängts "
-"av med funktionen \"Visa inte igen\".</i>"
-
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "Aktivera alla meddelanden"
 
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>Aktivera alla meddelanden</b></p>\n"
-"<p>Tryck på denna knapp för att aktivera alla meddelanden som har stängts av "
-"med funktionen \"Visa inte igen\".</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "Guide för din första anslutning"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "Välkommen till Guiden för din första anslutning"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -655,7 +585,7 @@ msgstr ""
 "konfigurera denna anslutning.</p>\n"
 "<p><i>Tryck Nästa för att fortsätta.</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -668,27 +598,17 @@ msgstr ""
 "<p>Ange det ESSID som du vill använda vid anslutning till denna åtkomstpunkt."
 "</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "Gränssnittskonfiguration"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "Automatisk (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "Manuell"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -701,47 +621,12 @@ msgstr ""
 "<p>Vilket konfigurationsalternativ vill du använda när du ansluter till "
 "detta nätverk?</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "Gränssnittsparametrar"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "Sekundär DNS:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "Nätmask:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "Primär DNS:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "Domän:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "Broadcast:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -752,12 +637,12 @@ msgstr ""
 "detta nätverk.</b></p>\n"
 "<p>Du kan lämna vissa fält tomma.</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "Konfiguration av WEP"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -767,39 +652,34 @@ msgstr ""
 "<p><b>Nätverket du försöker ansluta till kräver WEP-autentisering.</b></p>\n"
 "<p>Vilket WEP-läge vill du använda?</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "Öppet system"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "Delad nyckel"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>Tillhandahåll en nyckel som ska användas för detta nätverk.</b></p>\n"
 "Alla format som stöds av iwconfig kan användas."
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "WEP-nyckel:"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "Konfiguration av WEP"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -808,28 +688,17 @@ msgstr ""
 "<p><b>Nätverket du försöker ansluta till kräver WEP-autentisering.</b></p>\n"
 "<p>Vilket WEP-läge vill du använda?</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "WEP-nyckel"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "Klar!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -840,133 +709,303 @@ msgstr ""
 "<p>Du har nu färdigställt konfigurationen för denna anslutning.</p>\n"
 "<p><b>Tryck Färdig för att ansluta!</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "Grä&nssnitt"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
+#: ui_main.ui:42
 #, no-c-format
-msgid "&Manual"
-msgstr "Manuell"
+msgid "Toggle network list/options"
+msgstr "Växla nätverkslista/alternativ"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "Säker&het"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>Alternativknapp</b></p>\n"
+"<p>Tryck på denna knapp för att växla visning av tillgängliga "
+"programalternativ.</p>\n"
+"<p><i>TIPS: Tryck denna knapp igen för att återgå till nätverkslistan.</i></"
+"p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "Inställningar för %1"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "Nyckel:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>Avslutningsknapp</b></p>\n"
+"<p>Tryck på denna knapp för att avsluta programmet.</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "Inställningar för %1"
+msgid "Co&nnect"
+msgstr "Anslut"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "Öppet system"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>Anslut/Koppla ner-knappen</b></p>\n"
+"<p>Tryck på denna knapp för att ansluta till/koppla ner från nätverket som "
+"för närvarande markerats i nätverkslistan.</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "Delad nyckel"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "Uppdatera"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "Uppdatera nätverkslistan"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>Sökknapp</b></p>\n"
+"<p>Tryck på denna knapp för att söka efter trådlösa nätverk och uppdatera "
+"nätverkslistan.</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "Enhet:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "Välj en nätverksenhet att använda"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
+msgstr ""
+"<p><b>Enhetsväljare</b></p>\n"
+"<p>Denna kombinationsruta låter dig välja vilket trådlöst kort som ska "
+"användas.</p>\n"
+"<p><i>NOTERA: Om du väljer ett annat kort innebär det att nätverkslistan "
+"uppdateras.</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "Kanal"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "Länkkvalitet"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
 msgstr ""
 
-#: rc.cpp:403
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "AP"
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>Nätverkslista</b></p>\n"
+"<p>Denna lista visar alla trådlösa nätverk som har hittats.</p>\n"
+"<p><i>TIPS: Klicka på knappen Uppdatera för att uppdatera listan.</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "Anslutning misslyckades."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>Statusrad</b></p>\n"
+"<p>Meddelanden som beskriver aktuell process visas i detta område.</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
 msgstr ""
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
+msgstr ""
+"<p><b>Avsluta vid lyckad anslutning</b></p>\n"
+"<p>Kryssa i denna ruta för att programmet ska stängas efter lyckad "
+"etablering av anslutning till ett trådlöst nätverk.</p>"
+
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "Avsluta vid lyckad anslutning"
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
 msgstr ""
+"<p><b>Avsluta vid lyckad anslutning</b></p>\n"
+"<p>Kryssa i denna ruta för att programmet ska stängas efter lyckad "
+"etablering av anslutning till ett trådlöst nätverk.</p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "Ange hur lång väntetiden på en IP-adress skall vara"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>Tidsgräns för DHCP-klient överstigen</b></p>\n"
+"<p>Detta alternativ anger den tidsgräns efter vilken programmet ska sluta "
+"vänta på en IP-adress och anta att anslutningen har misslyckats.</p>\n"
+"<p><i>TIPS: Öka denna gräns kan hjälpa dig om du har problem med att ansluta "
+"till vissa nätverk.</i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "Tidsgräns för DHCP-klient:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "Domän:"
+msgid "Specify how long to wait before scanning"
+msgstr "Ange hur lång väntetiden på en IP-adress skall vara"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "Guide för din första anslutning"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>Tidsgräns för DHCP-klient överstigen</b></p>\n"
+"<p>Detta alternativ anger den tidsgräns efter vilken programmet ska sluta "
+"vänta på en IP-adress och anta att anslutningen har misslyckats.</p>\n"
+"<p><i>TIPS: Öka denna gräns kan hjälpa dig om du har problem med att ansluta "
+"till vissa nätverk.</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>Tryck på knappen nedan för att aktivera alla meddelanden som har stängts "
+"av med funktionen \"Visa inte igen\".</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "Aktivera alla meddelanden"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>Aktivera alla meddelanden</b></p>\n"
+"<p>Tryck på denna knapp för att aktivera alla meddelanden som har stängts av "
+"med funktionen \"Visa inte igen\".</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "WEP-läge"
diff --git a/po/zh_CN/wlassistant.po b/po/zh_CN/wlassistant.po
index 13caf4b..2036ca4 100644
--- a/po/zh_CN/wlassistant.po
+++ b/po/zh_CN/wlassistant.po
@@ -11,20 +11,70 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2005-12-15 16:09+0800\n"
 "Last-Translator: justin <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"_: 翻译人员名单\n"
+"张福平"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"_: 翻译人员EMAIL列表\n"
+"[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "无线网络助手"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>该网络安全设置已更改。</p><p>请到以下对话框中的<i>安全</i>选项卡中配置"
+"WEP设置。</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>您的WEP密钥设置有问题。</p><p>请在以下对话框中的<i>安全</i>选项卡中输"
+"入合适的密钥。</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>自从上次您成功连接后该网络已停止广播其扩展服务区标示符（ESSID）。</"
+"p><p>您希望使用<b>%1</b>作为该网络的ESSID吗？</p><p><i>注意：如果您回答\"否"
+"\"，程序将会弹出对话框让您设置一个不同的ESSID。</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -32,7 +82,7 @@ msgstr ""
 "Kernel2.6或更高版本不存在！\n"
 "无线网络助手将立即退出。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -40,7 +90,7 @@ msgstr ""
 "未发现任何无线设备\n"
 "无线网络助手将立即退出。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -48,7 +98,7 @@ msgstr ""
 "<qt><p>您的权限不够，可能无法正常运行无线网络助手的所有功能。</p><p>您是否运"
 "行了\"<tt>sudo</tt>\"命令</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -56,7 +106,7 @@ msgstr ""
 "未发现任何可执行的 '%1'.\n"
 "无线网络助手将立即退出。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -64,50 +114,48 @@ msgstr ""
 " '%1' 的连接已断开!\n"
 "您想要重新连接吗?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "连接已断开"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
 msgstr "<qt><p> '<b>%1</b>' 网络设置将被删除，</p><p>您想要继续吗？</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "设置已删除！"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
 msgstr ""
 "<qt><p>文件 '<i>%1</i>' 无法写入</p><p>名字／域名服务器设置失败。</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "唤醒接口 %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "扫描..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "完成。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "未找到任何网络。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -117,22 +165,22 @@ msgstr ""
 "无线网卡已被计算机上的外部程序关闭。\n"
 "要使用无线网络您必须先唤醒该网卡。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "频率 (赫兹)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "首次连接向导"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -140,44 +188,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - 首次连接向导"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "网络设置已更新!"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "连接失败."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "连接到 '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "连接已断开"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "首次连接向导"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "正在测试连接..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "成功连接到 '%1'."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -185,449 +231,345 @@ msgstr ""
 "连接失败\n"
 "你希望检查该网络设置吗？"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "检查设置?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
 msgstr "<qt><p>您即将从网络 '<b>%1</b>'.断开，</p><p>要继续吗？<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "连接失败."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "正在断开网络..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "等待DHCP客户端关闭..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "首次连接向导"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "已取消"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&断开连接"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "断开该网络"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "&连接"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "连接到选定网络"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&停止"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
 msgstr "终止当前进程<br> (%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "退出应用程序o"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "正在断开连接..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "连接"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "忽略设置..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "编辑设置..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "设置并连接..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "%1 设置"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"_: 翻译人员名单\n"
-"张福平"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"_: 翻译人员EMAIL列表\n"
-"[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "无线网络助手"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>该网络安全设置已更改。</p><p>请到以下对话框中的<i>安全</i>选项卡中配置"
-"WEP设置。</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>您的WEP密钥设置有问题。</p><p>请在以下对话框中的<i>安全</i>选项卡中输"
-"入合适的密钥。</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>自从上次您成功连接后该网络已停止广播其扩展服务区标示符（ESSID）。</"
-"p><p>您希望使用<b>%1</b>作为该网络的ESSID吗？</p><p><i>注意：如果您回答\"否"
-"\"，程序将会弹出对话框让您设置一个不同的ESSID。</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "网络触发器列表／选项"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "已取消"
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>选项</b></p>\n"
-"<p>点击该按钮将显示所有可用选项.</p>\n"
-"<p><i>提示：再次点击该按钮将返回到网络列表。</i></p>"
+msgid "I&nterface"
+msgstr "接口"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "扩展服务区标示符（ESSID）"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>退出</b></p>\n"
-"<p>点击此按钮将退出该程序</p>"
+msgid "ESSID:"
+msgstr "扩展服务区标示符（ESSID):"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "连接"
+msgid "Configuration"
+msgstr "WEP配置"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "自动获取 (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>连接／断开</b></p>\n"
-"<p>点击该按钮将连接／断开网络列表中被选定的网络。</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "手动设置"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "刷新"
+msgid "Netmask:"
+msgstr "子网掩码:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "刷新网络列表"
+msgid "IP:"
+msgstr "IP地址:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>扫描</b></p>\n"
-"<p>点击该按钮将扫描所有可用无线网络并刷新该网络列表。</p>"
+msgid "Broadcast:"
+msgstr "广播地址:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "设备:"
+msgid "Gateway:"
+msgstr "网关:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "请选择一个需要使用的网络设备"
+msgid "Domain:"
+msgstr "域名:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>选择设备</b></p>\n"
-"<p>您可以使用该选项卡来选择您希望使用的无线网卡。</p>\n"
-"<p><i>注意：选择另一张无线网卡将会刷新网络列表。</i></p>"
+msgid "Secondary DNS:"
+msgstr "次选DNS服务器:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "扩展服务区标示符（ESSID）"
+msgid "Primary DNS:"
+msgstr "首选DNS服务器"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "频道"
+msgid "Securit&y"
+msgstr "安全"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "连接质量"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "%1 设置"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "密钥:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "无线访问节点"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>网络列表</b></p>\n"
-"<p>该列表显示了所有可用无线网络。</p>\n"
-"<p><i>提示：点击\"刷新\"按钮可更新该列表。</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>状态栏</b></p>\n"
-"<p>该区域用来显示程序当前进程。</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "%1 设置"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "开发系统"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "共享密钥"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>连接成功后退出</b></p>\n"
-"<p>选择该选项后，应用程序将在成功建立一个无线网络连接后退出。</p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "连接成功后退出"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "连接失败."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>连接成功后退出</b></p>\n"
-"<p>选择该选项后，应用程序将在成功建立一个无线网络连接后退出。</p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "指定获取IP地址的时间上限"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>DHCP 客户端超时</b></p>\n"
-"<p>该选项用于指定获取IP地址的时间上限，超过该时间限制应用程序将会认为连接已失"
-"败。</p>\n"
-"<p><i>提示：如果您在连接某个网络时遇到问题，可以尝试提高该时间限制。</i></p>"
 
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "DHCP 客户端超时:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
-
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "指定获取IP地址的时间上限"
+msgid "Command:"
+msgstr "域名:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>DHCP 客户端超时</b></p>\n"
-"<p>该选项用于指定获取IP地址的时间上限，超过该时间限制应用程序将会认为连接已失"
-"败。</p>\n"
-"<p><i>提示：如果您在连接某个网络时遇到问题，可以尝试提高该时间限制。</i></p>"
+msgid "Post-Connection Command"
+msgstr "首次连接向导"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>您可以按下该按钮以便显示所有曾经用 \"下次不再显示\" 选项关闭的信息。</i>"
 
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "显示所有信息"
-
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>显示所有信息</b></p>\n"
-"<p>点击该按钮将会显示所有曾经用 \"下次不再显示\" 选项关闭的信息。</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "首次连接向导"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "欢迎使用首次连接向导!"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -640,7 +582,7 @@ msgstr ""
 "<p>请您回答相关问题以便配置该网络。</p>\n"
 "<p><i>按 \"下一步\" 继续。</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -652,27 +594,17 @@ msgstr ""
 "<p>请指定您希望使用的扩展服务区标示符（ESSID）以便连接到该无线访问节点（AP）"
 "</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "扩展服务区标示符（ESSID):"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "接口设置"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "自动获取 (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "手动设置"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -683,47 +615,12 @@ msgstr ""
 "<p><b>在连接网络前，请先配置您的IP地址和其他相关参数。</b></p>\n"
 "<p>您希望使用哪个配置选项连接到该网络？</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "接口参数"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "次选DNS服务器:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP地址:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "子网掩码:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "首选DNS服务器"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "网关:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "域名:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "广播地址:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -733,12 +630,12 @@ msgstr ""
 "<p><b>请指定连接到该网络的接口参数</b></p>\n"
 "<p>您可以将某些选项置空。</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "WEP配置"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -748,39 +645,34 @@ msgstr ""
 "<p><b>您希望连接的网络需要连线对等加密（WEP）授权</b></p>\n"
 "<p>您希望使用哪种连线对等加密（WEP）模式</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "开发系统"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>请提供一个连接到该网络的密钥。</b></p>\n"
 "可以使用任何iwconfig支持的格式。"
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "WEP密钥"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "WEP配置"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -789,28 +681,17 @@ msgstr ""
 "<p><b>您希望连接的网络需要连线对等加密（WEP）授权</b></p>\n"
 "<p>您希望使用哪种连线对等加密（WEP）模式</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "WEP密钥"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "完成!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -821,133 +702,291 @@ msgstr ""
 "<p>您已成功完成该连接的配置！</p>\n"
 "<p><b>请点击\"完成\"按钮连接该网络！</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "接口"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "手动设置"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "网络触发器列表／选项"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "安全"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>选项</b></p>\n"
+"<p>点击该按钮将显示所有可用选项.</p>\n"
+"<p><i>提示：再次点击该按钮将返回到网络列表。</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "%1 设置"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "密钥:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>退出</b></p>\n"
+"<p>点击此按钮将退出该程序</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "%1 设置"
+msgid "Co&nnect"
+msgstr "连接"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "开发系统"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>连接／断开</b></p>\n"
+"<p>点击该按钮将连接／断开网络列表中被选定的网络。</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "共享密钥"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "刷新"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "刷新网络列表"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>扫描</b></p>\n"
+"<p>点击该按钮将扫描所有可用无线网络并刷新该网络列表。</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "设备:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "请选择一个需要使用的网络设备"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
+msgstr ""
+"<p><b>选择设备</b></p>\n"
+"<p>您可以使用该选项卡来选择您希望使用的无线网卡。</p>\n"
+"<p><i>注意：选择另一张无线网卡将会刷新网络列表。</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "频道"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "连接质量"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
 msgstr ""
 
-#: rc.cpp:403
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "无线访问节点"
+
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>网络列表</b></p>\n"
+"<p>该列表显示了所有可用无线网络。</p>\n"
+"<p><i>提示：点击\"刷新\"按钮可更新该列表。</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "连接失败."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>状态栏</b></p>\n"
+"<p>该区域用来显示程序当前进程。</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
+msgstr ""
+
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
 msgstr ""
+"<p><b>连接成功后退出</b></p>\n"
+"<p>选择该选项后，应用程序将在成功建立一个无线网络连接后退出。</p>"
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "连接成功后退出"
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
 msgstr ""
+"<p><b>连接成功后退出</b></p>\n"
+"<p>选择该选项后，应用程序将在成功建立一个无线网络连接后退出。</p>"
+
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
+msgstr ""
+
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "指定获取IP地址的时间上限"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>DHCP 客户端超时</b></p>\n"
+"<p>该选项用于指定获取IP地址的时间上限，超过该时间限制应用程序将会认为连接已失"
+"败。</p>\n"
+"<p><i>提示：如果您在连接某个网络时遇到问题，可以尝试提高该时间限制。</i></p>"
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "DHCP 客户端超时:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "域名:"
+msgid "Specify how long to wait before scanning"
+msgstr "指定获取IP地址的时间上限"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "首次连接向导"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>DHCP 客户端超时</b></p>\n"
+"<p>该选项用于指定获取IP地址的时间上限，超过该时间限制应用程序将会认为连接已失"
+"败。</p>\n"
+"<p><i>提示：如果您在连接某个网络时遇到问题，可以尝试提高该时间限制。</i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>您可以按下该按钮以便显示所有曾经用 \"下次不再显示\" 选项关闭的信息。</i>"
+
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "显示所有信息"
 
-#: rc.cpp:493
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>显示所有信息</b></p>\n"
+"<p>点击该按钮将会显示所有曾经用 \"下次不再显示\" 选项关闭的信息。</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "连线对等加密（WEP）模式"
diff --git a/po/zh_TW/wlassistant.po b/po/zh_TW/wlassistant.po
index 9947ebc..29ab1ea 100644
--- a/po/zh_TW/wlassistant.po
+++ b/po/zh_TW/wlassistant.po
@@ -12,20 +12,70 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 02:31+0200\n"
+"POT-Creation-Date: 2018-12-29 19:38+0100\n"
 "PO-Revision-Date: 2005-12-15 16:24+0800\n"
 "Last-Translator: justin <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:103
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"_: 翻譯人員名單\n"
+"張福平"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"_: 翻譯人員EMAIL清單\n"
+"[email protected]"
+
+#: main.cpp:30 main.cpp:42 ui_main.ui:16
+#, no-c-format
+msgid "Wireless Assistant"
+msgstr "無線網路助手"
+
+#: netparams.h:76
+msgid ""
+"<qt><p>The network changed its security settings.</p><p>Please go to "
+"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
+"qt>"
+msgstr ""
+"<qt><p>該網路安全設定已變更。</p><p>請到以下對話方塊中的<i>安全</i>選項卡中配"
+"置WEP設定。</p></qt>"
+
+#: netparams.h:78
+msgid ""
+"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
+"tab of the following dialog and enter the required key.</p></qt>"
+msgstr ""
+"<qt><p>您的WEP加密鍵設定有問題。</p><p>請在以下對話方塊中的<i>安全</i>選項卡"
+"中匯入合適的加密鍵。</p></qt>"
+
+#: netparams.h:82
+msgid ""
+"<qt><p>The network has stopped broadcasting its ESSID since the last time "
+"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
+"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
+"you will be able to specify a different ESSID.</i></p></qt>"
+msgstr ""
+"<qt><p>自從上次您成功連線後該網路已停止廣播其延伸服務區標示符（ESSID）。</"
+"p><p>您希望使用<b>%1</b>作為該網路的ESSID嗎？</p><p><i>注意：如果您回答\"否"
+"\"，程式將會即現對話方塊讓您設定一個不同的ESSID。</i></p></qt>"
+
+#: wlassistant.cpp:103
 msgid "Initializing..."
 msgstr "正在起始..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:110
+#: wlassistant.cpp:110
 msgid ""
 "Kernel 2.6 or later not present.\n"
 "Wireless Assistant will now quit."
@@ -33,7 +83,7 @@ msgstr ""
 "Kernel2.6或更高版本不存在！\n"
 "無線網路助手將立即結束。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:156
+#: wlassistant.cpp:156
 msgid ""
 "No usable wireless devices found.\n"
 "Wireless Assistant will now quit."
@@ -41,7 +91,7 @@ msgstr ""
 "未發現任何無線裝置\n"
 "無線網路助手將立即結束。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:179
+#: wlassistant.cpp:179
 msgid ""
 "<qt><p>You might have insufficient permissions for Wireless Assistant to "
 "function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt>"
@@ -49,7 +99,7 @@ msgstr ""
 "<qt><p>您的權限不夠，可能無法正常執行無線網路助手的所有功能。</p><p>您是否執"
 "行了\"<tt>sudo</tt>\"指令</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:200
+#: wlassistant.cpp:200
 msgid ""
 "Executable(s) '%1' could not be found.\n"
 "Wireless Assistant will now quit."
@@ -57,7 +107,7 @@ msgstr ""
 "未發現任何可執行的 '%1'.\n"
 "無線網路助手將立即結束。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid ""
 "Connection to '%1' has been lost!\n"
 "Would you like to reconnect?"
@@ -65,50 +115,48 @@ msgstr ""
 " '%1' 的連線已斷開!\n"
 "您想要重新連線嗎?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:238
+#: wlassistant.cpp:238
 msgid "Connection Lost"
 msgstr "連線已斷開"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:252
+#: wlassistant.cpp:252
 msgid ""
 "<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would "
 "you like to continue?</p></qt>"
 msgstr "<qt><p> '<b>%1</b>' 網路設定將被移除，</p><p>您想要繼續嗎？</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:257
+#: wlassistant.cpp:257
 msgid "Settings deleted."
 msgstr "設定已移除！"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:285
+#: wlassistant.cpp:285
 msgid ""
 "<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) "
 "and/or domain are not set.</p></qt>"
 msgstr ""
 "<qt><p>檔案 '<i>%1</i>' 無法寫入</p><p>名字／域名伺服器設定失敗。</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:317
+#: wlassistant.cpp:317
 msgid "Bringing interface %1 up..."
 msgstr "啟動埠 %1..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:321
+#: wlassistant.cpp:321
 msgid "Waiting before scanning..."
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:328
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:334
+#: wlassistant.cpp:328 wlassistant.cpp:334
 msgid "Scanning..."
 msgstr "掃描..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:343
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:807
+#: wlassistant.cpp:343 wlassistant.cpp:806
 msgid "Done."
 msgstr "完成。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:348
+#: wlassistant.cpp:348
 msgid "No networks found."
 msgstr "未找到任何網路。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:351
+#: wlassistant.cpp:351
 #, fuzzy
 msgid ""
 "Radio of your wireless card seems to be turned off using an external switch "
@@ -118,22 +166,22 @@ msgstr ""
 "無線網卡已被電腦上的外部程式關閉。\n"
 "要使用無線網路您必須先唤醒該網卡。"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:459
+#: wlassistant.cpp:462
 msgid "Freq (Hz)"
 msgstr "頻率 (赫兹)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:473
+#: wlassistant.cpp:476
 msgid ""
 "Radio of your wireless card is off.\n"
 "Would you like to turn it on?"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:559
+#: wlassistant.cpp:562
 #, fuzzy
 msgid "Auto connection failed."
 msgstr "首次連線向導"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:570
+#: wlassistant.cpp:573
 msgid ""
 "<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are "
 "trying to connect to requires WPA authentication. The necessary executables "
@@ -141,44 +189,42 @@ msgid ""
 "<i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>"
 msgstr ""
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:579
+#: wlassistant.cpp:582
 msgid "%1 - First Connection Wizard"
 msgstr "%1 - 首次連線向導"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:616
+#: wlassistant.cpp:619
 msgid "Network settings updated."
 msgstr "網路設定已更新!"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:644
+#: wlassistant.cpp:647
 #, fuzzy
 msgid "Running pre-connection command..."
 msgstr "連線失敗."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:650
+#: wlassistant.cpp:653
 msgid "Connecting to '%1'..."
 msgstr "連線到 '%1'..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:669
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:685
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:718
+#: wlassistant.cpp:672 wlassistant.cpp:688 wlassistant.cpp:717
 #, fuzzy
 msgid "Connection failed."
 msgstr "連線已斷開"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:701
+#: wlassistant.cpp:700
 #, fuzzy
 msgid "Running post-connection command..."
 msgstr "首次連線向導"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:708
+#: wlassistant.cpp:707
 msgid "Testing connection..."
 msgstr "正在測試連線..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:714
+#: wlassistant.cpp:713
 msgid "Successfully connected to '%1'."
 msgstr "成功連線到 '%1'."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid ""
 "Connection failed.\n"
 "Would you like to review settings for this network?"
@@ -186,451 +232,345 @@ msgstr ""
 "連線失敗\n"
 "你希望檢查該網路設定嗎？"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:722
+#: wlassistant.cpp:721
 msgid "Review Settings?"
 msgstr "檢查設定?"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:761
+#: wlassistant.cpp:760
 msgid ""
 "<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to "
 "continue?<p></qt>"
 msgstr "<qt><p>您即將從網路 '<b>%1</b>'.斷開，</p><p>要繼續嗎？<p></qt>"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:766
+#: wlassistant.cpp:765
 #, fuzzy
 msgid "Running pre-disconnection command..."
 msgstr "連線失敗."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:772
+#: wlassistant.cpp:771
 msgid "Disconnecting..."
 msgstr "正在斷開網路..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:778
+#: wlassistant.cpp:777
 msgid "Waiting for DHCP client to shut down..."
 msgstr "等待DHCP用戶端關閉..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:801
+#: wlassistant.cpp:800
 #, fuzzy
 msgid "Running post-disconnection command..."
 msgstr "首次連線向導"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:810
+#: wlassistant.cpp:809
 msgid "Cancelled."
 msgstr "已取消"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:906
+#: wlassistant.cpp:905
 msgid "&Disconnect"
 msgstr "&斷開連線"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:908
+#: wlassistant.cpp:907
 msgid "Disconnect from the selected network"
 msgstr "斷開該網路"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:911
+#: wlassistant.cpp:910
 msgid "&Connect"
 msgstr "&連線"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:913 rc.cpp:39
+#: ui_main.ui:91 wlassistant.cpp:912
 #, no-c-format
 msgid "Connect to the selected network"
 msgstr "連線到選取網路"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:960
+#: wlassistant.cpp:959
 msgid "&Stop"
 msgstr "&停止"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:964
+#: wlassistant.cpp:963
 msgid ""
 "Terminate current process\n"
 "(%1)"
 msgstr "終止目前程式<br> (%1)"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:979 rc.cpp:26
+#: ui_main.ui:55 wlassistant.cpp:974
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: ui_main.ui:64 wlassistant.cpp:978
 #, no-c-format
 msgid "Quit the application"
 msgstr "結束應用程式o"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1038
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1047
+#: wlassistant.cpp:1037 wlassistant.cpp:1046
 msgid "Disconnect..."
 msgstr "正在斷開連線..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1041
+#: wlassistant.cpp:1040
 #, fuzzy
 msgid "Connect"
 msgstr "連線"
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1043
+#: wlassistant.cpp:1042
 msgid "Forget Settings..."
 msgstr "舍棄設定..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1044
+#: wlassistant.cpp:1043
 msgid "Edit Settings..."
 msgstr "編輯設定..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1050
+#: wlassistant.cpp:1049
 msgid "Configure and Connect..."
 msgstr "設定并連線..."
 
-#: /home/pn/Development/wlassistant/src/wlassistant.cpp:1063
+#: wlassistant.cpp:1062
 #, fuzzy
 msgid "%1 Settings"
 msgstr "%1 設定"
 
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"_: 翻譯人員名單\n"
-"張福平"
-
-#: /home/pn/Development/wlassistant/src/_translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"_: 翻譯人員EMAIL清單\n"
-"[email protected]"
-
-#: /home/pn/Development/wlassistant/src/main.cpp:30
-#: /home/pn/Development/wlassistant/src/main.cpp:42 rc.cpp:3
+#: ui_NetParamsEdit.ui:24
 #, no-c-format
-msgid "Wireless Assistant"
-msgstr "無線網路助手"
-
-#: /home/pn/Development/wlassistant/src/netparams.h:76
-msgid ""
-"<qt><p>The network changed its security settings.</p><p>Please go to "
-"<i>Security</i> tab of the following dialog and configure WEP settings.</p></"
-"qt>"
+msgid "Properties"
 msgstr ""
-"<qt><p>該網路安全設定已變更。</p><p>請到以下對話方塊中的<i>安全</i>選項卡中配"
-"置WEP設定。</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:78
-msgid ""
-"<qt><p>Your WEP Key is not set properly.</p><p>Please go to <i>Security</i> "
-"tab of the following dialog and enter the required key.</p></qt>"
+#: ui_NetParamsEdit.ui:58
+#, no-c-format
+msgid "&Help"
 msgstr ""
-"<qt><p>您的WEP加密鍵設定有問題。</p><p>請在以下對話方塊中的<i>安全</i>選項卡"
-"中匯入合適的加密鍵。</p></qt>"
 
-#: /home/pn/Development/wlassistant/src/netparams.h:82
-msgid ""
-"<qt><p>The network has stopped broadcasting its ESSID since the last time "
-"you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for "
-"this network?</p><p><i>NOTE: If you answer No, a dialog will appear where "
-"you will be able to specify a different ESSID.</i></p></qt>"
-msgstr ""
-"<qt><p>自從上次您成功連線後該網路已停止廣播其延伸服務區標示符（ESSID）。</"
-"p><p>您希望使用<b>%1</b>作為該網路的ESSID嗎？</p><p><i>注意：如果您回答\"否"
-"\"，程式將會即現對話方塊讓您設定一個不同的ESSID。</i></p></qt>"
+#: ui_NetParamsEdit.ui:61
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: rc.cpp:9
+#: ui_NetParamsEdit.ui:89
 #, no-c-format
-msgid "Alt+O"
+msgid "&OK"
 msgstr ""
 
-#: rc.cpp:12
-#, no-c-format
-msgid "Toggle network list/options"
-msgstr "網路正反器清單／選項"
+#: ui_NetParamsEdit.ui:106
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "已取消"
 
-#: rc.cpp:15
+#: ui_NetParamsEdit.ui:126
 #, no-c-format
-msgid ""
-"<p><b>Options Button</b></p>\n"
-"<p>Pressing this toggle button will show the available application options.</"
-"p>\n"
-"<p><i>HINT: Press this button again to return to the network list.</i></p>"
-msgstr ""
-"<p><b>選項</b></p>\n"
-"<p>點選該按鈕將察看所有可用選項.</p>\n"
-"<p><i>輔助說明：再次點選該按鈕將傳回到網路清單。</i></p>"
+msgid "I&nterface"
+msgstr "介面"
 
-#: rc.cpp:23
+#: ui_NetParamsEdit.ui:145 ui_NetParamsWizard.ui:60 ui_main.ui:270
 #, no-c-format
-msgid "Alt+Q"
-msgstr ""
+msgid "ESSID"
+msgstr "延伸服務區標示符（ESSID）"
 
-#: rc.cpp:29
+#: ui_NetParamsEdit.ui:156 ui_NetParamsWizard.ui:100
 #, no-c-format
-msgid ""
-"<p><b>Quit Button</b></p>\n"
-"<p>Pressing this button will quit the application.</p>"
-msgstr ""
-"<p><b>結束</b></p>\n"
-"<p>點選此按鈕將結束該程式</p>"
+msgid "ESSID:"
+msgstr "延伸服務區標示符（ESSID):"
 
-#: rc.cpp:33
+#: ui_NetParamsEdit.ui:179
 #, fuzzy, no-c-format
-msgid "Co&nnect"
-msgstr "連線"
+msgid "Configuration"
+msgstr "WEP配置"
 
-#: rc.cpp:36 rc.cpp:181
+#: ui_NetParamsEdit.ui:198 ui_NetParamsWizard.ui:237
 #, no-c-format
-msgid "Alt+N"
-msgstr ""
+msgid "Automatic (DHCP)"
+msgstr "自動抓取 (DHCP)"
 
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"<p><b>Connect/Disconnect Button</b></p>\n"
-"<p>Pressing this button will connect to/disconnect from the network "
-"currently selected in the network list.</p>"
-msgstr ""
-"<p><b>連線／斷開</b></p>\n"
-"<p>點選該按鈕將連線／斷開網路清單中被選取的網路。</p>"
+#: ui_NetParamsEdit.ui:206
+#, fuzzy, no-c-format
+msgid "&Manual"
+msgstr "手動設定"
 
-#: rc.cpp:46
+#: ui_NetParamsEdit.ui:235 ui_NetParamsWizard.ui:351
 #, no-c-format
-msgid "Refresh"
-msgstr "清除"
+msgid "Netmask:"
+msgstr "網路遮罩:"
 
-#: rc.cpp:50
+#: ui_NetParamsEdit.ui:253 ui_NetParamsWizard.ui:340
 #, no-c-format
-msgid "Refresh network list"
-msgstr "清除網路清單"
+msgid "IP:"
+msgstr "IP位址:"
 
-#: rc.cpp:53
+#: ui_NetParamsEdit.ui:261 ui_NetParamsWizard.ui:416
 #, no-c-format
-msgid ""
-"<p><b>Scan Button</b></p>\n"
-"<p>Pressing this button will scan for wireless networks and refresh the "
-"network list.</p>"
-msgstr ""
-"<p><b>掃描</b></p>\n"
-"<p>點選該按鈕將掃描所有可用無線網路并清除該網路清單。</p>"
+msgid "Broadcast:"
+msgstr "廣播位址:"
 
-#: rc.cpp:57
+#: ui_NetParamsEdit.ui:269 ui_NetParamsWizard.ui:381
 #, no-c-format
-msgid "Device:"
-msgstr "裝置:"
+msgid "Gateway:"
+msgstr "閘道:"
 
-#: rc.cpp:60
+#: ui_NetParamsEdit.ui:282 ui_NetParamsWizard.ui:405
 #, no-c-format
-msgid "Pick a network device to use"
-msgstr "請選取一個需要使用的網路裝置"
+msgid "Domain:"
+msgstr "域名:"
 
-#: rc.cpp:63
+#: ui_NetParamsEdit.ui:305 ui_NetParamsWizard.ui:313
 #, no-c-format
-msgid ""
-"<p><b>Device Selection</b></p>\n"
-"<p>This combo box allows you to select which wireless card to use.</p>\n"
-"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
-msgstr ""
-"<p><b>選取裝置</b></p>\n"
-"<p>您可以使用該選項卡來選取您希望使用的無綫網卡。</p>\n"
-"<p><i>注意：選取另一張無線網卡將會清除網路清單。</i></p>"
+msgid "Secondary DNS:"
+msgstr "次選DNS伺服器:"
 
-#: rc.cpp:68 rc.cpp:199 rc.cpp:325
+#: ui_NetParamsEdit.ui:313 ui_NetParamsWizard.ui:370
 #, no-c-format
-msgid "ESSID"
-msgstr "延伸服務區標示符（ESSID）"
+msgid "Primary DNS:"
+msgstr "偏好DNS伺服器:"
 
-#: rc.cpp:71
+#: ui_NetParamsEdit.ui:344
 #, no-c-format
-msgid "Channel"
-msgstr "頻道"
+msgid "Securit&y"
+msgstr "安全"
 
-#: rc.cpp:74
-#, no-c-format
-msgid "Link Quality"
-msgstr "連線品質"
+#: ui_NetParamsEdit.ui:372
+#, fuzzy, no-c-format
+msgid "WPA Settings"
+msgstr "%1 設定"
 
-#: rc.cpp:77
+#: ui_NetParamsEdit.ui:399 ui_NetParamsEdit.ui:524
 #, no-c-format
-msgid "WEP/WPA"
-msgstr ""
+msgid "Key:"
+msgstr "加密鍵:"
 
-#: rc.cpp:80
+#: ui_NetParamsEdit.ui:415 ui_NetParamsEdit.ui:540 ui_NetParamsWizard.ui:667
+#: ui_NetParamsWizard.ui:772
 #, no-c-format
-msgid "AP"
-msgstr "無線存取節點"
+msgid "ASCII"
+msgstr ""
 
-#: rc.cpp:83
+#: ui_NetParamsEdit.ui:441 ui_NetParamsWizard.ui:846
 #, no-c-format
 msgid ""
-"<p><b>Network List</b></p>\n"
-"<p>This list shows all the wireless networks that have been found.</p>\n"
-"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
+"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
 msgstr ""
-"<p><b>網路清單</b></p>\n"
-"<p>該清單察看了所有可用無線網路。</p>\n"
-"<p><i>輔助說明：點選 \"清除\"按鈕可更新該清單。</i></p>"
 
-#: rc.cpp:88
+#: ui_NetParamsEdit.ui:457 ui_NetParamsWizard.ui:830
 #, no-c-format
-msgid "Ready"
+msgid "<b>?<br>?<br>?<br>?</b>"
 msgstr ""
 
-#: rc.cpp:91
-#, no-c-format
-msgid ""
-"<p><b>Status Bar</b></p>\n"
-"<p>Messages describing current process are shown in this area.</p>"
-msgstr ""
-"<p><b>狀態欄</b></p>\n"
-"<p>該區域用來察看程式目前程式。</p>"
+#: ui_NetParamsEdit.ui:486
+#, fuzzy, no-c-format
+msgid "WEP Settings"
+msgstr "%1 設定"
 
-#: rc.cpp:95
-#, no-c-format
-msgid "Automatically connect on startup"
-msgstr ""
+#: ui_NetParamsEdit.ui:497
+#, fuzzy, no-c-format
+msgid "Open Syste&m"
+msgstr "開發系統"
 
-#: rc.cpp:99
+#: ui_NetParamsEdit.ui:500
 #, no-c-format
-msgid ""
-"<p><b>AutomaticallyConnect on Startup</b></p>\n"
-"<p>Checking this box will make the application try to connect to the best "
-"available network. Only networks that have been previously configured will "
-"be taken into account.</p>"
+msgid "Alt+M"
 msgstr ""
 
-#: rc.cpp:103
+#: ui_NetParamsEdit.ui:550
+#, fuzzy, no-c-format
+msgid "Shared &Key"
+msgstr "共用加密鍵"
+
+#: ui_NetParamsEdit.ui:553
 #, no-c-format
-msgid "Automaticall&y reconnect if connection is lost"
+msgid "Alt+K"
 msgstr ""
 
-#: rc.cpp:106
+#: ui_NetParamsEdit.ui:565
 #, no-c-format
-msgid "Alt+Y"
+msgid "Advanced"
 msgstr ""
 
-#: rc.cpp:109
-#, fuzzy, no-c-format
+#: ui_NetParamsEdit.ui:576
+#, no-c-format
 msgid ""
-"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
-"<p>Checking this box will make the application try to reconnect after the "
-"connection is lost.</p>"
+"<b>Security Warning:</b> the commands specified below will be ran with the "
+"same privileges as Wireless Assistant has."
 msgstr ""
-"<p><b>連線成功後結束</b></p>\n"
-"<p>選取該選項後，應用程式將在成功建立一個無線網路連線後結束。</p>"
 
-#: rc.cpp:113
-#, no-c-format
-msgid "Quit upon successful connection"
-msgstr "連線成功後結束"
+#: ui_NetParamsEdit.ui:584
+#, fuzzy, no-c-format
+msgid "Pre-Connection Command"
+msgstr "連線失敗."
 
-#: rc.cpp:117
+#: ui_NetParamsEdit.ui:620 ui_NetParamsEdit.ui:730 ui_NetParamsEdit.ui:840
+#: ui_NetParamsEdit.ui:950
 #, no-c-format
-msgid ""
-"<p><b>Quit Upon Successful Connection</b></p>\n"
-"<p>Checking this box will make the application close after successfully "
-"establishing a connection to a wireless network.</p>"
+msgid "Timeout:"
 msgstr ""
-"<p><b>連線成功後結束</b></p>\n"
-"<p>選取該選項後，應用程式將在成功建立一個無線網路連線後結束。</p>"
 
-#: rc.cpp:121
+#: ui_NetParamsEdit.ui:628 ui_NetParamsEdit.ui:738 ui_NetParamsEdit.ui:848
+#: ui_NetParamsEdit.ui:958 ui_main.ui:563 ui_main.ui:588
 #, no-c-format
-msgid "&Group access points with the same ESSID"
-msgstr ""
+msgid "s"
+msgstr "s"
 
-#: rc.cpp:124
+#: ui_NetParamsEdit.ui:640 ui_NetParamsEdit.ui:750 ui_NetParamsEdit.ui:860
+#: ui_NetParamsEdit.ui:970
 #, no-c-format
-msgid "Alt+G"
+msgid "Amount of time after which the process will be killed."
 msgstr ""
 
-#: rc.cpp:127
+#: ui_NetParamsEdit.ui:643 ui_NetParamsEdit.ui:753 ui_NetParamsEdit.ui:863
+#: ui_NetParamsEdit.ui:973
 #, no-c-format
 msgid ""
-"<p><b>Group Access Points with the Same ESSID</b></p>\n"
-"<p>Checking this box will make all access points with the same ESSID appear "
-"as one item in the network list.</p>"
+"<p><b>Timeout</b></p>\n"
+"<p>This option specifies how long should Wireless Assistant wait for the "
+"process to finish, before it will be killed.</p>"
 msgstr ""
 
-#: rc.cpp:131
+#: ui_NetParamsEdit.ui:652 ui_NetParamsEdit.ui:762 ui_NetParamsEdit.ui:872
+#: ui_NetParamsEdit.ui:982
 #, no-c-format
-msgid "Delay before scanning:"
+msgid "Run detached"
 msgstr ""
 
-#: rc.cpp:134 rc.cpp:145 rc.cpp:167
+#: ui_NetParamsEdit.ui:655 ui_NetParamsEdit.ui:765 ui_NetParamsEdit.ui:875
+#: ui_NetParamsEdit.ui:985
 #, no-c-format
-msgid "Specify how long to wait for an IP"
-msgstr "指定抓取IP位址的時間上限"
+msgid "Don't wait for the process to finish."
+msgstr ""
 
-#: rc.cpp:137 rc.cpp:148 rc.cpp:170
+#: ui_NetParamsEdit.ui:658 ui_NetParamsEdit.ui:768 ui_NetParamsEdit.ui:878
+#: ui_NetParamsEdit.ui:988
 #, no-c-format
 msgid ""
-"<p><b>DHCP Client Timeout</b></p>\n"
-"<p>This option specifies the amount of time after which the application "
-"should stop waiting for an IP address and assume that the connection has "
-"failed.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have problems connecting "
-"to some networks.</i></p>"
+"<p><b>Run Detached</b></p>\n"
+"<p>If this checkbox is selected Wireless Assistant will not wait for the "
+"process to finish.</p>"
 msgstr ""
-"<p><b>DHCP 用戶端逾時</b></p>\n"
-"<p>該選項用于指定抓取IP位址的時間上限，超過該時間限制應用程式將會認為連線已失"
-"敗。</p>\n"
-"<p><i>輔助說明：如果您在連線某個網路時遇到問題，可以嘗試提高該時間限制。</"
-"i></p>"
-
-#: rc.cpp:142
-#, no-c-format
-msgid "DHCP client timeout:"
-msgstr "DHCP 用戶端逾時:"
-
-#: rc.cpp:153 rc.cpp:164 rc.cpp:412 rc.cpp:441 rc.cpp:470 rc.cpp:499
-#, no-c-format
-msgid "s"
-msgstr "s"
 
-#: rc.cpp:156
+#: ui_NetParamsEdit.ui:677 ui_NetParamsEdit.ui:787 ui_NetParamsEdit.ui:897
+#: ui_NetParamsEdit.ui:1007
 #, fuzzy, no-c-format
-msgid "Specify how long to wait before scanning"
-msgstr "指定抓取IP位址的時間上限"
+msgid "Command:"
+msgstr "域名:"
 
-#: rc.cpp:159
+#: ui_NetParamsEdit.ui:694
 #, fuzzy, no-c-format
-msgid ""
-"<p><b>Delay Before Scanning</b></p>\n"
-"<p>This option specifies the amount of time to wait between bringing the "
-"interface up and performing a scan.</p>\n"
-"<p><i>HINT: Increasing this number can help if you have to refresh the list "
-"manually to see all the available networks.</i></p>"
-msgstr ""
-"<p><b>DHCP 用戶端逾時</b></p>\n"
-"<p>該選項用于指定抓取IP位址的時間上限，超過該時間限制應用程式將會認為連線已失"
-"敗。</p>\n"
-"<p><i>輔助說明：如果您在連線某個網路時遇到問題，可以嘗試提高該時間限制。</"
-"i></p>"
+msgid "Post-Connection Command"
+msgstr "首次連線向導"
 
-#: rc.cpp:175
+#: ui_NetParamsEdit.ui:804
 #, no-c-format
-msgid ""
-"<i>Press the button below to enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</i>"
+msgid "Pre-Disconnection Command"
 msgstr ""
-"<i>您可以按下該按鈕以便察看所有曾經用 \"下次不再察看\" 選項關閉的資訊。</i>"
 
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "E&nable All Messages"
-msgstr "察看所有資訊"
-
-#: rc.cpp:184
+#: ui_NetParamsEdit.ui:914
 #, no-c-format
-msgid ""
-"<p><b>Enable All Messages</b></p>\n"
-"<p>Pressing this button will enable all messages which have been turned off "
-"with the 'Don't Show Again' feature.</p>"
+msgid "Post-Disconnection Command"
 msgstr ""
-"<p><b>察看所有資訊</b></p>\n"
-"<p>點選該按鈕將會察看所有曾經用 \"下次不再察看\" 選項關閉的資訊。</p>"
 
-#: rc.cpp:188
+#: ui_NetParamsWizard.ui:16
 #, no-c-format
 msgid "First Connection Wizard"
 msgstr "首次連線向導"
 
-#: rc.cpp:191
+#: ui_NetParamsWizard.ui:34
 #, no-c-format
 msgid "Welcome to First Connection Wizard"
 msgstr "歡迎使用首次連線向導!"
 
-#: rc.cpp:194
+#: ui_NetParamsWizard.ui:45
 #, no-c-format
 msgid ""
 "<b><p>This is the first time you are trying to connect to the selected "
@@ -643,7 +583,7 @@ msgstr ""
 "<p>請您回答相關問題以便配置該網路。</p>\n"
 "<p><i>按 \"下一步\" 繼續。</i></p>"
 
-#: rc.cpp:202
+#: ui_NetParamsWizard.ui:74
 #, no-c-format
 msgid ""
 "<p><b>You are trying to connect to a network that does not broadcast its "
@@ -655,27 +595,17 @@ msgstr ""
 "<p>請指定您希望使用的延伸服務區標示符（ESSID）以便連線到該無線存取節點（AP）"
 "</p>"
 
-#: rc.cpp:206 rc.cpp:328
-#, no-c-format
-msgid "ESSID:"
-msgstr "延伸服務區標示符（ESSID):"
-
-#: rc.cpp:209
+#: ui_NetParamsWizard.ui:152
 #, no-c-format
 msgid "Interface Configuration"
 msgstr "介面設定"
 
-#: rc.cpp:213 rc.cpp:334
-#, no-c-format
-msgid "Automatic (DHCP)"
-msgstr "自動抓取 (DHCP)"
-
-#: rc.cpp:217
+#: ui_NetParamsWizard.ui:251
 #, no-c-format
 msgid "Manual"
 msgstr "手動設定"
 
-#: rc.cpp:221
+#: ui_NetParamsWizard.ui:264
 #, no-c-format
 msgid ""
 "<p><b>Your IP and other parameters need to be configured to connect to any "
@@ -686,47 +616,12 @@ msgstr ""
 "<p><b>在連線網路前，請先配置您的IP位址和其他相關引數。</b></p>\n"
 "<p>您希望使用哪個配置選項連線到該網路？</p>"
 
-#: rc.cpp:225
+#: ui_NetParamsWizard.ui:275
 #, no-c-format
 msgid "Interface Parameters"
 msgstr "介面引數"
 
-#: rc.cpp:228 rc.cpp:355
-#, no-c-format
-msgid "Secondary DNS:"
-msgstr "次選DNS伺服器:"
-
-#: rc.cpp:231 rc.cpp:343
-#, no-c-format
-msgid "IP:"
-msgstr "IP位址:"
-
-#: rc.cpp:234 rc.cpp:340
-#, no-c-format
-msgid "Netmask:"
-msgstr "網路遮罩:"
-
-#: rc.cpp:237 rc.cpp:358
-#, no-c-format
-msgid "Primary DNS:"
-msgstr "偏好DNS伺服器:"
-
-#: rc.cpp:240 rc.cpp:349
-#, no-c-format
-msgid "Gateway:"
-msgstr "閘道:"
-
-#: rc.cpp:243 rc.cpp:352
-#, no-c-format
-msgid "Domain:"
-msgstr "域名:"
-
-#: rc.cpp:246 rc.cpp:346
-#, no-c-format
-msgid "Broadcast:"
-msgstr "廣播位址:"
-
-#: rc.cpp:249
+#: ui_NetParamsWizard.ui:480
 #, no-c-format
 msgid ""
 "<p><b>Please specify interface parameters to be used to connect to this "
@@ -736,12 +631,12 @@ msgstr ""
 "<p><b>請指定連線到該網路的介面引數</b></p>\n"
 "<p>您可以將某些選項置空。</p>"
 
-#: rc.cpp:253
+#: ui_NetParamsWizard.ui:491
 #, no-c-format
 msgid "WEP Configuration"
 msgstr "WEP配置"
 
-#: rc.cpp:256
+#: ui_NetParamsWizard.ui:502
 #, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WEP authentication.</"
@@ -751,39 +646,34 @@ msgstr ""
 "<p><b>您希望連線的網路需要連線對等加密（WEP）授權</b></p>\n"
 "<p>您希望使用哪種連線對等加密（WEP）型態</p>"
 
-#: rc.cpp:261
+#: ui_NetParamsWizard.ui:528
 #, fuzzy, no-c-format
 msgid "Open S&ystem"
 msgstr "開發系統"
 
-#: rc.cpp:264
+#: ui_NetParamsWizard.ui:539
 #, no-c-format
 msgid "Shared Key"
 msgstr "共用加密鍵"
 
-#: rc.cpp:267 rc.cpp:288
+#: ui_NetParamsWizard.ui:583 ui_NetParamsWizard.ui:780
 #, fuzzy, no-c-format
 msgid "<p><b>Please provide a key to be used with this network.</b></p>"
 msgstr ""
 "<p><b>請提供一個連線到該網路的加密鍵。</b></p>\n"
 "可以使用任何iwconfig支援的格式。"
 
-#: rc.cpp:270
+#: ui_NetParamsWizard.ui:642
 #, no-c-format
 msgid "WEP key:"
 msgstr "WEP加密鍵"
 
-#: rc.cpp:273 rc.cpp:285 rc.cpp:370 rc.cpp:391
-#, no-c-format
-msgid "ASCII"
-msgstr ""
-
-#: rc.cpp:276
+#: ui_NetParamsWizard.ui:677
 #, fuzzy, no-c-format
 msgid "WPA Configuration"
 msgstr "WEP配置"
 
-#: rc.cpp:279
+#: ui_NetParamsWizard.ui:739
 #, fuzzy, no-c-format
 msgid ""
 "<p><b>The network you are trying to connect to requires WPA authentication.</"
@@ -792,28 +682,17 @@ msgstr ""
 "<p><b>您希望連線的網路需要連線對等加密（WEP）授權</b></p>\n"
 "<p>您希望使用哪種連線對等加密（WEP）型態</p>"
 
-#: rc.cpp:282
+#: ui_NetParamsWizard.ui:747
 #, fuzzy, no-c-format
 msgid "WPA Key:"
 msgstr "WEP加密鍵"
 
-#: rc.cpp:291 rc.cpp:376
-#, no-c-format
-msgid "<b>?<br>?<br>?<br>?</b>"
-msgstr ""
-
-#: rc.cpp:294 rc.cpp:373
-#, no-c-format
-msgid ""
-"WPA Version:<br>Group Cipher:<br>Pairwise Cipher:<br>Authentication Suite:"
-msgstr ""
-
-#: rc.cpp:297
+#: ui_NetParamsWizard.ui:856
 #, no-c-format
 msgid "Done!"
 msgstr "完成!"
 
-#: rc.cpp:300
+#: ui_NetParamsWizard.ui:867
 #, no-c-format
 msgid ""
 "<p><b>Congratulations!</b></p>\n"
@@ -824,133 +703,293 @@ msgstr ""
 "<p>您已成功完成該連線的配置！</p>\n"
 "<p><b>請點選\"完成\"按鈕連線該網路！</b></p>"
 
-#: rc.cpp:311
+#: ui_main.ui:33
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "&Options"
+msgstr ""
 
-#: rc.cpp:322
+#: ui_main.ui:36
 #, no-c-format
-msgid "I&nterface"
-msgstr "介面"
+msgid "Alt+O"
+msgstr ""
 
-#: rc.cpp:337
-#, fuzzy, no-c-format
-msgid "&Manual"
-msgstr "手動設定"
+#: ui_main.ui:42
+#, no-c-format
+msgid "Toggle network list/options"
+msgstr "網路正反器清單／選項"
 
-#: rc.cpp:361
+#: ui_main.ui:45
 #, no-c-format
-msgid "Securit&y"
-msgstr "安全"
+msgid ""
+"<p><b>Options Button</b></p>\n"
+"<p>Pressing this toggle button will show the available application options.</"
+"p>\n"
+"<p><i>HINT: Press this button again to return to the network list.</i></p>"
+msgstr ""
+"<p><b>選項</b></p>\n"
+"<p>點選該按鈕將察看所有可用選項.</p>\n"
+"<p><i>輔助說明：再次點選該按鈕將傳回到網路清單。</i></p>"
 
-#: rc.cpp:364
-#, fuzzy, no-c-format
-msgid "WPA Settings"
-msgstr "%1 設定"
+#: ui_main.ui:58
+#, no-c-format
+msgid "Alt+Q"
+msgstr ""
 
-#: rc.cpp:367 rc.cpp:388
+#: ui_main.ui:67
 #, no-c-format
-msgid "Key:"
-msgstr "加密鍵:"
+msgid ""
+"<p><b>Quit Button</b></p>\n"
+"<p>Pressing this button will quit the application.</p>"
+msgstr ""
+"<p><b>結束</b></p>\n"
+"<p>點選此按鈕將結束該程式</p>"
 
-#: rc.cpp:379
+#: ui_main.ui:85
 #, fuzzy, no-c-format
-msgid "WEP Settings"
-msgstr "%1 設定"
+msgid "Co&nnect"
+msgstr "連線"
 
-#: rc.cpp:382
-#, fuzzy, no-c-format
-msgid "Open Syste&m"
-msgstr "開發系統"
+#: ui_main.ui:88 ui_main.ui:697
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
 
-#: rc.cpp:385
+#: ui_main.ui:94
 #, no-c-format
-msgid "Alt+M"
+msgid ""
+"<p><b>Connect/Disconnect Button</b></p>\n"
+"<p>Pressing this button will connect to/disconnect from the network "
+"currently selected in the network list.</p>"
 msgstr ""
+"<p><b>連線／斷開</b></p>\n"
+"<p>點選該按鈕將連線／斷開網路清單中被選取的網路。</p>"
 
-#: rc.cpp:394
-#, fuzzy, no-c-format
-msgid "Shared &Key"
-msgstr "共用加密鍵"
+#: ui_main.ui:106
+#, no-c-format
+msgid "Refresh"
+msgstr "清除"
 
-#: rc.cpp:397
+#: ui_main.ui:115
 #, no-c-format
-msgid "Alt+K"
+msgid "Refresh network list"
+msgstr "清除網路清單"
+
+#: ui_main.ui:118
+#, no-c-format
+msgid ""
+"<p><b>Scan Button</b></p>\n"
+"<p>Pressing this button will scan for wireless networks and refresh the "
+"network list.</p>"
 msgstr ""
+"<p><b>掃描</b></p>\n"
+"<p>點選該按鈕將掃描所有可用無線網路并清除該網路清單。</p>"
 
-#: rc.cpp:400
+#: ui_main.ui:194
 #, no-c-format
-msgid "Advanced"
+msgid "Device:"
+msgstr "裝置:"
+
+#: ui_main.ui:219
+#, no-c-format
+msgid "Pick a network device to use"
+msgstr "請選取一個需要使用的網路裝置"
+
+#: ui_main.ui:222
+#, no-c-format
+msgid ""
+"<p><b>Device Selection</b></p>\n"
+"<p>This combo box allows you to select which wireless card to use.</p>\n"
+"<p><i>NOTE: Selecting a different card will refresh the network list.</i></p>"
 msgstr ""
+"<p><b>選取裝置</b></p>\n"
+"<p>您可以使用該選項卡來選取您希望使用的無綫網卡。</p>\n"
+"<p><i>注意：選取另一張無線網卡將會清除網路清單。</i></p>"
+
+#: ui_main.ui:281
+#, no-c-format
+msgid "Channel"
+msgstr "頻道"
+
+#: ui_main.ui:292
+#, no-c-format
+msgid "Link Quality"
+msgstr "連線品質"
+
+#: ui_main.ui:303
+#, no-c-format
+msgid "WEP/WPA"
+msgstr ""
+
+#: ui_main.ui:314
+#, no-c-format
+msgid "AP"
+msgstr "無線存取節點"
 
-#: rc.cpp:403
+#: ui_main.ui:336
 #, no-c-format
 msgid ""
-"<b>Security Warning:</b> the commands specified below will be ran with the "
-"same privileges as Wireless Assistant has."
+"<p><b>Network List</b></p>\n"
+"<p>This list shows all the wireless networks that have been found.</p>\n"
+"<p><i>HINT: Click the Refresh button to update this list.</i></p>"
 msgstr ""
+"<p><b>網路清單</b></p>\n"
+"<p>該清單察看了所有可用無線網路。</p>\n"
+"<p><i>輔助說明：點選 \"清除\"按鈕可更新該清單。</i></p>"
 
-#: rc.cpp:406
-#, fuzzy, no-c-format
-msgid "Pre-Connection Command"
-msgstr "連線失敗."
+#: ui_main.ui:363
+#, no-c-format
+msgid "Ready"
+msgstr ""
 
-#: rc.cpp:409 rc.cpp:438 rc.cpp:467 rc.cpp:496
+#: ui_main.ui:369
 #, no-c-format
-msgid "Timeout:"
+msgid ""
+"<p><b>Status Bar</b></p>\n"
+"<p>Messages describing current process are shown in this area.</p>"
 msgstr ""
+"<p><b>狀態欄</b></p>\n"
+"<p>該區域用來察看程式目前程式。</p>"
 
-#: rc.cpp:415 rc.cpp:444 rc.cpp:473 rc.cpp:502
+#: ui_main.ui:399
 #, no-c-format
-msgid "Amount of time after which the process will be killed."
+msgid "Automatically connect on startup"
 msgstr ""
 
-#: rc.cpp:418 rc.cpp:447 rc.cpp:476 rc.cpp:505
+#: ui_main.ui:405
 #, no-c-format
 msgid ""
-"<p><b>Timeout</b></p>\n"
-"<p>This option specifies how long should Wireless Assistant wait for the "
-"process to finish, before it will be killed.</p>"
+"<p><b>AutomaticallyConnect on Startup</b></p>\n"
+"<p>Checking this box will make the application try to connect to the best "
+"available network. Only networks that have been previously configured will "
+"be taken into account.</p>"
 msgstr ""
 
-#: rc.cpp:422 rc.cpp:451 rc.cpp:480 rc.cpp:509
+#: ui_main.ui:414
 #, no-c-format
-msgid "Run detached"
+msgid "Automaticall&y reconnect if connection is lost"
 msgstr ""
 
-#: rc.cpp:425 rc.cpp:454 rc.cpp:483 rc.cpp:512
+#: ui_main.ui:417
 #, no-c-format
-msgid "Don't wait for the process to finish."
+msgid "Alt+Y"
+msgstr ""
+
+#: ui_main.ui:420
+#, fuzzy, no-c-format
+msgid ""
+"<p><b>Automatically Reconnect if Connection is Lost</b></p>\n"
+"<p>Checking this box will make the application try to reconnect after the "
+"connection is lost.</p>"
 msgstr ""
+"<p><b>連線成功後結束</b></p>\n"
+"<p>選取該選項後，應用程式將在成功建立一個無線網路連線後結束。</p>"
 
-#: rc.cpp:428 rc.cpp:457 rc.cpp:486 rc.cpp:515
+#: ui_main.ui:429
+#, no-c-format
+msgid "Quit upon successful connection"
+msgstr "連線成功後結束"
+
+#: ui_main.ui:435
 #, no-c-format
 msgid ""
-"<p><b>Run Detached</b></p>\n"
-"<p>If this checkbox is selected Wireless Assistant will not wait for the "
-"process to finish.</p>"
+"<p><b>Quit Upon Successful Connection</b></p>\n"
+"<p>Checking this box will make the application close after successfully "
+"establishing a connection to a wireless network.</p>"
+msgstr ""
+"<p><b>連線成功後結束</b></p>\n"
+"<p>選取該選項後，應用程式將在成功建立一個無線網路連線後結束。</p>"
+
+#: ui_main.ui:444
+#, no-c-format
+msgid "&Group access points with the same ESSID"
+msgstr ""
+
+#: ui_main.ui:447
+#, no-c-format
+msgid "Alt+G"
+msgstr ""
+
+#: ui_main.ui:450
+#, no-c-format
+msgid ""
+"<p><b>Group Access Points with the Same ESSID</b></p>\n"
+"<p>Checking this box will make all access points with the same ESSID appear "
+"as one item in the network list.</p>"
+msgstr ""
+
+#: ui_main.ui:477
+#, no-c-format
+msgid "Delay before scanning:"
 msgstr ""
 
-#: rc.cpp:432 rc.cpp:461 rc.cpp:490 rc.cpp:519
+#: ui_main.ui:480 ui_main.ui:496 ui_main.ui:600
+#, no-c-format
+msgid "Specify how long to wait for an IP"
+msgstr "指定抓取IP位址的時間上限"
+
+#: ui_main.ui:483 ui_main.ui:499 ui_main.ui:603
+#, no-c-format
+msgid ""
+"<p><b>DHCP Client Timeout</b></p>\n"
+"<p>This option specifies the amount of time after which the application "
+"should stop waiting for an IP address and assume that the connection has "
+"failed.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have problems connecting "
+"to some networks.</i></p>"
+msgstr ""
+"<p><b>DHCP 用戶端逾時</b></p>\n"
+"<p>該選項用于指定抓取IP位址的時間上限，超過該時間限制應用程式將會認為連線已失"
+"敗。</p>\n"
+"<p><i>輔助說明：如果您在連線某個網路時遇到問題，可以嘗試提高該時間限制。</"
+"i></p>"
+
+#: ui_main.ui:493
+#, no-c-format
+msgid "DHCP client timeout:"
+msgstr "DHCP 用戶端逾時:"
+
+#: ui_main.ui:575
 #, fuzzy, no-c-format
-msgid "Command:"
-msgstr "域名:"
+msgid "Specify how long to wait before scanning"
+msgstr "指定抓取IP位址的時間上限"
 
-#: rc.cpp:435
+#: ui_main.ui:578
 #, fuzzy, no-c-format
-msgid "Post-Connection Command"
-msgstr "首次連線向導"
+msgid ""
+"<p><b>Delay Before Scanning</b></p>\n"
+"<p>This option specifies the amount of time to wait between bringing the "
+"interface up and performing a scan.</p>\n"
+"<p><i>HINT: Increasing this number can help if you have to refresh the list "
+"manually to see all the available networks.</i></p>"
+msgstr ""
+"<p><b>DHCP 用戶端逾時</b></p>\n"
+"<p>該選項用于指定抓取IP位址的時間上限，超過該時間限制應用程式將會認為連線已失"
+"敗。</p>\n"
+"<p><i>輔助說明：如果您在連線某個網路時遇到問題，可以嘗試提高該時間限制。</"
+"i></p>"
 
-#: rc.cpp:464
+#: ui_main.ui:661
 #, no-c-format
-msgid "Pre-Disconnection Command"
+msgid ""
+"<i>Press the button below to enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</i>"
 msgstr ""
+"<i>您可以按下該按鈕以便察看所有曾經用 \"下次不再察看\" 選項關閉的資訊。</i>"
 
-#: rc.cpp:493
+#: ui_main.ui:694
+#, fuzzy, no-c-format
+msgid "E&nable All Messages"
+msgstr "察看所有資訊"
+
+#: ui_main.ui:700
 #, no-c-format
-msgid "Post-Disconnection Command"
+msgid ""
+"<p><b>Enable All Messages</b></p>\n"
+"<p>Pressing this button will enable all messages which have been turned off "
+"with the 'Don't Show Again' feature.</p>"
 msgstr ""
+"<p><b>察看所有資訊</b></p>\n"
+"<p>點選該按鈕將會察看所有曾經用 \"下次不再察看\" 選項關閉的資訊。</p>"
 
 #~ msgid "WEP Mode"
 #~ msgstr "連線對等加密（WEP）型態"