Update translation files

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

(cherry picked from commit 58612ab0486bd53599443d5e7b558236b0edf622)

61 files changed, 16127 insertions, 18798 deletions

diff --git a/tde-i18n-af/messages/tdepim/kandy.po b/tde-i18n-af/messages/tdepim/kandy.po
index 0592f6b515d..39d2a8ad49f 100644
--- a/tde-i18n-af/messages/tdepim/kandy.po
+++ b/tde-i18n-af/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2002-11-07 11:37+0200\n"
 "Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -14,716 +14,655 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "WEB-Vertaler (http://kde.af.org.za)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "frix@expertron.co.za"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nuwe Opdrag"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 #, fuzzy
 msgid "Enter parameter name:"
 msgstr "Invoer parameter naam"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem Fout"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Geontkoppel "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Kon nie las lêer %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "Kon nie las lêer %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobiele Gui"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Konnekteer"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Ontkoppel"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nuwe Profiel"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Stoor verander na profiel %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Kan nie open modem toestel %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem Fout"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Verbind "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Reeksnommer Koppelvlak"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Kde adres boek:"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Vensters"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Naam"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Opdrag"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Voeg by..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Redigeer..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Uitvoer"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Invoer:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Uitset:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultaat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 #, fuzzy
 msgid "Enter value for %1:"
 msgstr "Invoer Waarde vir %1"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikeer met jou mobiele foon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Vertoon terminaal venster."
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Vertoon mobiele Gui."
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "Moet nie vertoon Gui."
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Lêernaam van opdrag profiel lêer."
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem is af."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem is besig."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Lees mobiele telefoonboek..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Om te skryf mobiele telefoonboek..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Geskryf mobiele telefoonboek."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Lees Kde adres boek."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Lees Kde adres boek."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Geskryf Kde adres boek"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Lees mobiele telefoonboek."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab Inskrywing:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobiele Inskrywing:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Botsende Inskrywings"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 #, fuzzy
 msgid "Use Kab Entry"
 msgstr "Gebruik Kab inskrywing"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 #, fuzzy
 msgid "Use Mobile Entry"
 msgstr "Gebruik Mobiele inskrywing"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Gesinkroniseer telefoonboeke."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, fuzzy, no-c-format
 msgid "TDE Address Book"
 msgstr "Kde adres boek:"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "Kde adres boek:"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, fuzzy, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Mobiele foon boek:"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Mobiele foon boek:"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminaal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "Vertoon"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Opdrag Eienskappe"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Naam:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "String:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex resultaat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posisie"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Waarde"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobiele Toestel"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Model Informasie"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Reeksnommer nommer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Vervaardiger:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Gsm weergawe:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "Address Books"
-msgstr "Kde adres boek:"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Foon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lees"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skryf"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Save to File..."
-msgstr "Stoor na Lêer..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sinkronisasie"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batery laai:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Sein kwaliteit:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Verfris"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, fuzzy, no-c-format
 msgid "Serial device"
 msgstr "Reeksnommer toestel:"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Open modem op opstart"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Gebruik Mobiele inskrywing"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Modem is af."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Open terminaal venster op opstart"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Open mobiele venster op opstart"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "Vertoon"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobiele Toestel"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Model Informasie"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Reeksnommer nommer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Vervaardiger:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Gsm weergawe:"
+
+#: src/mobilegui_base.ui:145
+#, fuzzy, no-c-format
+msgid "Address Books"
+msgstr "Kde adres boek:"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Foon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lees"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skryf"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Stoor na Lêer..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinkronisasie"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batery laai:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Sein kwaliteit:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Verfris"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
 #~ msgid "&Modem"
 #~ msgstr "Modem"
 
diff --git a/tde-i18n-ar/messages/tdepim/kandy.po b/tde-i18n-ar/messages/tdepim/kandy.po
index ea9dac5b507..34d176d126c 100644
--- a/tde-i18n-ar/messages/tdepim/kandy.po
+++ b/tde-i18n-ar/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-01-21 12:48+0200\n"
 "Last-Translator: abd el rahman Ghareeb <king_abdo@yahoo.com>\n"
 "Language-Team: arabic <support@arabeyes.org>\n"
@@ -15,713 +15,652 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Isam Bayazidi,عبدالرحمن عبدالخالق غريب"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "bayazidi@arabeyes.org,king_abdo@yahoo.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "أمر جديد"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr ""
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr ""
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "خطأ في المودم"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "قطع الاتصال"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "لم يتمكن من تحميل الملف %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "لم يتمكن من حفظ الملف %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "واجهة النقال الرسومية"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "اتصال"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "قطع الاتصال"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "سجل بيانات جديد"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "حفظ التغييرات لسجل البيانات %1 ؟"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "لم يتمكن من فتح أداة المودم %1 ."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "خطأ في المودم"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "متصل"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 #, fuzzy
 msgid "Serial Interface"
 msgstr "واجهة التسلسل"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "دفاتر العناوين"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "نوافذ"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "اسم"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "أمر"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 #, fuzzy
 msgid "Hex"
 msgstr "سادس عشري"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "اضافة..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "تحرير"
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "تنفيذ"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "ادخال:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr ""
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "نتيجة:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "ادخل قيمة لـ%1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "تم الاتصال بهاتفك النقال"
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "أظهر نافذة الأوامر"
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "أظهر واجهة النقال الرسومية"
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "لا تظهر الواجهة الرسومية"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "المودم مقفل."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "المودم مشغول."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr ""
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "يتم قراءة دفتر الهاتف الخاص بالهاتف النقال..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "يتم كتابة دفتر الهاتف الخاص بالهاتف النقال..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "تم كتابة دفتر الهاتف "
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "قراءة دفتر عناوين TDE"
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "قراءة دفتر عناوين TDE"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "تم كتابة دفتر عناوين TDE"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "قراءة دفتر الهاتف الخاص بالهاتف النقال"
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "مدخل الهاتف النقال:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "دفتر عناوين TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "دفتر عناوين TDE"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "دفتر الهاتف الخاص بالهاتف النقال"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "دفتر الهاتف الخاص بالهاتف النقال"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr ""
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "لم يتم فتح الأداة '%1'. برجاء التأكد من حصولك على الترخيص المناسب."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "فشل tcsetattr()"
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&عرض"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "خصائص الأمر"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "الإسم:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, fuzzy, no-c-format
 msgid "Position"
 msgstr "الموقع"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, fuzzy, no-c-format
 msgid "Parameter"
 msgstr "المعامل"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "قيمة"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "أداة هاتف نقال"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Model Information"
-msgstr "معلومات النوع"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "النوع:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "الرقم التسلسلي:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "المصنع:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "GSM version:"
-msgstr "نسخة GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "دفاتر العناوين"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "الهاتف"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "اقرأ"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "اكتب"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "حفظ بملف..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "الحالة"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "شحن البطارية:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "جودة الإشارة:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, fuzzy, no-c-format
-msgid "Refresh"
-msgstr "اعادة تحميل"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
-#, no-c-format
-msgid "Set Clock"
-msgstr ""
-
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, fuzzy, no-c-format
 msgid "Serial device"
 msgstr "الرقم التسلسلي:"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "فتح المودم عند البدأ"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "المودم مقفل."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "فتح نافذة الأوامر عند البدأ"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "فتح نافذة النقال عند البدأ"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&عرض"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "أداة هاتف نقال"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "معلومات النوع"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "النوع:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "الرقم التسلسلي:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr ""
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "المصنع:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "نسخة GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "دفاتر العناوين"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "الهاتف"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "اقرأ"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "اكتب"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "حفظ بملف..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr ""
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "الحالة"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "شحن البطارية:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "جودة الإشارة:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr ""
+
+#: src/mobilegui_base.ui:472
+#, fuzzy, no-c-format
+msgid "Refresh"
+msgstr "اعادة تحميل"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "فشل tcgetattr()"
 
diff --git a/tde-i18n-az/messages/tdepim/kandy.po b/tde-i18n-az/messages/tdepim/kandy.po
index 099619eb83b..01306e295ff 100644
--- a/tde-i18n-az/messages/tdepim/kandy.po
+++ b/tde-i18n-az/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-03-18 00:24+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -15,716 +15,655 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Vasif İsmayıloğlu MD,Mətin Əmirov"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "azerb_linux@hotmail.com,metin@karegen.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Yeni Əmr"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arq %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parametr adı girin:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem Xətası"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Bağlantı Qopdu "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 faylı yüklənə bilmir"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "%1 faylı qeyd edilə bilmir."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobil GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Bağlan"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Bağlantını Kəs"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Yeni Profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Dəyişikliklər %1 profilinə qeyd edilsin?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "%1 modem avadanlığl açıla bilmir."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem Xətası"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Bağlan "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serial Ara Üz"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Ünvan dəftərləri"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Pəncərələr"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ad"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Əmr"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "On altılıq"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Əlavə Et..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Düzəlt..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "İcra Et"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Giriş:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Yekun:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Nəticə:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1 üçün qiyməti gir:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Cib telefonunuz ilə əlaqə qurulur."
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Terminal pəncərəni göstər"
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Mobil GUI göstər."
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "GUİ göstərmə."
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Fayl ya da əmr profili adı."
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem bağlıdır."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem məşğuldur."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Cib telefonu telefon dəftəri oxunur..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Cib telefonu telefon dəftəri yazılır..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Cib telefonu telefon dəftəri yazıldı."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "TDE ünvan dəftərini oxu."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE ünvan dəftərini oxu."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "TDE ünvan dəftərini yaz."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Cib telefonu telefon dəftərinı oxu."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 #, fuzzy
 msgid "Kab Entry:"
 msgstr "Kab girişi işlət"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 #, fuzzy
 msgid "Mobile Entry:"
 msgstr "Mobil giriş işlət"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Toqquşan Girişlər"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 #, fuzzy
 msgid "Use Kab Entry"
 msgstr "Kab girişi işlət"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 #, fuzzy
 msgid "Use Mobile Entry"
 msgstr "Mobil giriş işlət"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Sinxron telefon dəftələri."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, fuzzy, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE Ünvan Dəftəri"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "TDE Ünvan Dəftəri"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, fuzzy, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Cib Telefonu Dəftəri"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Cib Telefonu Dəftəri"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Göstər"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Əmr Seçənəkləri"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ad:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Kəlmə:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, fuzzy, no-c-format
 msgid "Hex result"
 msgstr "On altılıq Yekun"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Yer"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametr"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Qiymət"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobil Avadanlıq"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Model Mə'lumatı"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, fuzzy, no-c-format
-msgid "Serial number:"
-msgstr "Serial nömrə:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "E'malatçı:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM buraxılışı:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "Address Books"
-msgstr "Ünvan dəftərləri"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Oxu"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Yaz"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Save to File..."
-msgstr "Fayla qeyd et"
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Sync"
-msgstr "Sinxronlaşdır"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Vəziyyət"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, fuzzy, no-c-format
-msgid "Battery charge:"
-msgstr "Batareya Doldurulması:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, fuzzy, no-c-format
-msgid "Signal quality:"
-msgstr "Siqnal Keyfiyyəti:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Yenilə"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, fuzzy, no-c-format
 msgid "Serial device"
 msgstr "Serial Avadanlıq"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, fuzzy, no-c-format
 msgid "Open modem on startup"
 msgstr "Başlanğıcda Modemi Aç"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Mobil giriş işlət"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Modem bağlıdır."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, fuzzy, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Başlanğıcda Terminal Pəncərəsi Aç"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, fuzzy, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Başlanğıcda Mobil Pəncərə Aç"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Göstər"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobil Avadanlıq"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Model Mə'lumatı"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, fuzzy, no-c-format
+msgid "Serial number:"
+msgstr "Serial nömrə:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "E'malatçı:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM buraxılışı:"
+
+#: src/mobilegui_base.ui:145
+#, fuzzy, no-c-format
+msgid "Address Books"
+msgstr "Ünvan dəftərləri"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Oxu"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Yaz"
+
+#: src/mobilegui_base.ui:276
+#, fuzzy, no-c-format
+msgid "Save to File..."
+msgstr "Fayla qeyd et"
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinxronlaşdır"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Vəziyyət"
+
+#: src/mobilegui_base.ui:405
+#, fuzzy, no-c-format
+msgid "Battery charge:"
+msgstr "Batareya Doldurulması:"
+
+#: src/mobilegui_base.ui:413
+#, fuzzy, no-c-format
+msgid "Signal quality:"
+msgstr "Siqnal Keyfiyyəti:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Yenilə"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
 #~ msgid "&Modem"
 #~ msgstr "&Modem"
 
diff --git a/tde-i18n-be/messages/tdepim/kandy.po b/tde-i18n-be/messages/tdepim/kandy.po
index 75b4bdccdcf..669c1882c4a 100644
--- a/tde-i18n-be/messages/tdepim/kandy.po
+++ b/tde-i18n-be/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-08-01 12:00GMT\n"
 "Last-Translator: Eugene Zelenko <greendeath@mail.ru>\n"
 "Language-Team: Belarusian <kde-i18n-be@kde.org>\n"
@@ -15,709 +15,647 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Eugene Zelenko"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "greendeath@mail.ru"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Новая каманда"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Аргумэнт %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Увядзіце імя парамэтру:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+msgid "Error"
+msgstr ""
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr ""
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Немагчыма загрузіць файл %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Немагчыма захаваць файл %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr ""
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr ""
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Новы профіль"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Захаваць зьмяненьні ў профілі %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr ""
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr ""
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr ""
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Пасьлядоўны інтэрфэйс"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Адрасныя кнігі"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Вокны"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Імя"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Каманда"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr ""
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Дадаць..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Рэдагаваць..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Выканаць"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr ""
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr ""
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Вынік:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Увядзіце значэньне для %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr ""
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Паказваць акно тэрміналу"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Імя файла профілю камандаў"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr ""
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr ""
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Чытаньне тэлефоннай кнігі мабільнага тэлефона..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Запіс тэлефоннай кнігі мабільнага тэлефона..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Тэлефонная кніга мабільнага тэлефона запісаная."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Адрасная кніга TDE прачытаная."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Адрасная кніга TDE прачытаная."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Адрасная кніга TDE запісаная"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Тэлефонная кніга мабільнага тэлефона прачытаная."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Запіс Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Запіс мабільнага тэлефона:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Канфліктуючыя запісы"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Выкарыстоўваць запіс Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Выкарыстоўваць запіс мабільнага тэлефона"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Тэлефонныя кнігі сынхранізаваныя."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Адрасная кніга TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "Адрасная кніга TDE"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Тэлефонная кніга мабільнага тэлефона"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Тэлефонная кніга мабільнага тэлефона"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Тэрмінал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Паказаць"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Уласьцівасьці каманды"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Імя:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Радок:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Пазыцыя"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Парамэтар"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Значэньне"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Мабільная прылада"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Інфармацыя аб мадэлі"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Мадэль:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Сэрыйны нумар:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Вытворца:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "GSM version:"
-msgstr "Вэрсія GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адрасныя кнігі"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Тэлефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Прачытаць"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Запісаць"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Захаваць у файл..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Сынхранізаваць"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Статус"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Якасьць сыгналу:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Абнавіць"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Пасьлядоўная прылада"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Выкарыстоўваць запіс мабільнага тэлефона"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr ""
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Паказаць"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Мабільная прылада"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Інфармацыя аб мадэлі"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Мадэль:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Сэрыйны нумар:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Вытворца:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Вэрсія GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адрасныя кнігі"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Тэлефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Прачытаць"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Запісаць"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Захаваць у файл..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Сынхранізаваць"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Статус"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr ""
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Якасьць сыгналу:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Абнавіць"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
 #~ msgid "&Modem"
 #~ msgstr "&Мадэм"
 
diff --git a/tde-i18n-bg/messages/tdepim/kandy.po b/tde-i18n-bg/messages/tdepim/kandy.po
index bf395d04240..910697537fb 100644
--- a/tde-i18n-bg/messages/tdepim/kandy.po
+++ b/tde-i18n-bg/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-03-19 11:51+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -18,704 +18,664 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Радостин Раднев"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "radnev@yahoo.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Нова команда"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Параметър %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Въведете името на параметъра:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Грешка в модема"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Без връзка "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Грешка при зареждане на файла %1."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Грешка при запис на файла %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Графичен интерфейс"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Връзка"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Разкачване"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Нов профил"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Запис на промените в профила %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Грешка при отваряне на модемното устройство %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Грешка в модема"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Връзка "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Устройство"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Адресник"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Прозорци"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Име"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Команда"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Шестнадесетичен"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Добавяне..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Редактиране..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Стартиране"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Вход:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Изход:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Резултат:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Въведете стойност за %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Графичен интерфейс за връзка с мобилен телефон"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Показване на терминален прозорец"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Показване на графичния интерфейс"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Без показване на графичния интерфейс"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Файл-профил с команди за зареждане"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модемът е изключен."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модемът е зает."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Четене на адресника от мобилния телефон..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Запис в адресника от мобилния телефон..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Адресникът на мобилния телефон е записан."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Четене на адресника на TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Адресникът на TDE е прочетен."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Адресникът на TDE е записан."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Адресникът на мобилния телефон е прочетен."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Запис в адресника на TDE:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Запис в адресника на телефона:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Конфликтни записи"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Използване от адресника на TDE"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Използване от адресника на телефона"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Адресниците са синхронизирани."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Адресник на TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Адресник на TDE (променен)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Адресникът на TDE е променен."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Незаписани промени"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Адресник на телефона"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Адресник на телефона (променен)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Адресникът на телефона съдържа незаписани промени."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминален прозорец"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Грешка при отваряне на устройството \"%1\". Моля, проверете дали имате "
 "необходимите права."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Установяването на връзката се разпадна (код tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Грешка при tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Невъзможно заключване на устройството \"%1\"."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Грешка при отваряне на файла за заключване \"%1\"."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Грешка при четене от файла за заключване \"%1\"."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Грешка при определяне на номера на процеса (PID) от файла \"%1\"."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Процесът с номер (PID) %1, който е заключил устройството, все още работи."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Грешка при изпращане на сигнал до процеса на съществуващия файл за заключване."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Грешка при създаване на файл за заключване \"%1\". Моля, проверете дали имате "
-"необходимите права."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Показване"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Настройки на команда"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Име:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Низ:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Шестнадесетичен резултат"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Позиция"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметър"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Стойност"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Мобилно устройство"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Информация за модела"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Модел:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Сериен номер:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Производител:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Версия на GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адресници"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Зареждане"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Запис"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Запис във файл..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Синхронизиране"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Състояние"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Зареждане на батерията:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Качество на сигнала:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Обновяване"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Нагласяване на часа"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Серийно устройство"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Скорост"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Директория за заключване"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Отваряне на модема при стартиране"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Автоматично нагласяне на часовника на телефона при връзка"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Изключване на номерата на домашните телефони"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Изключване на номерата на служебните телефони"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Изключване на номерата за съобщения"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Изключване на факс номерата"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Изключване на номерата на мобилни телефони"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Изключване на номерата на видео телефони"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Изключване на номерата на е-поща"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Изключване на номерата на модеми"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Изключване на номерата на автомобилни телефони"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Изключване на номерата на ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Изключване на номерата на пейджъри"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Използване на наставката за домашни номера"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Използване на наставката за служебни номера"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Използване на наставката за номера на съобщения"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Използване на наставката за факс номера"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Използване на наставката за мобилни телефони"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Използване на наставката за видео телефони"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Използване на наставката за е-поща"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Използване на наставката за модеми"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Използване на наставката за автомобилни телефони"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Използване на наставката за ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Използване на наставката за пейджъри"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Наставка за домашни номера"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Наставка за служебни номера"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Наставка за съобщения"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Наставка за факс номера"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Наставка за мобилни телефони"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Наставка за видео телефони"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Наставка за е-поща"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Наставка за модеми"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Наставка за автомобилни телефони"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Наставка за ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Наставка за пейджъри"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Отваряне на терминалния прозорец при стартиране"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Отваряне на графичния интерфейс при стартиране"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Показване"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Мобилно устройство"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Информация за модела"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Модел:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Сериен номер:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Производител:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Версия на GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адресници"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Зареждане"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Запис"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Запис във файл..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Синхронизиране"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Състояние"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Зареждане на батерията:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Качество на сигнала:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Обновяване"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Нагласяване на часа"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Грешка при отваряне на файла за заключване \"%1\"."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Грешка при четене от файла за заключване \"%1\"."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Грешка при определяне на номера на процеса (PID) от файла \"%1\"."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Процесът с номер (PID) %1, който е заключил устройството, все още работи."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Грешка при изпращане на сигнал до процеса на съществуващия файл за "
+#~ "заключване."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Грешка при създаване на файл за заключване \"%1\". Моля, проверете дали "
+#~ "имате необходимите права."
diff --git a/tde-i18n-br/messages/tdepim/kandy.po b/tde-i18n-br/messages/tdepim/kandy.po
index b0a5f3cf3d6..7f33f3208d0 100644
--- a/tde-i18n-br/messages/tdepim/kandy.po
+++ b/tde-i18n-br/messages/tdepim/kandy.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kandy.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -12,702 +12,647 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thierry Vignaud, Jañ-Mai Drapier"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Urzhiad nevez"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr ""
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr ""
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Fazi ar modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Digevreet "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "N'em eus ket kargañ ar restr %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Ne m'eus ket gallet enrollañ ar restr %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Kevreañ"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Digevreañ"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Profil nevez"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Enrollañ jemmoù d'ar profil %1 ?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "N'hellan ket digeriñ trobarzhell ar modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Fazi ar modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Kevreet "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr ""
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Karned chomlec'h"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Prenester"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Anv"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Urzhiad"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Dre 16"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Ouzhpennañ ..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Aozañ ..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Seveniñ"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Enkas :"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Ezkas :"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Disoc'h :"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Roit ar werzh evit %1 :"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr ""
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Diskouez prenestr an termenell"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Marv eo ar vodem."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Ac'hubet eo ar vodem."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Emaon o lenn ar c'harned chomlec'hioù TDE ..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Lenn ar c'harned chomlec'hioù TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Skrivet meus ar c'harned chomlec'hioù TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Bouetadur Kab :"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Karned chomlec'hioù TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Karned chomlec'hioù TDE (cheñchet)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "N'eo ket enrollet ar c'hemmoù"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr ""
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Termenell"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "sac'het eo tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "N'hellan ket krouilhiñ an drobarzhell '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "N'hellan ket digeriñ ar restr prennañ '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "N'hellan ket lenn ar restr prennañ '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Diskouez"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Dibarzhoù an urzhiad"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Anv :"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Hedad :"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Lec'h"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Rannbennad"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Gwerzh"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Trobarzhell lem-laka"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Titouroù diwar-benn ar gobari"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Gobari :"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Farder :"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Doare GSM :"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Karnedoù chomlec'hioù"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Pellgomz"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lenn"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Write"
-msgstr "Skrivañ"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Enrollañ en ur restr ..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stad"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Perzh-mat an arhent :"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Adtresañ"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Trobarzhell a-steud"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Krouilhiñ ar renkell"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Digeriñ ar modem pa loc'her"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Implijit dibenn-ger ar ger"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Implijit dibenn-ger al labour"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Implijit dibenn-ger ar faks"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Implijit dibenn-ger ar voest-lizheroù"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Implijit dibenn-ger ar vodem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Implijit dibenn-ger ar c'harr"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Implijit un dibenn-ger ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Implijit dibenn-ger ar pajenner"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Dibenn-ger ar gêr"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Dibenn-ger al labour"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Dibenn faks"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Dibenn-ger al log"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Dibenn-ger ar voest-lizheroù"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Dibenn-ger ar vodem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Dibenn-ger ar c'harr"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Dibenn-ger ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Dibenn-ger ar pajenner"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr ""
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Diskouez"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Trobarzhell lem-laka"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Titouroù diwar-benn ar gobari"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Gobari :"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr ""
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Farder :"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Doare GSM :"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Karnedoù chomlec'hioù"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Pellgomz"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lenn"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skrivañ"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Enrollañ en ur restr ..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr ""
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stad"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr ""
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Perzh-mat an arhent :"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Adtresañ"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "N'hellan ket digeriñ ar restr prennañ '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "N'hellan ket lenn ar restr prennañ '%1'."
+
 #~ msgid "&Modem"
 #~ msgstr "&Modem"
 
diff --git a/tde-i18n-bs/messages/tdepim/kandy.po b/tde-i18n-bs/messages/tdepim/kandy.po
index ebff269bf04..290dd0b6f5b 100644
--- a/tde-i18n-bs/messages/tdepim/kandy.po
+++ b/tde-i18n-bs/messages/tdepim/kandy.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-03-22 13:55+0100\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -21,706 +21,667 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Amila Akagić"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "bono@linux.org.ba"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nova naredba"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Unesite ime parametra:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemska greška"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Veza nije uspostavljena "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nisam mogao da učitam datoteka %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Ne mogu snimiti datoteku %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI mobitela"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Poveži se"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Novi profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Da li da snimim izmjene profila %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Ne mogu da otvorim modemski uređaj %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemska greška"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Veza je uspostavljena "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serijski interfejs"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresar"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Prozori"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Naredba"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heks."
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Izvrši"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Unos:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Izlaz:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Rezultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Unesite vrijednost za %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Komuniciram sa vašim mobilnim telefonom."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Prikaži prozor terminala"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Prikaži GUI mobitela"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ne prikazuj GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Ime datoteke sa profilom naredbi"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem je isključen."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem je zauzet."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Čitam telefonski imenik mobitela..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Zapisujem telefonski imenik mobitela..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Zapisan je telefonski imenik mobitela."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Čitam TDE-ov adresar..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Pročitan je TDE-ov adresar."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Zapisan je TDE-ov adresar."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Pročitan je telefonski imenik mobitela."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab stavka:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Stavka mobitela:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Sukobljene stavke"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Koristi Kab stavku"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Koristi stavku mobitela"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefonski imenici su sinhronizovani."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-ov adresar"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-ov adresar (mijenjan)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE adresar ima nesnimljene promjene."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Nesnimljene promjene"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonski imenik mobitela"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonski imenik mobitela (mijenjan)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Telefonski imenik mobitela ima nesnimljene promjene."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"Ne mogu da otvorim uređaj '%1'. Provjerite da li imate dovoljne dozvole za to."
+"Ne mogu da otvorim uređaj '%1'. Provjerite da li imate dovoljne dozvole za "
+"to."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() nije uspio."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Ne mogu da pročitam datoteku za zaključavanje '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Ne mogu da otvorim datoteku za zaključavanje '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Ne mogu da pročitam datoteku za zaključavanje '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Ne mogu da dobavim PID iz datoteke '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces sa PID-om %1, koji je zaključao uređaj i dalje radi."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Ne mogu da emitujem signal PID-u postojeće datoteke za zaključavanje."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ne mogu da napravim datoteku za zaključavanje '%1'. Provjerite da li imate "
-"dovoljne dozvole."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Prikaži"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Osobine naredbi"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Znakovni niz:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Heks. rezultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozicija"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametar"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Vrijednost"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilni uređaj"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informacije o modelu"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serijski broj:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Proizvođač:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM verzija:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresari"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Pročitaj"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Zapiši"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Snimi u datoteku..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sinhronizuj"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Popunjenost baterije:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kvalitet signala:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Osvježi"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Podesi sat"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serijski uređaj"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud rate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Zaključaj direktorij"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Otvori modem po pokretanju"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Samopodešavanje sata na mobitelu prilikom uspostave veze"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Isključi kućne brojeve"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Isključi brojeve na poslu"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Isključi brojeve poruka"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Isključi faks brojeve"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Isključi brojeve ćelije"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Isključi brojeve video-telefona"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Isključi brojeve poštanskog sandučića"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Isključi brojeve modema"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Isključi brojeve telefona u autu"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Isključi ISDN brojeve"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Isključi pager brojeve"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Koristi nastavak za kuću"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Koristi nastavak za posao"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Koristi nastavak za poruke"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Koristi nastavak za fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Koristi nastavak za mobitel"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Koristi nastavak za video"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Koristi nastavak za poštansko sandučiće"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Koristi nastavak za modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Koristi nastavak za auto"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Koristi nastavak za ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Koristi nastavak za pager"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Nastavak za kuću"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Nastavak za posao"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Nastavak za poruke"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Nastavak za faks"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Nastavak za ćeliju"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Nastavak za video"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Nastavak za poštansko sandučiće"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Nastavak za modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Nastavak za auto"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Nastavak za ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Nastavak za pager"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Otvori prozor terminala po pokretanju"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Otvori prozor mobitela po pokretanju"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Prikaži"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilni uređaj"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informacije o modelu"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serijski broj:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Proizvođač:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM verzija:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresari"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Pročitaj"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Zapiši"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Snimi u datoteku..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinhronizuj"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Popunjenost baterije:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kvalitet signala:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Osvježi"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Podesi sat"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ne mogu da otvorim datoteku za zaključavanje '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ne mogu da pročitam datoteku za zaključavanje '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Ne mogu da dobavim PID iz datoteke '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces sa PID-om %1, koji je zaključao uređaj i dalje radi."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Ne mogu da emitujem signal PID-u postojeće datoteke za zaključavanje."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ne mogu da napravim datoteku za zaključavanje '%1'. Provjerite da li "
+#~ "imate dovoljne dozvole."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() nije uspio."
 
diff --git a/tde-i18n-ca/messages/tdepim/kandy.po b/tde-i18n-ca/messages/tdepim/kandy.po
index f6b480ee32e..0711f45b55d 100644
--- a/tde-i18n-ca/messages/tdepim/kandy.po
+++ b/tde-i18n-ca/messages/tdepim/kandy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-02-21 22:10+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -17,702 +17,663 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Antoni Bella Perez,Albert Astals Cid"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "bella5@teleline.es,astals11@terra.es"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nou comandament"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Introduïu el nom del paràmetre:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Error del mòdem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Desconnectat "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "No es pot carregar el fitxer %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "No es pot desar el fitxer %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "IGU per al mòbil"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Connecta"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nou perfil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Desar els canvis al perfil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "No es pot obrir el dispositiu de mòdem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Error del mòdem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Connectat "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interfície sèrie"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Finestres"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nom"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Comandament"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex."
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Afegeix..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Edita..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Executa"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Entrada:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Eixida:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Introduïu un valor per a %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Comunicació amb el vostre telèfon mòbil."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Mostra finestra de terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mostra l'IGU del mòbil"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "No mostrar l'IGU"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nom de fitxer del perfil de comandaments"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "El mòdem està apagat."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "El mòdem està ocupat."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "S'està llegint la llibreta de telèfons del mòbil..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "S'està escrivint la llibreta de telèfons del mòbil..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "S'ha escrit a la llibreta de telèfons del mòbil."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "S'està llegint la llibreta d'adreces del TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "S'ha llegit la llibreta d'adreces del TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "S'ha escrit a la llibreta d'adreces del TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "S'ha llegit la llibreta de telèfons del mòbil."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Entrada del Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Entrada del mòbil:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Entrades en conflicte"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Usa l'entrada del Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Usa l'entrada del mòbil"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "S'han sincronitzat les llibretes de telèfons."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Llibreta d'adreces del TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Llibreta d'adreces del TDE (modificada)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "La llibreta d'adreces del TDE conté canvis sense desar."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Canvis sense desar"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Llibreta de telèfons del mòbil"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Llibreta de telèfons del mòbil (modificada)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Llibreta de telèfons del mòbil conté canvis sense desar."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "No es pot obrir el dispositiu '%1'. Si us plau, comproveu que teniu prou "
 "permisos."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Ha fallat la configuració de la comunicació (codi tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() fa fallat."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "No s'ha pogut blocar el dispositiu '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "No es pot obrir el fitxer de bloqueig '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "No s'ha pogut llegir el fitxer de bloqueig '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "No s'ha pogut obtenir el PID del fitxer '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"El procés amb PID %1 que bloqueja el dispositiu encara està executant-se."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "No s'ha pogut emetre la senyal al PID del fitxer de bloqueig existent."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"No es pot crear el fitxer de bloqueig '%1'. Comproveu que teniu prou permisos."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Mostra"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Propietats del comandament"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nom:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Cadena:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Resultat hexadecimal"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posició"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Paràmetre"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositiu del mòbil"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informació quant al model"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Número sèrie:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabricant:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versió GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Llibreta d'adreces"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telèfon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Llegeix"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Escriure"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Desa al fitxer..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sincronitza"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Estatus"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Càrrega de la bateria:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Qualitat del senyal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Refresca"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Estableix el rellotge"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dispositiu sèrie"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Taxa de bauds"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Directori de fitxers de bloqueig"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Obre el mòdem en engegar"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Estableix automàticament el rellotge del mòbil en connectar"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Exclou els números de casa"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Exclou els números del treball"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Exclou el números de missatgeria"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Exclou els números de fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Exclou els números de mòbil"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Exclou els números de telefon de vídeo"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Exclou els números de bústia de correu"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Exclou els números de mòdem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Exclou els números de telèfon de cotxe"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Exclou els números XDSI"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Exclou els números de cercapersones"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Usa el sufix de casa"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Usa el sufix del treball"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Usa el sufix de missatgeria"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Usa el sufix de fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Usa el sufix de mòbil"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Usa el sufix de vídeo"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Usa el sufix de bústia de correu"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Usa el sufix de mòdem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Usa el sufix del cotxe"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Usa el sufix XDSI"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Usa el sufix de cercapersones"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Sufix de casa"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Sufix de treball"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sufix de missatgeria"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Sufix de fax"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Sufix de mòbil"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Sufix de vídeo"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Sufix de bústia de correu"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Sufix de mòdem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Sufix de cotxe"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Sufix de XDSI"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Sufix de cercapersones"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Obre una finestra de terminal en engegar"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Obre una finestra de mòbil en engegar"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Mostra"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositiu del mòbil"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informació quant al model"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Número sèrie:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabricant:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versió GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Llibreta d'adreces"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telèfon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Llegeix"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Escriure"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Desa al fitxer..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sincronitza"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Estatus"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Càrrega de la bateria:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Qualitat del senyal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Refresca"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Estableix el rellotge"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "No es pot obrir el fitxer de bloqueig '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "No s'ha pogut llegir el fitxer de bloqueig '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "No s'ha pogut obtenir el PID del fitxer '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "El procés amb PID %1 que bloqueja el dispositiu encara està executant-se."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "No s'ha pogut emetre la senyal al PID del fitxer de bloqueig existent."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "No es pot crear el fitxer de bloqueig '%1'. Comproveu que teniu prou "
+#~ "permisos."
diff --git a/tde-i18n-cs/messages/tdepim/kandy.po b/tde-i18n-cs/messages/tdepim/kandy.po
index e9ad2379de0..8084bf4cb10 100644
--- a/tde-i18n-cs/messages/tdepim/kandy.po
+++ b/tde-i18n-cs/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-08-11 13:35+0200\n"
 "Last-Translator: Lukáš Tinkl <lukas@kde.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,705 +17,665 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Radek Vybíral,Ivo Jánský,Klára Cihlářová"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "kedar1@centrum.cz,Ivo.Jansky@seznam.cz,koty@seznam.cz"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nový příkaz"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Zadejte název parametru:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Chyba modemu"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Odpojeno "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nelze načíst soubor %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Nelze uložit soubor %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Grafické rozhraní pro mobil"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Připojit"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Odpojit"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nový profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Uložit změny do profilu %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Nelze otevřít zařízení modemu %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Chyba modemu"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Připojeno "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Sériové rozhraní"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Kniha adres"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Okna"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Název"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Příkaz"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Přidat..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Upravit..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Provést"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Vstup:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Výstup:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Výsledek:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Zadejte hodnotu pro %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Komunikace s vaším mobilem."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Zobrazit okno terminálu"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Zobrazit grafické rozhraní pro mobil"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Nezobrazovat grafické rozhraní"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Název souboru s profilem příkazů"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem je vypnut."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem je zaneprázdněn."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Načítám telefonní seznam z mobilu..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Ukládám telefonní seznam mobilu..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Uložen telefonní seznam mobilu."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Načítá se kniha adres TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Načíst knihu adres v TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Uložena kniha adres TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Načten telefonní seznam mobilu."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Údaje z Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Údaje z mobilu:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Konfliktní údaje"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Použít záznam z Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Použít záznam z mobilu"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Synchronizované seznamy."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Kniha adres TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Kniha adres TDE (změněna)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Kniha adres TDE obsahuje neuložené změny."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonní seznam mobilu"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonní seznam mobilu (změněný)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Telefonní seznam mobilu obsahuje neuložené změny."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminál"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Nemohu otevřít zařízení '%1' Zkontrolujte prosím, zda máte dostatečná práva."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Nastavení komunikace selhalo (tcgetattr kód: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() selhal."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Nemohu uzamknout zařízení '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Nemohu otevřít zámek '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Nemohu číst zámek '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Nemohu získat PID ze souboru '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces s PID %1 uzamykající zařízení stále běží."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Nemohu vyslat signál pro PID existujícího zámku."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Nemohu vytvořit zámek '%1'. Zkontrolujte prosím, zda máte dostatečná práva."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Zobrazit"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Vlastnosti příkazu"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Název:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Řetězec:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex výsledek:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozice"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametr"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Hodnota"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Zařízení mobilu"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informace o modelu"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Sériové číslo:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Výrobce:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Verze GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Knihy adres"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Načíst"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Uložit"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Uložit do souboru..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synchronizovat"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stav"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Nabití baterií:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kvalita signálu:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Obnovit"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Nastavit hodiny"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Sériové zařízení"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Rychlost připojení"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Zamknout adresář"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Otevřít modem při startu"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Automatické nastavení hodin při připojení"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Vyloučit domácí čísla"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Vyloučit pracovní čísla"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Vyloučit čísla textových zpráv"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Vyloučit faxová čísla"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Vyloučit mobilní čísla"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Vyloučit čísla video telefonů"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Vyloučit čísla poštovních schránek"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Vyloučit čísla modemů"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Vyloučit čísla automobilových telefonů"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Vyloučit ISDN čísla"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Vyloučit čísla pagerů"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Použít domácí příponu"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Použít pracovní příponu"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Použít příponu textových zpráv"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Použít faxovou příponu"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Použít příponu mobilu"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Použít video příponu"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Použít příponu poštovní schránky"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Použít příponu modemu"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "použít automobilovou příponu"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Použít ISDN příponu"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Použít příponu pageru"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Domácí přípona"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "pracovní přípona"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "přípona textové zprávy"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Přípona faxu"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Přípona mobilu"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video přípona"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Přípona poštovní schránky"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Přípona modemu"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Automobilová přípona"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN přípona"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Přípona pageru"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Otevřít terminálové okno při startu"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Otevřít okno mobilu při startu"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Zobrazit"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Zařízení mobilu"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informace o modelu"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Sériové číslo:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Výrobce:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Verze GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Knihy adres"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Načíst"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Uložit"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Uložit do souboru..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synchronizovat"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stav"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Nabití baterií:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kvalita signálu:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Obnovit"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Nastavit hodiny"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Nemohu otevřít zámek '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Nemohu číst zámek '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Nemohu získat PID ze souboru '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces s PID %1 uzamykající zařízení stále běží."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Nemohu vyslat signál pro PID existujícího zámku."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Nemohu vytvořit zámek '%1'. Zkontrolujte prosím, zda máte dostatečná "
+#~ "práva."
diff --git a/tde-i18n-cy/messages/tdepim/kandy.po b/tde-i18n-cy/messages/tdepim/kandy.po
index 0192d7b5671..3d46ff75c08 100644
--- a/tde-i18n-cy/messages/tdepim/kandy.po
+++ b/tde-i18n-cy/messages/tdepim/kandy.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-01-07 21:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -20,711 +20,671 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Gorchymyn Newydd"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Ymr %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Rhowch enw paramedr:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Gwall Modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "Datgysylltwyd"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Methu llwytho'r ffeil %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Methu cadw'r ffeil. %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "RhDG (GUI) Symudol"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Cysylltu"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Datgysylltu"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Proffil Newydd"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Cadw'r newidiadau i'r proffil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Methu agor dyfais fodem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Gwall Modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "Cysylltwyd"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Rhyngwyneb Cyfresol"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Ffenestri"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hecs"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Gweithredu"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Mewnbwn:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Allbwn:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Canlyniad:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Rhowch werth ar gyfer %1"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Yn cyfathrebu â'ch ffôn symudol."
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Dangos ffenestr derfynnell."
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Dangos RhDG symudol."
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "Peidio â dangos RhDG."
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Enw'r ffeil broffil gorchmynion."
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem wedi'i ddiffodd."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem yn brysur."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Yn darllen llyfr ffôn symudol..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Yn ysgrifennu llyfr ffôn symudol..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Ysgrifennwyd llyfr ffôn symudol."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Darllenwyd llyfr cyfeiriadau TDE."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Darllenwyd llyfr cyfeiriadau TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Ysgrifennwyd llyfr cyfeiriadau TDE.."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Darllenwyd llyfr ffôn symudol."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Cofnod Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Cofnod Symudol:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Cofnodion sy'n Gwrthdaro"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Defnyddio Cofnod Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Defnyddio Cofnod Symudol"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Cydweddwyd y llyfrau ffôn."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Llyfr Cyfeiriadau TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "Llyfr Cyfeiriadau TDE"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Newidiadau Heb eu Cadw"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Llyfr Ffôn Symudol"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Llyfr Ffôn Symudol"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terfynnell"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Methu agor y ddyfais '%1'. Gwiriwch fod gennych ganiatadau digonol."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Methodd tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Methu darllen y ffeil glo '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Methu agor y ffeil glo '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Methu darllen y ffeil glo '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Methu darllen PID o'r ffeil '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Mae'r broses â PID %1 sy'n cloi'r ddyfais yn dal i redeg."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Methu anfon arwydd at PID y ffeil glo gyfredol"
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "Methu creu'r ffeil glo '%1'. Gwiriwch fod gennych ganiatadau digonol."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Dangos"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Priodweddau Gorchmynion"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Llinyn:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Canlyniad hecs"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Lleoliad"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Paramedr"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Gwerth"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dyfais Symudol"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Gwybodaeth Model"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Rhif cyfresol:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Gwneuthurwr:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Fersiwn GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Llyfrau Cyfeiriadau"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Ffôn"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Darllen"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Ysgrifennu"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Cadw i Ffeil..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Cydweddu"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Cyflwr"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Ynni'r Batri:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Ansawdd signal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Ailfywio"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dyfais gyfresol"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Agor modem ar gychwyn:"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Defnyddio Cofnod Symudol"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Modem wedi'i ddiffodd."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Agor ffenestr derfynnell ar gychwyn"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Agor ffenestr symudol ar gychwyn"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Dangos"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dyfais Symudol"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Gwybodaeth Model"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Rhif cyfresol:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Gwneuthurwr:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Fersiwn GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Llyfrau Cyfeiriadau"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Ffôn"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Darllen"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Ysgrifennu"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Cadw i Ffeil..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Cydweddu"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Cyflwr"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Ynni'r Batri:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Ansawdd signal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Ailfywio"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Methu agor y ffeil glo '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Methu darllen y ffeil glo '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Methu darllen PID o'r ffeil '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Mae'r broses â PID %1 sy'n cloi'r ddyfais yn dal i redeg."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Methu anfon arwydd at PID y ffeil glo gyfredol"
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Methu creu'r ffeil glo '%1'. Gwiriwch fod gennych ganiatadau digonol."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "Methodd tcgetattr()."
 
diff --git a/tde-i18n-da/messages/tdepim/kandy.po b/tde-i18n-da/messages/tdepim/kandy.po
index eb3b97aa5c5..56d36c7a192 100644
--- a/tde-i18n-da/messages/tdepim/kandy.po
+++ b/tde-i18n-da/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-09-24 12:14-0400\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,704 +16,664 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: \n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Erik Kjær Pedersen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "erik@binghamton.edu"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ny kommando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Indtast parameternavn:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem fejl"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Afbrudt "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Kunne ikke indlæse fil %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Kunne ikke gemme fil %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobil GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Forbind"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Afbryd"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Ny profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Gem ændringer af profil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Kan ikke åbne modem enhed %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem fejl"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Forbundet "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Seriel grænseflade"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Vinduer"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Navn"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Kommando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Tilføj..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Redigér..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Udfør"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Inddata:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Uddata:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Indtast værdi for %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikerer med din mobiltelefon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Vis terminalvindue"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Vis mobil GUI"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Vis ikke GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Filenavn for kommando profil fil"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem er slået fra."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem er travlt."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Læser mobil telefonbog..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Skriver mobil telefonbog..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Skrev mobil telefonbog."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Læser TDE's adressebog..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Læs TDE adressebog."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Skrev TDE adressebog."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Læs mobil telefonbog."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab indgang:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobil indgang:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Modstridende indgange"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Brug Kab-indgang"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Brug mobil-indgang"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Synkroniserede telefonbøger."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE adressebog"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE adressebog (ændret)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE's adressebog indeholder ændringer der ikke er gemt."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Ikke gemte ændringer"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Mobiltelefonbog"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Mobiltelefonbog (ændret)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Mobiltelefonlisten indeholder ændringer der ikke er gemt."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"Kan ikke åbne enheden '%1'. Tjek venligst at du har tilstrækkelige tilladelser."
+"Kan ikke åbne enheden '%1'. Tjek venligst at du har tilstrækkelige "
+"tilladelser."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Indstilling af kommunikation mislykkedes (kode fra tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() mislykkedes."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Kan ikke låse enheden '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Kan ikke åbne låsefilen '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Kan ikke læse låsefilen '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Kan ikke få PID fra filen '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces med PID %1 som låser enheden, kører stadig."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Kan ikke udsende signal til PID for eksisterende låsefil."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Kan ikke lave låsefilen '%1'. Tjek venligst at du har tilstrækkelige "
-"tilladelser."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Vis"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Kommandoegenskaber"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Navn:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Streng:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex resultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Position"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Værdi"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilenhed"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Model Information"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serieøjeblikketer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabrikant:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM version:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adressebøger"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Læs"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skriv"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Gem til fil..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synkronisér"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batteriopladning:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signalkvalitet:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Genopfrisk"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Indstil uret"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Seriel enhed"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud-hastighed"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Lås mappe"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Åbn modem ved opstart"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Indstil mobiltelefonens kur automatisk ved forbindelse"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Undtag hjemmeøjeblikketre"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Undtag arbejdsnumre"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Undtag meddelelsenumre"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Undtag telefaxnumre"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Undtag mobilnumre"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Undtag videotelefonnumre"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Undtag postboksnumre"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Undtag modemnumre"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Undtag biltelefonnumre"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Undtag ISDN-numre"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Undtag personsøgernumre"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Brug hjem-suffiks"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Brug arbejdssuffiks"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Brug meddelelsesuffiks"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Brug telefaxsuffiks"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Brug mobil-endelse"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Brug videosuffiks"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Brug postboks-suffiks"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Brug modem-suffiks"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Brug bil-suffiks"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Brug ISDN-suffiks"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Brug personsøgersuffiks"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Hjemme -suffiks"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Arbejds-suffiks"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Meddelelses-suffiks"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Telefax-suffiks"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobil-suffiks"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video-suffiks"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Postboks-suffiks"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modem-endelse"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Bil-suffiks"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN-suffiks"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Personsøger-suffiks"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Åbn terminalvindue ved opstart"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Åbn mobilvindue ved opstart"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Vis"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilenhed"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Model Information"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serieøjeblikketer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabrikant:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM version:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adressebøger"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Læs"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skriv"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Gem til fil..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synkronisér"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batteriopladning:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signalkvalitet:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Genopfrisk"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Indstil uret"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Kan ikke åbne låsefilen '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Kan ikke læse låsefilen '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Kan ikke få PID fra filen '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces med PID %1 som låser enheden, kører stadig."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Kan ikke udsende signal til PID for eksisterende låsefil."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Kan ikke lave låsefilen '%1'. Tjek venligst at du har tilstrækkelige "
+#~ "tilladelser."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() mislykkedes."
diff --git a/tde-i18n-de/messages/tdepim/kandy.po b/tde-i18n-de/messages/tdepim/kandy.po
index ef3cd02d755..a495164ed1d 100644
--- a/tde-i18n-de/messages/tdepim/kandy.po
+++ b/tde-i18n-de/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-01-13 21:15+0100\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -19,703 +19,663 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stefan Winter, Gregor Zumstein"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "swinter@kde.org, gz@orchester-bremgarten.ch"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Neuer Befehl"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argument %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Name des Parameters eingeben:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemfehler"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Nicht verbunden "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Datei %1 kann nicht geladen werden"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Datei %1 kann nicht gespeichert werden."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobiltelefon-Oberfläche"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Verbinden"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Verbindung beenden"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Neues Profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Änderungen in Profil %1 speichern?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Modem %1 kann nicht geöffnet werden."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemfehler"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Verbunden "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serielle Schnittstelle"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Fenster"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Name"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Befehl"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Hinzufügen ..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Bearbeiten ..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Ausführen"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Eingabe:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Ausgabe:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Ergebnis:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Wert für %1 eingeben:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikation mit dem Mobiltelefon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminalfenster anzeigen"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Oberfläche des Mobiltelefons anzeigen"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Oberfläche nicht anzeigen"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Dateiname der Profildatei"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem ist deaktiviert."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem ist besetzt."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Auslesen des Telefonbuchs aus dem Mobiltelefon ..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Schreiben des Telefonbuchs ins Mobiltelefon ..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Telefonbuch des Mobiltelefons gespeichert."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE-Adressbuch lesen ..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE-Adressbuch gelesen."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE-Adressbuch gespeichert."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Telefonbuch des Mobiltelefons auslesen."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "KAB-Eintrag:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Eintrag des Mobiltelefons:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Widersprüchliche Einträge"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "KAB-Eintrag benutzen"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Eintrag des Mobiltelefons benutzen"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefonbücher sind abgeglichen"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-Adressbuch"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-Adressbuch (geändert)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Das TDE-Adressbuch enthält ungesicherte Änderungen."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Ungesicherte Änderungen"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonbuch des Mobiltelefons"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonbuch des Mobiltelefons (geändert)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Das Telefonbuch des Mobiltelefons enthält ungesicherte Änderungen."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Gerät \"%1\" kann nicht geöffnet werden. Bitte überprüfen Sie die "
 "Berechtigungen."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Einrichten der Kommunikation fehlgeschlagen (tcgetattr Code: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() ist fehlgeschlagen."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Gerät \"%1\" kann nicht gesperrt werden."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Sperrdatei \"%1\" kann nicht geöffnet werden."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Sperrdatei \"%1\" kann nicht gelesen werden."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "PID aus der Datei \"%1\" kann nicht ermittelt werden."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Der Prozess mit der PID %1, der das Gerät blockiert, läuft noch."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Es kann kein Signal an den Prozess der bestehenden Sperrdatei gesendet werden."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Sperrdatei \"%1\" kann nicht erzeugt werden. Bitte überprüfen Sie die "
-"Berechtigungen."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Anzeigen"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Befehlseigenschaften"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Name:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Wert:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Ergebnis (hex.)"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Position"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Wert"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobiltelefon (Gerät)"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modellinformation"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modell:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Seriennummer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Hersteller:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-Version:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adressbücher"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lesen"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Schreiben"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "In Datei speichern ..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Abgleichen"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Akkuladung:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signalstärke:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Aktualisieren"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Uhr stellen"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serielles Gerät"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud-Rate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Ordner sperren"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Modem beim Starten öffnen"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Nach Verbindungsaufbau automatisch die Uhr des Mobiltelefons stellen"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Festnetznummern ausschließen"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Telefonnummern des Arbeitsplatzes ausschließen"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Mitteilungsnummern ausschließen"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Faxnummern ausschließen"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Mobiltelefonnummern ausschließen"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Videotelefonienummern ausschließen"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Mailboxnummern ausschließen"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modemnummern ausschließen"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Autotelefonnummern ausschließen"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN-Nummern ausschließen"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Pager-Nummern ausschließen"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Festnetz-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Arbeitsplatz-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Mitteilungs-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Fax-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Mobiltelefon-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Videotelefonie-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Mailbox-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Modem-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Autotelefon-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Pager-Suffix benutzen"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Festnetz-Suffix"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Arbeitsplatz-Suffix"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Mitteilungs-Suffix"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Fax-Suffix"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobiltelefon-Suffix"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Videotelefonie-Suffix"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Mailbox-Suffix"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modem-Suffix"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Autotelefon-Suffix"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN-Suffix"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Pager-Suffix "
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Terminalfenster beim Start öffnen"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Mobiltelefon-Fenster beim Start öffnen"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Anzeigen"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobiltelefon (Gerät)"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modellinformation"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modell:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Seriennummer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Hersteller:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-Version:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adressbücher"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lesen"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Schreiben"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "In Datei speichern ..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Abgleichen"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Akkuladung:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signalstärke:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Uhr stellen"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Sperrdatei \"%1\" kann nicht geöffnet werden."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Sperrdatei \"%1\" kann nicht gelesen werden."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "PID aus der Datei \"%1\" kann nicht ermittelt werden."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Der Prozess mit der PID %1, der das Gerät blockiert, läuft noch."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Es kann kein Signal an den Prozess der bestehenden Sperrdatei gesendet "
+#~ "werden."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Sperrdatei \"%1\" kann nicht erzeugt werden. Bitte überprüfen Sie die "
+#~ "Berechtigungen."
diff --git a/tde-i18n-el/messages/tdepim/kandy.po b/tde-i18n-el/messages/tdepim/kandy.po
index 2b0214d2588..2f02afb177c 100644
--- a/tde-i18n-el/messages/tdepim/kandy.po
+++ b/tde-i18n-el/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-12-02 20:13+0200\n"
 "Last-Translator: Toussis Manolis <manolis@koppermind.homelinux.org>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -15,703 +15,664 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Σπύρος Γεωργαράς,Τούσης Μανώλης"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "sng@hellug.gr,manolis@koppermind.homelinux.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Νέα εντολή"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Παράμ %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Εισάγετε το όνομα της παραμέτρου:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Σφάλμα μόντεμ"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Αποσυνδέθηκε"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Αδυναμία φόρτωσης του αρχείου %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Αδυναμία αποθήκευσης του αρχείου %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI κινητού"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Σύνδεση"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Αποσύνδεση"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Νέο προφίλ"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Αποθήκευση τροποποιήσεων στο προφίλ %1;"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Αδυναμία ανοίγματος της συσκευής μόντεμ %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Σφάλμα μόντεμ"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Συνδέθηκε"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Σειριακή διασύνδεση"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Παράθυρα"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Όνομα"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Εντολή"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Δεκαεξ"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Προσθήκη..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Είσοδος:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Έξοδος:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Αποτέλεσμα:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Εισάγετε τιμή για το %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Επικοινωνία με το κινητό σας τηλέφωνο."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Εμφάνιση παραθύρου τερματικού"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Εμφάνιση GUI κινητού"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Μη εμφάνιση GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Όνομα αρχείου του προφίλ εντολών"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Το μόντεμ είναι κλειστό."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Το μόντεμ είναι απασχολημένο."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Ανάγνωση τηλεφωνικού καταλόγου κινητού..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Εγγραφή τηλεφωνικού καταλόγου κινητού..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Γράφτηκε ο τηλεφωνικός κατάλογος του κινητού."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Ανάγνωση βιβλίου διευθύνσεων του TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Ανάγνωση βιβλίου διευθύνσεων του TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Γράφτηκε το βιβλίο διευθύνσεων του TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Ανάγνωση τηλεφωνικού καταλόγου κινητού."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Καταχώρηση βιβλίου διευθύνσεων:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Καταχώρηση κινητού:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Συγκρουόμενες καταχωρήσεις"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Χρήση καταχώρησης βιβλίου διευθύνσεων"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Χρήση καταχώρησης κινητού"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Συγχρονισμένοι τηλ. κατάλογοι."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Βιβλίο διευθύνσεων TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Βιβλίο διευθύνσεων TDE (τροποποιημένο)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Το βιβλίο διευθύνσεων TDE περιέχει μη αποθηκευμένες αλλαγές."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Μη αποθηκευμένες αλλαγές"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Τηλεφωνικός κατάλογος κινητού"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Τηλεφωνικός κατάλογος κινητού (τροποποιημένος)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Ο τηλεφωνικός κατάλογος του κινητού περιέχει μη αποθηκευμένες αλλαγές."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Τερματικό"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Αδυναμία ανοίγματος της συσκευής '%1'. Παρακαλώ ελέγξτε ότι έχετε επαρκή "
 "δικαιώματα."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Αποτυχία ρύθμισης επικοινωνίας (κωδικός tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Αποτυχία tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Αδυναμία κλειδώματος της συσκευής '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Αδυναμία ανοίγματος του αρχείου κλειδώματος '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Αδυναμία ανάγνωσης του αρχείου κλειδώματος '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Αδυναμία ανάκτησης PID από το αρχείο '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Η διεργασία με PID %1, η οποία έχει κλειδώσει τη συσκευή, εκτελείται ακόμα."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Αδυναμία εκπομπής σήματος στο PID του υπάρχοντος κλειδωμένου αρχείου."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Αδυναμία δημιουργίας του αρχείου κλειδώματος '%1'. Παρακαλώ ελέγξτε ότι έχετε "
-"επαρκή δικαιώματα."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Εμφάνιση"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Ιδιότητες εντολής"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Όνομα:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Συμβολοσειρά:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Δεκαεξαδικό αποτέλεσμα"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Θέση"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Παράμετρος"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Τιμή"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Συσκευή κινητού"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Πληροφορίες μοντέλου"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Μοντέλο:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Αριθμός σειράς:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Κατασκευαστής:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Έκδοση GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Βιβλία διευθύνσεων"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Ανάγνωση"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Εγγραφή"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Αποθήκευση σε αρχείο..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Συγχρονισμός"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Κατάσταση"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Φορτίο μπαταρίας:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Ποιότητα σήματος:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Ανανέωση"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Ορισμός ρολογιού"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Σειριακή συσκευή"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Ρυθμός Baud"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Κατάλογος κλειδώματος"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Άνοιγμα του μόντεμ κατά την έναρξη"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Αυτόματος ορισμός του ρολογιού κατά τη σύνδεση του κινητού"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Εξαίρεση αριθμών οικίας"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Εξαίρεση αριθμών εργασίας"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Εξαίρεση αριθμών μηνυμάτων"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Εξαίρεση αριθμών φαξ"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Εξαίρεση αριθμών κινητών"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Εξαίρεση αριθμών βιντεοφώνων"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Εξαίρεση αριθμών αλληλογραφίας"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Εξαίρεση αριθμών μόντεμ"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Εξαίρεση αριθμών τηλεφώνων αυτοκινήτων"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Εξαίρεση ISDN αριθμών"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Εξαίρεση αριθμών ειδοποιητών"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Χρήση κατάληξης οικίας"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Χρήση κατάληξης εργασίας"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Χρήση κατάληξης μηνυμάτων"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Χρήση κατάληξης φαξ"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Χρήση κατάληξης κινητών"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Χρήση κατάληξης βίντεο"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Χρήση κατάληξης αλληλογραφίας"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Χρήση κατάληξης μόντεμ"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Χρήση κατάληξης αριθμών αυτοκινήτου"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Χρήση κατάληξης ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Χρήση κατάληξης ειδοποιητών"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Κατάληξη οικίας"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Κατάληξη εργασίας"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Κατάληξη μηνυμάτων"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Κατάληξη φαξ"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Κατάληξη κινητού"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Κατάληξη βίντεο"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Κατάληξη αλληλογραφίας"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Κατάληξη μόντεμ"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Κατάληξη αυτοκινήτου"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Κατάληξη ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Κατάληξη ειδοποιητή"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Άνοιγμα παραθύρου τερματικού κατά την έναρξη"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Άνοιγμα παραθύρου κινητού κατά την έναρξη"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Εμφάνιση"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Συσκευή κινητού"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Πληροφορίες μοντέλου"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Μοντέλο:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Αριθμός σειράς:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Κατασκευαστής:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Έκδοση GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Βιβλία διευθύνσεων"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Ανάγνωση"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Εγγραφή"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Αποθήκευση σε αρχείο..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Συγχρονισμός"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Φορτίο μπαταρίας:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Ποιότητα σήματος:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Ορισμός ρολογιού"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Αδυναμία ανοίγματος του αρχείου κλειδώματος '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Αδυναμία ανάγνωσης του αρχείου κλειδώματος '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Αδυναμία ανάκτησης PID από το αρχείο '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Η διεργασία με PID %1, η οποία έχει κλειδώσει τη συσκευή, εκτελείται "
+#~ "ακόμα."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Αδυναμία εκπομπής σήματος στο PID του υπάρχοντος κλειδωμένου αρχείου."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Αδυναμία δημιουργίας του αρχείου κλειδώματος '%1'. Παρακαλώ ελέγξτε ότι "
+#~ "έχετε επαρκή δικαιώματα."
diff --git a/tde-i18n-en_GB/messages/tdepim/kandy.po b/tde-i18n-en_GB/messages/tdepim/kandy.po
index fbeed243439..0b582486fed 100644
--- a/tde-i18n-en_GB/messages/tdepim/kandy.po
+++ b/tde-i18n-en_GB/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-06-09 13:35+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -16,701 +16,661 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Malcolm Hunter"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "New Command"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Enter parameter name:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem Error"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Disconnected "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Could not load file %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Could not save file %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobile GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Connect"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "New Profile"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Save changes to profile %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Cannot open modem device %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem Error"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Connected "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serial Interface"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Address Book"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Windows"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Name"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Command"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Add..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Edit..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Execute"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Input:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Output:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Result:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Enter value for %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Communicating with your mobile phone."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Show terminal window"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Show mobile GUI"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Do not show GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Filename of command profile file"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem is off."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem is busy."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Reading mobile phonebook..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Writing mobile phonebook..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Wrote mobile phonebook."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Reading TDE address book..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Read TDE address book."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Wrote TDE address book."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Read mobile phonebook."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab Entry:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobile Entry:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Conflicting Entries"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Use Kab Entry"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Use Mobile Entry"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Synched phonebooks."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE Address Book"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE Address Book (modified)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "The TDE address book contains unsaved changes."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Mobile Phone Book"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Mobile Phone Book (modified)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "The mobile phone book contains unsaved changes."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Communication setup failed (tcgetattr code: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() failed."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Unable to lock device '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Unable to open lock file '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Unable to read lock file '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Unable to get PID from file '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Process with PID %1, which is locking the device, is still running."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Unable to emit signal to PID of existing lock file."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Show"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Command Properties"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Name:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "String:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex result"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Position"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Value"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobile Device"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Model Information"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serial number:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Manufacturer:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM version:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Address Books"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Phone"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Read"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Write"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Save to File..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sync"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Battery charge:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signal quality:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Refresh"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Set Clock"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serial device"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud rate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Lock directory"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Open modem on startup"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Auto-set clock of mobile on connection"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Exclude home numbers"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Exclude work numbers"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Exclude messaging numbers"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Exclude fax numbers"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Exclude cell numbers"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Exclude video phone numbers"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Exclude mailbox numbers"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Exclude modem numbers"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Exclude car phone numbers"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Exclude ISDN numbers"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Exclude pager numbers"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Use home suffix"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Use work suffix"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Use messaging suffix"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Use fax suffix"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Use mobile suffix"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Use video suffix"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Use mailbox suffix"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Use modem suffix"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Use car suffix"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Use ISDN suffix"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Use pager suffix"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Home suffix"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Work suffix"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Messaging suffix"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Fax suffix"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Cell suffix"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video suffix"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Mailbox suffix"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modem suffix"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Car suffix"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN suffix"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Pager suffix"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Open terminal window on startup"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Open mobile window on startup"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Show"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobile Device"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Model Information"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serial number:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Manufacturer:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM version:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Address Books"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Phone"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Read"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Write"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Save to File..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sync"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Battery charge:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signal quality:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Refresh"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Set Clock"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Unable to open lock file '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Unable to read lock file '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Unable to get PID from file '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Process with PID %1, which is locking the device, is still running."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Unable to emit signal to PID of existing lock file."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
diff --git a/tde-i18n-es/messages/tdepim/kandy.po b/tde-i18n-es/messages/tdepim/kandy.po
index 322804069b8..b87cb100f8a 100644
--- a/tde-i18n-es/messages/tdepim/kandy.po
+++ b/tde-i18n-es/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-06-10 17:13+0200\n"
 "Last-Translator: Juan Manuel Garcia Molina <juanma@superiodico.net>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -18,702 +18,663 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Juan Manuel García Molina,Pablo de Vicente,Miguel Revilla Rodríguez"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "juanma@superiodico.net,pvicentea@nexo.es,yo@miguelrevilla.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nueva orden"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Introduzca el nombre del parámetro:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Error del módem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " desconectado "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "No se pudo cargar el archivo %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "No se pudo guardar el archivo %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI móvil"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Conectar"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nuevo perfil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "¿Guardar cambios en el perfil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "No se puede abrir el dispositivo del módem %1"
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Error del módem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " conectado "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interfaz serie"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Windows"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nombre"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Orden"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Añadir..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Editar..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Entrada"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Salida:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultado:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Introduzca valor para %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Comunicándose con el teléfono móvil."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Mostrar ventana de terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mostrar GUI de móvil"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "No mostrar el GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nombre del archivo de órdenes «profile»"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "El módem está apagado."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "El módem está ocupado."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Leyendo libreta de teléfonos del móvil..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Escribiendo libreta de teléfonos del móvil..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Escrito en libreta de telefónos del móvil"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Leyendo la libreta de direcciones de TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Leída la libreta de direcciones de TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Escrito en la libreta de direcciones de TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Leída libreta de teléfonos móvil."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Entrada de Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Entrada del móvil:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Entradas en conflicto"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Usar la entrada de Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Usar la entrada del móvil"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Libretas de teléfonos sincronizadas"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Libreta de direcciones de TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Libreta de direcciones de TDE (modificada)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "La libreta de direcciones de TDE tiene cambios no guardados."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Cambios no guardados"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Libreta de teléfonos del móvil"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Libreta de teléfonos del móvil (modificado)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "La libreta de teléfonos del móvil tiene cambios no guardados."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"No se puede abrir el dispositivo «%1». Por favor, compruebe que tiene permisos "
-"suficientes."
+"No se puede abrir el dispositivo «%1». Por favor, compruebe que tiene "
+"permisos suficientes."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Falló la configuración de la comunicación (código de tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() falló."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "No se puede bloquear el dispositivo «%1»."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "No se puede abrir el archivo de bloqueo «%1»."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "No se puede leer el archivo de bloqueo «%1»."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "No se puede obtener el PID del archivo «%1»."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "El proceso con PID %1 que bloquea el dispositivo aún está corriendo."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "No se puede emitir la señal al PID del archivo de bloqueo existente."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"No se puede crear el archivo de bloqueo «%1». Compruebe que tiene suficientes "
-"permisos."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Mostrar"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Propiedades de la orden"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nombre:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Cadena:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Resultado hexadecimal"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posición"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parámetro"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositivo móvil"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Información del modelo"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modelo:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Número de serie:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabricante:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versión GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Libretas de direcciones"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Teléfono"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Leer"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Escribir"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Guardar en archivo..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sincronizar"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Estado"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Carga de batería:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Calidad de la señal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Actualizar"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Poner en hora"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dispositivo serie"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Tasa de baudios"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Bloquear el directorio"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Abrir el módem al iniciar"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Durante la conexión, poner en hora el móvil"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Excluir números de casa"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Excluir números del trabajo"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Excluir números de mensajería"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Excluir números de fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Excluir números de celda"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Excluir números de videoteléfono"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Excluir números de buzones de correo"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Excluir números de módem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Excluir números de teléfono del coche"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Excluir números de RDSI"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Excluir números del paginador"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Usar el sufijo «casa»"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Usar el sufijo «trabajo»"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Usar el sufijo «mensajería»"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Usar el sufijo «fax»"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Usar el sufijo «móvil»"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Usar el sufijo «vídeo»"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Usar el sufijo «buzón»"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Usar el sufijo «módem»"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Usar el sufijo «coche»"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Usar el sufijo «RDSI»"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Usar el sufijo «paginador»"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Sufijo «casa»"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Sufijo «trabajo»"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sufijo «mensajería»"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Fufijo «fax»"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Sufijo «celda»"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Sufijo «vídeo»"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Sufijo «buzón»"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Sufijo «módem»"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Sufijo «coche»"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Sufijo «RDSI»"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Sufijo «paginador»"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Abrir ventana de terminal al iniciar"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Abrir ventana de móvil al iniciar"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Mostrar"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositivo móvil"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Información del modelo"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modelo:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Número de serie:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabricante:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versión GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Libretas de direcciones"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Teléfono"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Leer"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Escribir"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Guardar en archivo..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sincronizar"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Estado"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Carga de batería:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Calidad de la señal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Poner en hora"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "No se puede abrir el archivo de bloqueo «%1»."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "No se puede leer el archivo de bloqueo «%1»."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "No se puede obtener el PID del archivo «%1»."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "El proceso con PID %1 que bloquea el dispositivo aún está corriendo."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "No se puede emitir la señal al PID del archivo de bloqueo existente."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "No se puede crear el archivo de bloqueo «%1». Compruebe que tiene "
+#~ "suficientes permisos."
diff --git a/tde-i18n-et/messages/tdepim/kandy.po b/tde-i18n-et/messages/tdepim/kandy.po
index 039e45a4e59..07617f24111 100644
--- a/tde-i18n-et/messages/tdepim/kandy.po
+++ b/tde-i18n-et/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-07-10 16:08+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -15,701 +15,660 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Toomas Nurmoja"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "toomas.nurmoja@mail.ee"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Uus käsk"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parameetri nimi:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemi viga"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Ühendus katkestatud "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Ei õnnestu laadida faili %1."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Ei õnnestu salvestada faili %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobiili kasutajaliides"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Ühenda"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Katkesta ühendus"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Uus profiil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Kas muudatused salvestada profiili %1 ?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Ei suuda avada modemit %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemi viga"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Ühendatud "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Järjestikliides"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Aknad"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nimi"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Käsk"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "16-süsteemis"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Lisa..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Muuda..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Käivita"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Sisend:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Väljund:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Tulemus:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Sisesta väärtus %1 jaoks:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Mobiiltelefoniga suhtlemine."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminaliakna näitamine"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mmobiili kasutajaliidese näitamine"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Kasutajaliidest ei näidata"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Käsuprofiili failinimi"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem on välja lülitatud."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem on kinni."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Mobiili aadressiraamatu lugemine..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Mobiili aadressiraamatu kirjutamine..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Mobiili aadressiraamat kirjutatud."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE aadressiraamatu lugemine..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE aadressiraamat loetud."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE aadressiraamat kirjutatud."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Mobiili aadressiraamat loetud."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab'i sissekanne:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobiili sissekanne:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Vastuolulised sissekanded"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Kasuta Kab'i sissekannet"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Kasuta mobiili sissekannet"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Aadressiraamatud sünkroniseeritud."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE aadressiraamat"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE aadressiraamat (muudetud)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE aadressiraamat sisaldab salvestamata muudatusi."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Salvestamata muudatused"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Mobiili telefoniraamat"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Mobiili telefoniraamat (muudetud)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Mobiili telefoniraamat sisaldab salvestamata muudatusi."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Seadme '%1' avamine ebaõnnestus. Palun kontrolli, et sul on selleks õigusi."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Kommunikatsiooni seadistamine ebaõnnestus (tcgetattr kood: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() ebaõnnestus."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Seadme '%1' lukustamine ebaõnnestus."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Lukustusfaili '%1' avamine ebaõnnestus."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Lukustusfaili '%1' lugemine ebaõnnestus."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Failist '%1' ei õnnestunud PID-i hankida."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Seadet lukustav protsess (PID %1) töötab ikka veel."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Olemasoleva lukustusfaili PID-ile signaali saatmine ebaõnnestus."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Lukustusfaili '%1' loomine ebaõnnestus. Palun kontrolli, et sul on selleks "
-"õigusi."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Näitamine"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Käsu omadused"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nimi:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "String:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Tulemus 16-süsteemis"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Asukoht"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameeter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Väärtus"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobiiliseade"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Mudeli info"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Mudel:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Seerianumber:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Tootja:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM versioon"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Aadressiraamatud"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Loe"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Kirjuta"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Salvesta failina..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sünkroniseeri"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Olek"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Aku laetus:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signaali tugevus:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Värskenda"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Säti kell"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Järjestikliides"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Modulatsioonikiirus"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Kataloogi lukustamine"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Modem käivitatakse rakenduse käivitamisel"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Mobiili kella automaatne sättimine ühendumisel"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Koduste numbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Töönumbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Sõnuminumbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Faksinumbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Mobiilinumbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Videotelefoni numbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Postkasti numbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modemi numbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Autotelefoni numbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN numbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Peilerinumbrite väljajätmine"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Kodusufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Töösufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Sõnumisufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Faksisufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Mobiilisufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Videosufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Postkasti sufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Modemisufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Autotelefoni sufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN sufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Peilerisufiksi kasutamine"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Kodusufiks"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Töösufiks"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sõnumisufiks"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Faksisufiks"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobiilisufiks"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Videosufiks"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Postkasti sufiks"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modemi sufiks"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Autotelefoni sufiks"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN sufiks"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Peilerisufiks"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Terminaliaken avatakse rakenduse käivitamisel"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Mobiili aken avatakse rakenduse käivitamisel"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Näitamine"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobiiliseade"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Mudeli info"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Mudel:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Seerianumber:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Tootja:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM versioon"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Aadressiraamatud"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Loe"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Kirjuta"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Salvesta failina..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sünkroniseeri"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Olek"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Aku laetus:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signaali tugevus:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Värskenda"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Säti kell"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Lukustusfaili '%1' avamine ebaõnnestus."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Lukustusfaili '%1' lugemine ebaõnnestus."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Failist '%1' ei õnnestunud PID-i hankida."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Seadet lukustav protsess (PID %1) töötab ikka veel."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Olemasoleva lukustusfaili PID-ile signaali saatmine ebaõnnestus."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Lukustusfaili '%1' loomine ebaõnnestus. Palun kontrolli, et sul on "
+#~ "selleks õigusi."
diff --git a/tde-i18n-eu/messages/tdepim/kandy.po b/tde-i18n-eu/messages/tdepim/kandy.po
index dd8cdf6db44..c811c389e19 100644
--- a/tde-i18n-eu/messages/tdepim/kandy.po
+++ b/tde-i18n-eu/messages/tdepim/kandy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-11-19 19:57-0700\n"
 "Last-Translator: Ion Gaztañaga <igaztanaga@gmail.com>\n"
 "Language-Team: Basque <kdeuskaraz@euskalgnu.org>\n"
@@ -19,702 +19,664 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Ion Gaztañaga"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "igaztanaga@gmail.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Agindu berria"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Sartu parametroaren izena:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemaren errorea"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Deskonektatuta "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Ezin izan da %1 fitxategia kargatu"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Ezin izan da %1 fitxategia gorde"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mugikorrerako interfazea"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Konektatu"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Profil berria"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Gorde aldaketak %1 profilera?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Ezin da %1 modem dispositiboa ireki."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemaren errorea"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Konektatuta "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serieko interfazea"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Lehioak"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Izena"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Agindua"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hamaseitarra"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Gehitu..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Editatu..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Exekutatu"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Sarrera:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Irteera:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Emaitza:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Sartu %1-(r)en balioa:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Zure telefono mugikorrarekin komunikatzen."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Erakutsi terminal lehioa"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Erakutsi mugikorraren interfazea"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ez interfazerik erakutsi"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Agindu profil fitxategiaren izena"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modema itzalita dago."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modema lanpetuta dago."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Mugikorraren telefono-liburua irakurtzen..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Mugikorraren telefono-liburua idazten..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Idatzi mugikorraren telefono-liburua."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE-ren helbide-liburuan irakurtzen..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Irakurri mugikorraren telefono-liburua."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Idatzi TDE-ren helbide-liburua."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Irakurri mugikorraren telefono-liburua."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab sarrera:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mugikorraren sarrera:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Gatazkadun sarrerak"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Erabili Kab sarrera"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Erabili mugikorraren sarrera"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefono-liburu sinkronizatu dira."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-ren helbide-liburua"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-ren helbide-liburua (aldatuta)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE-ren helbide-liburuak gorde gabeko aldaketak ditu."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Gorde gabeko aldaketak"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Mugikorraren telefono liburua"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Mugikorraren telefono liburua (aldatuta)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Mugikorraren telefono-liburuak gorde gabeko aldaketak ditu."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminala"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"Ezin izan da '%1' dispositiboa ireki. Egiaztatu behar diren baimenak dituzula."
+"Ezin izan da '%1' dispositiboa ireki. Egiaztatu behar diren baimenak "
+"dituzula."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Komunikazioaren konfigurazioak huts egin du (tcgetattr kodea: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr()-ek huts egin du."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Ezin da \"%1\" dipositiboa blokeatu."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Ezin izan da '%1' blokeo-fitxategia ireki."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Ezin izan da '%1' blokeo-fitxategia irakurri."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Ezin izan da PID '%1' fitxategitik eskuratu."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"%1 PID-dun prozesua, dispositiboa blokeatzen ari dena, oraindik martxan dago."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Ezin izan da existitzen den bloke-fitxategiko PID-ari seinale bat bidali."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ezin da '%1' bloke-fitxategia sortu. Egiaztatu behar diren baimenak dituzula."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Erakutsi"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Aginduaren propietateak"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Izena:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Katea:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Emaitza hamaseitarra"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posizioa"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametroa"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Balioa"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositibo mugikorra"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modeloaren informazioa"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modeloa:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serieko zenbakia:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabrikatzailea:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM bertsioa:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Helbide-liburuak"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefonoa"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Irakurri"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Idatzi"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Gorde fitxategira..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sinkronizatu"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Egoera"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Bateria-karga:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Seinalearen kalitatea:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Freskatu"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Ezarri ordua"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serieko dispositiboa"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baudio-tasa"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Blokeatu direktorioa"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Ireki modema abioan"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Auto-ezarri mugikorraren ordua konektatzean"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Ez kontuan hartu etxeko zenbakiak"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Ez kontuan hartu laneko zenbakiak"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Ez kontuan hartu mezularitza zenbakiak"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Ez kontuan hartu fax zenbakiak"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Ez kontuan hartu mugikorren zenbakiak"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Ez kontuan hartu bideofonoen zenbakiak"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Ez kontuan hartu postontzien zenbakiak"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Ez kontuan hartu modemen zenbakiak"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Ez kontuan hartu kotxeko telefonoen zenbakiak"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Ez kontuan hartu ISDN zenbakiak"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Ez kontuan hartu bilagailuen zenbakiak"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Erabili etxeko atzizkia"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Erabili laneko atzizkia"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Erabili mezularitza atzizkia"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Erabili fax atzizkia"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Erabili mugikorraren atzizkia"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Erabili bideoaren atzizkia"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Erabili postontziaren atzizkia"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Erabili modemaren atzizkia"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Erabili kotxeko atzizkia"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Erabili ISDN atzizkia"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Erabili bilagailuaren atzizkia"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Etxeko atzizkia"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Laneko atzizkia"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Mezularitzaren atzizkia"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Fax atzizkia"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mugikorraren atzizkia"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Bideoaren atzizkia"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Postontziaren atzizkia"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modemaren atzizkia"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Kotxearen atzizkia"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN atzizkia"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Bilagailuaren atzizkia"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Ireki terminal lehioa abioan"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Ireki mugikorraren lehioa abioan"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Erakutsi"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositibo mugikorra"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modeloaren informazioa"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modeloa:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serieko zenbakia:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabrikatzailea:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM bertsioa:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Helbide-liburuak"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefonoa"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Irakurri"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Idatzi"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Gorde fitxategira..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinkronizatu"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Egoera"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Bateria-karga:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Seinalearen kalitatea:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Freskatu"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Ezarri ordua"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ezin izan da '%1' blokeo-fitxategia ireki."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ezin izan da '%1' blokeo-fitxategia irakurri."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Ezin izan da PID '%1' fitxategitik eskuratu."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "%1 PID-dun prozesua, dispositiboa blokeatzen ari dena, oraindik martxan "
+#~ "dago."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Ezin izan da existitzen den bloke-fitxategiko PID-ari seinale bat bidali."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ezin da '%1' bloke-fitxategia sortu. Egiaztatu behar diren baimenak "
+#~ "dituzula."
diff --git a/tde-i18n-fa/messages/tdepim/kandy.po b/tde-i18n-fa/messages/tdepim/kandy.po
index 224ee057db8..08b762343bb 100644
--- a/tde-i18n-fa/messages/tdepim/kandy.po
+++ b/tde-i18n-fa/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-01-01 08:01+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,702 +17,662 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "نسیم دانیارزاده"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "daniarzadeh@itland.ir"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "فرمان جدید"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "نشانوند %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "وارد کردن نام پارامتر:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "خطای مودم"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "قطع‌شده"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr " پروندۀ %1 را نتوانست بارگذاری کند"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr " پروندۀ %1 را نتوانست ذخیره کند."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "ونک تلفن همراه"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "اتصال"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "قطع ارتباط"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Profile جدید"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "تغییرات در گزارش %1 ذخیره شود؟"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr " دستگاه مودم %1 را نمی‌توان باز کرد."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "خطای مودم"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "متصل‌شده"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "واسط متوالی"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "کتاب نشانی"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "پنجره‌ها"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "نام"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "فرمان"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "مبنای شانزده"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "افزودن..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "ویرایش..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "اجرا"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "ورودی:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "خروجی:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "نتیجه:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "وارد کردن مقدار برای %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "در حال ارتباط به وسیلۀ تلفن همراه خود."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "نمایش پنجرۀ پایانه"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "نمایش ونک تلفن همراه"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "ونک نمایش داده نشود"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "نام پروندۀ  profile فرمان"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "مودم قطع است."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "مودم اشغال است."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr ""
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "در حال خواندن دفتر راهنمای تلفن همراه..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "در حال نوشتن دفتر راهنمای تلفن همراه..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "دفتر راهنمای تلفن همراه نوشته‌ شد."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "در حال خواندن کتاب نشانی TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "کتاب نشانی TDE خوانده‌ شد."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "کتاب نشانی TDE نوشته‌ شد."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "دفتر راهنمای تلفن همراه خوانده‌ شد."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "مدخل Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "مدخل تلفن همراه:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "ناسازگار بودن مدخلها"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "استفاده از مدخل  Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "استفاده از مدخل تلفن همراه"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "دفترهای راهنمای تلفن همگام‌ شد."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "کتاب نشانی TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "کتاب نشانی TDE )تغییر یافته است("
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "کتاب نشانی TDEدارای تغییرات ذخیره‌نشده می‌باشد."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "تغییرات ذخیره‌نشده"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "دفتر راهنمای تلفن همراه"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "دفتر راهنمای تلفن همراه )تغییر یافته است("
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "دفتر راهنمای تلفن همراه، دارای تغییرات ذخیره‌نشده می‌باشد."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "پایانه"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "قادر به باز کردن دستگاه »%1« نیست. لطفاً، بررسی کنید که مجوز کافی داشته باشید."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr " خرابی در برپایی ارتباط )کد tcgetattr: %1("
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() خراب شد."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "قادر به قفل دستگاه »%1« نیست."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "قادر به باز کردن قفل پروندۀ »%1« نیست."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "قادر به خواندن قفل پروندۀ »%1« نیست."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "قادر نیست شناسۀ فرآیند را از پروندۀ »%1« به دست آورد."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"پردازش به وسیلۀ شناسه فرآیند %1، که در حال قفل دستگاه است، هنوز در حال اجراست."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "قادر به خارج کردن نشانک در شناسۀ فرآیند قفل پروندۀ موجود نیست."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"قادر به ایجاد قفل پروندۀ »%1« نیست. لطفاً، بررسی کنید که مجوز کافی را دارید یا "
-"خیر."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&نمایش‌"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "ویژگیهای فرمان"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "نام:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "رشته:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "نتیجۀ مبنای شانزده"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "موقعیت"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "پارامتر"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "مقدار"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "دستگاه تلفن همراه"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "اطلاعات مدل"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Model:"
-msgstr "مدل:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "شمارۀ متوالی:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "سازنده:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "نسخۀ GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "کتاب نشانیها"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "تلفن"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "خواندن"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "نوشتن"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "ذخیره در پرونده..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "همگام‌سازی"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "وضعیت"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "بار باتری:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "کیفیت نشانک:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx ٪"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "بازآوری"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "تنظیم ساعت"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "دستگاه متوالی"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "میزان علامت در ثانیه"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "قفل فهرست راهنما"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "باز کردن مودم هنگام راه‌اندازی"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "تنظیم خودکار ساعت تلفن همراه، هنگام اتصال"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "استخراج شمارۀ آغازه"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "استخراج شمارۀ کار"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "استخراج شمارۀ پیام"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "استخراج شمارۀ دورنگار"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "استخراج شمارۀ سلول"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "استخراج شماره تلفن ویدیو"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "استخراج شمارۀ نامه‌دان"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "استخراج شمارۀ مودم"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "استخراج شمارۀ تلفن اتومبیل"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "استخراج شمارۀ ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "استخراج شمارۀ پی‌جو"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "استفاده از پسوند آغازه"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "استفاده از پسوند کار"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "استفاده از پسوند پیام"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "استفاده از پسوند دورنگار"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "استفاده از پسوند تلفن همراه"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "استفاده از پسوند ویدیو"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "استفاده از پسوند نامه‌دان"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "استفاده از پسوند مودم"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "استفاده از پسوند اتومبیل"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "استفاده از پسوند  ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "استفاده از پسوند پی‌جو"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "پسوند آغازه"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "پسوند کار"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "پسوند پیام"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "پسوند دورنگار"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "پسوند سلول"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "پسوند ویدیو"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "پسوند نامه‌دان"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "پسوند مودم"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "پسوند اتومبیل"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "پسوند ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "پسوند پی‌جو"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "باز کردن پنجرۀ پایانه هنگام راه‌‌‌‌اندازی"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "باز کردن پنجرۀ تلفن همراه هنگام راه‌‌اندازی"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&نمایش‌"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "دستگاه تلفن همراه"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "اطلاعات مدل"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "مدل:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "شمارۀ متوالی:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr ""
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "سازنده:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "نسخۀ GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "کتاب نشانیها"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "تلفن"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "خواندن"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "نوشتن"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "ذخیره در پرونده..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "همگام‌سازی"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "وضعیت"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "بار باتری:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "کیفیت نشانک:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx ٪"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "بازآوری"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "تنظیم ساعت"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "قادر به باز کردن قفل پروندۀ »%1« نیست."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "قادر به خواندن قفل پروندۀ »%1« نیست."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "قادر نیست شناسۀ فرآیند را از پروندۀ »%1« به دست آورد."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "پردازش به وسیلۀ شناسه فرآیند %1، که در حال قفل دستگاه است، هنوز در حال "
+#~ "اجراست."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "قادر به خارج کردن نشانک در شناسۀ فرآیند قفل پروندۀ موجود نیست."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "قادر به ایجاد قفل پروندۀ »%1« نیست. لطفاً، بررسی کنید که مجوز کافی را "
+#~ "دارید یا خیر."
diff --git a/tde-i18n-fi/messages/tdepim/kandy.po b/tde-i18n-fi/messages/tdepim/kandy.po
index 35bca199a33..1cc200d620b 100644
--- a/tde-i18n-fi/messages/tdepim/kandy.po
+++ b/tde-i18n-fi/messages/tdepim/kandy.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-03-30 13:37+0300\n"
 "Last-Translator: Kim Enkovaara <kim.enkovaara@iki.fi>\n"
 "Language-Team: Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>\n"
@@ -20,705 +20,664 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Marko Grönroos,Ilpo Kantonen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "magi@iki.fi,ilpo@iki.fi"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Uusi komento"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Par %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Anna parametrin nimi:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modeemin virhe"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Yhteys poikki"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Tiedostoa %1 ei voitu ladata"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Tiedostoa %1 ei voitu tallentaa."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Kännykän käyttöliittymä"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Uusi profiili"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Tallennetaanko muutokset profiiliin %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Modeemilaitetta %1 ei voitu avata."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modeemin virhe"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Yhdistetty"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Sarjaporttiyhteys"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Ikkunat"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nimi"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Komento"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heksa"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Lisää..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Suorita"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Syöte:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Tulos:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Tulos:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Anna %1:lle arvo:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikoidaan kännykkäsi kanssa"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Näytä pääteikkuna."
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Näytä käyttöliittymä"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Älä näytä käyttöliittymää"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Komentoprofiilitiedoston nimi"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modeemi on pois päältä."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modeemi on käytössä."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Luetaan kännykän puhelinluetteloa..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Kirjoitetaan kännykän puhelinluetteloa..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Kirjoitettiin kännykän osoitekirja."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Luetaan TDE-osoitekirjaa"
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Luettiin TDE-osoitekirja."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Kirjoitettiin TDE-osoitekirja."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Luettiin kännykän osoitekirja."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab-tiedot:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobiili-tiedot:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Ristiriitaiset merkinnät"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Käytä TDE:n osoitekirjan tietuetta"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Käytä matkapuhelimen merkintää"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Osoitekirjat tahdistettiin."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE:n osoitekirja"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE:n osoitekirja (muutettu)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Osoitekirjassa on tallentamattomia muutoksia"
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Tallentamattomat muutokset"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Matkapuhelimen puhelinluettelo"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Matkapuhelimen puhelinluettelo (muutettu)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Kännykän puhelinluettelossa on tallentamattomia muutoksia."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Pääte"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Ei voitu avata laitetta %1. Tarkasta, että sinulla on tarvittavat oikeudet "
 "laitteeseen."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Kommunikointiasetukset epäonnistuivat (tcgetattr koodi: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() epäonnistui."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Ei voitu lukita laitetta '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Ei voitu avata lukitustiedostoa '%1',"
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Ei voitu lukea lukitustiedostoa '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Ei saatu PID:iä tiedostosta '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Laitteen lukitseva prosessi PID %1 on vielä käynnissä."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Ei voitu lähettää signaalia lukitustiedoston PID:ille."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ei voitu luoda lukitustiedostoa '%1'. Tarkista, että sinulla on tarvittavat "
-"oikeudet."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Näytä"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Komentojen ominaisuudet"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nimi:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Merkkijono:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Tulos heksana"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Sijainti"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametri"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Arvo"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Kännykkälaite"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Mallitiedot"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Malli:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Sarjanumero:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Valmistaja:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-versio:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Osoitekirjat"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Puhelin"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lue"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Kirjoita"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Tallenna tiedostoon..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Tahdista"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Tila"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Akun lataus:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signaalilaatu:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Virkistä"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Aseta kello"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Sarjaporttilaite"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Liikennöintinopeus (baudia)"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Lukitse kansio"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Avaa modeemi käynnistettäessä"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Aseta kännykän kello automaattisesti yhteydenotossa"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Jätä pois kotipuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Jätä pois työpuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Jätä pois halukaitteiden puhelinnumerot"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Jätä pois fax-puhelinnumerot"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Jätä pois matkapuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Jätä pois videopuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Jätä pois postilaatikkopuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Jätä pois modeemipuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Jätä pois autopuhelinnumerot"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Jätä pois IDSN-puhelinnumerot"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Jätä pois hakulaitteen numerot"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Käytä kotipuhelimen merkintää"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Käytä työpuhelimen merkintää"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Käytä hakulaitteen merkintää"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Käytä faxin merkintää"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Käytä matkapuhelimen merkintää"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Käytä videopuhelimen merkintää"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Käytä maililaatikon merkintää"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Käytä modeemin merkintää"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Käytä auton merkintää"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Käytä IDSN:n merkintää"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Käytä hakulaitteen merkintää"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Kotipuhelimen merkintä"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Työpuhelimen merkintä"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Hakulaitteen merkintä"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Faxin merkintä"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Matkapuhelimen merkintä"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Videopuhelimen merkintä"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Postilaatikon merkintä"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modeemin merkintä"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Autopuhelimen merkintä"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN-puhelimen mekinrä"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Hakulaitteen merkintä"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Avaa pääteikkuna käynnistettäessä"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Avaa mobiili-ikkuna käynnistettäessä"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Näytä"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Kännykkälaite"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Mallitiedot"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Malli:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Sarjanumero:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Valmistaja:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-versio:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Osoitekirjat"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Puhelin"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lue"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Kirjoita"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Tallenna tiedostoon..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Tahdista"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Tila"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Akun lataus:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signaalilaatu:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Virkistä"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Aseta kello"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ei voitu avata lukitustiedostoa '%1',"
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ei voitu lukea lukitustiedostoa '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Ei saatu PID:iä tiedostosta '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Laitteen lukitseva prosessi PID %1 on vielä käynnissä."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Ei voitu lähettää signaalia lukitustiedoston PID:ille."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ei voitu luoda lukitustiedostoa '%1'. Tarkista, että sinulla on "
+#~ "tarvittavat oikeudet."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() epäonnistui."
diff --git a/tde-i18n-fr/messages/tdepim/kandy.po b/tde-i18n-fr/messages/tdepim/kandy.po
index 2478e478734..13532b65fc9 100644
--- a/tde-i18n-fr/messages/tdepim/kandy.po
+++ b/tde-i18n-fr/messages/tdepim/kandy.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2008-08-11 19:25+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -27,705 +27,664 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Matthieu Robin,François-Xavier Duranceau,Thibaut Cousin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "kde@macolu.org,duranceau@kde.org,cousin@kde.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nouvelle commande"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argument %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Saisissez le nom du paramètre :"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Problème de modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Déconnecté "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Impossible de charger le fichier « %1 »"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Impossible d'enregistrer le fichier « %1 »."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Interface pour portable"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Se connecter"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nouveau profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Enregistrer les modifications du profil « %1 » ?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Impossible d'ouvrir le périphérique modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Problème de modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Connecté "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interface série"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Fenêtre"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nom"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Commande"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hexa"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Éditer..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Exécuter"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Entrée :"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Sortie :"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Résultat :"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Saisissez une valeur pour %1 :"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Communication avec votre téléphone portable."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Afficher la fenêtre du terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Afficher l'interface pour portable"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ne pas afficher l'interface"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nom du fichier du profil de commande"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Le modem est éteint."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Le modem est occupé."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Lecture du répertoire du portable..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Enregistrement du répertoire du portable..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Répertoire du portable enregistré."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Lecture du carnet d'adresses de TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Carnet d'adresses de TDE lu."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Carnet d'adresses de TDE enregistré."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Répertoire du portable lu."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Entrée de KAB :"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Entrée du portable :"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Entrées en conflit"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Utiliser l'entrée de Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Utiliser l'entrée du portable"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Répertoires synchronisés."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Carnet d'adresses de TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Carnet d'adresses de TDE (modifié)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 "Le carnet d'adresses de TDE contient des modifications non enregistrées."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Modifications non enregistrées"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Répertoire du portable"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Répertoire du portable (modifié)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Le répertoire du portable contient des modifications non enregistrées."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"Impossible d'ouvrir le périphérique « %1 ». Veuillez vérifier que vous avez des "
-"droits d'accès suffisants."
+"Impossible d'ouvrir le périphérique « %1 ». Veuillez vérifier que vous avez "
+"des droits d'accès suffisants."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Échec de la mise en place de la communication (code tcgetattr : %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() a échoué."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Impossible de verrouiller le périphérique « %1 »."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Le fichier verrou « %1 » ne peut être ouvert."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Impossible de lire le fichier verrou « %1 »."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Impossible d'obtenir le PID du fichier « %1 »."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Le processus ayant le PID %1 et verrouillant le périphérique est toujours en "
-"fonctionnement."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Le signal n'a pas pu être envoyé au PID du fichier verrou existant."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Le fichier verrou « %1 » ne peut être créé. Veuillez vérifier que vous avez les "
-"permissions nécessaires."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "Affic&her"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Propriétés de la commande"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nom :"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Chaîne :"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Résultat hexa"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Position"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Paramètre"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valeur"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Périphérique du portable"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informations sur le modèle"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modèle :"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Numéro de série :"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabricant :"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Version GSM :"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Carnets d'adresses"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Téléphone"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lire"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Enregistrer"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Enregistrer dans un fichier..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synchroniser"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "État"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Niveau de charge de la batterie :"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Qualité du signal :"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Rafraîchir"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Régler l'heure"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Périphérique série"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Débit"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Verrouiller le dossier"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Activer le modem au démarrage"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Régler automatiquement l'heure du téléphone à la connexion"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Exclure les numéros personnels"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Exclure les numéros professionnels"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Exclure les numéros de messagerie"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Exclure les numéros de fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Exclure les numéros de portables"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Exclure les numéros de téléphones vidéo"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Exclure les numéros de boîtes aux lettres"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Exclure les numéros de modems"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Exclure les numéros de téléphones de voiture"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Exclure les numéros ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Exclure les numéros de bipeurs"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Utiliser un suffixe personnel"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Utiliser un suffixe professionnel"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Utiliser un suffixe de messagerie"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Utiliser un suffixe de fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Utiliser un suffixe de portable"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Utiliser un suffixe de téléphone vidéo"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Utiliser un suffixe de boîte aux lettres"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Utiliser un suffixe de modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Utiliser un suffixe de voiture"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Utiliser un suffixe ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Utiliser un suffixe de bipeur"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Suffixe personnel"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Suffixe professionnel"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Suffixe de messagerie"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Suffixe de fax"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Suffixe de portable"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Suffixe de téléphone vidéo"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Suffixe de boîte aux lettres"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Suffixe de modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Suffixe de voiture"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Suffixe ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Suffixe de bipeur"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Ouvrir la fenêtre de terminal au démarrage"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Ouvrir la fenêtre du portable au démarrage"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "Affic&her"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Périphérique du portable"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informations sur le modèle"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modèle :"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Numéro de série :"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabricant :"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Version GSM :"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Carnets d'adresses"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Téléphone"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lire"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Enregistrer"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Enregistrer dans un fichier..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synchroniser"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "État"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Niveau de charge de la batterie :"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Qualité du signal :"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Régler l'heure"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Le fichier verrou « %1 » ne peut être ouvert."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Impossible de lire le fichier verrou « %1 »."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Impossible d'obtenir le PID du fichier « %1 »."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Le processus ayant le PID %1 et verrouillant le périphérique est toujours "
+#~ "en fonctionnement."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Le signal n'a pas pu être envoyé au PID du fichier verrou existant."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Le fichier verrou « %1 » ne peut être créé. Veuillez vérifier que vous "
+#~ "avez les permissions nécessaires."
diff --git a/tde-i18n-fy/messages/tdepim/kandy.po b/tde-i18n-fy/messages/tdepim/kandy.po
index 37f962c715e..e7d2d5b649f 100644
--- a/tde-i18n-fy/messages/tdepim/kandy.po
+++ b/tde-i18n-fy/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-03-28 22:55+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Frysk <kde-i18n-fry@kde.org>\n"
@@ -19,553 +19,413 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Douwe"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr " "
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nij kommando"
 
 # arg is neem ik aan een argument bij een commando. verderop is GUI ook volledig vertaald dus afkorting hier dan toch ook?
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parameternamme ynfiere:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem-fout"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Net ferbûn"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Koe triem %1 net lade."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Koe triem %1 net opslaan."
 
 # GUI is verderop wel volledig vertaald.
 # interface net oersetten, stiet net yn de listen
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Grafyske interface fan mobile telefoan"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Ferbine"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Ferbining ferbrekke"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nij profyl"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Wizigings yn profyl %1 opslaan?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "It modem-stasjon %1 koe net iepene wurde."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem-fout"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "Ferbûn"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Seriële interface"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Finsters"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Namme"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Kommando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heks"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Tafoegje..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Bewurkje..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Utfiere"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Ynfier:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Utfier:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Utkomst:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Wearde ynfiere foar %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikaasje mei jo mobile telefoon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminalfinster toane"
 
 # GUI is verderop wel volledig vertaald
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Grafyske ynterface fan mobile telefoan toane"
 
 # voorgaande bericht was volledig dus hier ook 'van mobile telefoon' toegevoegd
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Gjin grafyske interface fan mobile telefoan toane"
 
 # moeten we niet letten op te lange samengestelde woorden? Dit ivm duidelijkheid?
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Triemnamme fan kommandoprofyl"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem stiet út."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem is dwaande"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Dwaande mei it lêzen fan mobile telefoanboek..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Dwaande mei skriuwen nei mobile telefoanboek ..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Telefoanboek fan mobile telefoan opslein."
 
 # dit type bericht wordt voorgaand steeds met 'bezig met...' vertaald
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Dwaande mei lêzen fan TDE-adresboek..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE-adresboek lêzen."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE-adresboek skreaun."
 
 # in ID 41 en 42 wordt dit vertaald met  een voltooide tijd.
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Telefoanboek fan mobile telefoan lêzen."
 
 # KAB volledig vertalen
 # lang samengesteld woord
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Item fan TDE-Adresboek:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Yngong fan mobile telefoan:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Konfliktearjende yngongen"
 
 # KAB volledig vertalen met TDE-adresboek
 # om lange samengestelde woorden te vermijden heb ik er 'item uit' van gemaakt
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Item út TDE-adresboek brûke"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Yngong fan mobile telefoan brûke"
 
 # Syngronisearre is wat oerdreaun Frysk
 # feroarje yni: lyksetten/lykskeakele?
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefoanboeken lykskeakele."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-adresboek"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-adresboek (wizige)"
 
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
 # onopgeslagen.... is dit niet verwarrend? vraagt dit er niet om dat men er overheen leest?
 # voorstel: 'niet-opgeslagen' geeft het gevaar mogelijk duidelijker weer.
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "It TDE-adresboek befettet net-opsleine wizigings."
 
 # onopgeslagen.... is dit niet verwarrend? vraagt dit er niet om dat men er overheen leest?
 # voorstel: 'niet-opgeslagen' geeft het gevaar mogelijk duidelijker weer.
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Net-opsleine wizigings"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefoanboek fan mobile telefoan"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefoanboek fan mobile telefoan (wizige)"
 
 # onopgeslagen.... is dit niet verwarrend? vraagt dit er niet om dat men er overheen leest?
 # voorstel: 'niet-opgeslagen' geeft het gevaar mogelijk duidelijker weer.
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 "It telefoanboek fan de mobile telefoan befettet net-opsleine wizigings."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Stasjon '%1' koe net iepene wurde. Kontrolearje oft jo de fereaske "
 "tagongsrjochten hawwe."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Kommunikaasje-setup is mislearre (tcgetattr code: %1)"
 
 # nietszeggende melding
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "De oanrop tcsetattr() is mislearre."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Koe it apparaat '%1' net skoattelje."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Skoatteltriem '%1' koe net iepene wurde."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Skoatteltriem '%1' koe net lêzen wurde."
-
-# krom nederlands? PID van een bestand lijkt me duidelijker
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "PID fan triem '%1' koe net lêzen wurde."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"It proses mei PID '%1', dat it apparaat skoattelet, draait noch hieltyd."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Der koe gjin sinjaal ferstjoerd wurde nei it proses fan de besteande "
-"skoatteltriem."
-
-# taalvaudt gecorrigeerd
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Skoatteltriem '%1' koe net oanmakke wurde. Kontrolearje oft jo de fereaske "
-"tagongsrjochten hawwe."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Toane"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Kommando-eigenskippen"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Namme:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Tekenrige:"
 
 # elders is Hex ook volledig vertaald
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hexadesimaal-resultaat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posysje"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Wearde"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobyl apparaat"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modelynformaasje"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Searjenûmer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabrikant:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-ferzje:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresboeken"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefoan"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lêze"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skriuwe"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Opslaan nei triem..."
-
-# sjoch eardere opmerking
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Syngr"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batterijlading:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kwaliteit fan sinjaal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Ferfarskje"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Klok ynstelle"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serieel apparaat"
 
 # hat wierskynlik wat te krijen mei fretwinsje
 # Ingelske kreet oanhâlden
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud rate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Map skoattelje"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Modem iepenje by it opstarten"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Klok fan mobyl automatysk ynstelle by ferbining"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Thússnûmers útslute"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Wurknûmers útslute"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Berjochtnûmers útslute"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Faks-nûmers útslute"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Mobile nûmers útslute"
@@ -573,91 +433,78 @@ msgstr "Mobile nûmers útslute"
 # videotelefonie heet in de volksmond 'beeldtelefonie' (als zodanig ook in ziekkenfondspakket ;-))
 # lange samengestelde woorden vermijden
 # streekje der tusken set fanwege de lêsberens
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Byldtelefoan-nûmers útslute"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Postbus-nûmers útslute"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modem-nûmers útslute"
 
 # lange samengestelde woorden
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Autotelefoan-nûmers útslute"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN-nûmers útslute"
 
 # pager = semafoon
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Semafoan-nûmers útslute"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Trochkiesnûmer thús brûke"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Trochkiesnûmer wurk brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Trochkiesnûmer foar berjochten brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Trochkiesnûmer foar faks brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # hier had men het opeens over een voorvoegsel ipv achtervoegsel
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Trochkiesnûmer foar mobile telefoan brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # videotelefonie = beeldtelefonie
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Trochkiesnûmer foar byldtelefoan brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # die postbus... bedoelen ze neit gewoon een voicemailbox? kunnen we dat niet duidelijker maken?
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Trochkiesnûmer foar voicemailbox brûke"
@@ -665,121 +512,233 @@ msgstr "Trochkiesnûmer foar voicemailbox brûke"
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # modem... daaarmee bedoelden ze in mijn tijd de data-verbinding mee.
 # is de vertaling 'data' een alternatief?
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Trochkiesnûmer foar modem brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # autoachtervoegsel; dat is een aanhangwagen ;-) Autotelefoon dus ;-)
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Trochkiesnûmer foar autotelefoan brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Trochkiesnûmer foar ISDN brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # pager = semafoon
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Trochkiesnûmer foar semafoan brûke"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Trochkiesnûmer thús"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Trochkiesnûmer wurk"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Trochkiesnûmer foar berjochten"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Trochkiesnûmer foar faks"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Trochkiesnûmer foar mobile telefoan"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # beeldtelefoon
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Trochkiesnûmer foar byldtelefoan"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Trochkiesnûmer foar voicemailbox"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Trochkiesnûmer foar modem"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Trochkiesnûmer foar autotelefoan"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Trochkiesnûmer foar ISDN"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Trochkiesnûmer foar semafoan"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Terminalfinster iepenje by it opstarten"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Finster fan mobile telefoan iepenje by opstarten"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Toane"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobyl apparaat"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modelynformaasje"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Searjenûmer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabrikant:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-ferzje:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresboeken"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefoan"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lêze"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skriuwe"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Opslaan nei triem..."
+
+# sjoch eardere opmerking
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Syngr"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batterijlading:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kwaliteit fan sinjaal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Ferfarskje"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Klok ynstelle"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Skoatteltriem '%1' koe net iepene wurde."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Skoatteltriem '%1' koe net lêzen wurde."
+
+# krom nederlands? PID van een bestand lijkt me duidelijker
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "PID fan triem '%1' koe net lêzen wurde."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "It proses mei PID '%1', dat it apparaat skoattelet, draait noch hieltyd."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Der koe gjin sinjaal ferstjoerd wurde nei it proses fan de besteande "
+#~ "skoatteltriem."
+
+# taalvaudt gecorrigeerd
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Skoatteltriem '%1' koe net oanmakke wurde. Kontrolearje oft jo de "
+#~ "fereaske tagongsrjochten hawwe."
diff --git a/tde-i18n-ga/messages/tdepim/kandy.po b/tde-i18n-ga/messages/tdepim/kandy.po
index 3660631aaf6..11af37bdfda 100644
--- a/tde-i18n-ga/messages/tdepim/kandy.po
+++ b/tde-i18n-ga/messages/tdepim/kandy.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kandy.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,705 +10,665 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ordú Nua"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Iontráil ainm paraiméadair:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Earráid Mhóideim"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Dínasctha "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Ní féidir an comhad %1 a luchtú"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Ní féidir an comhad %1 a shábháil."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Comhéadan Grafach Soghluaiste"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Nasc"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Dínasc"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Próifíl Nua"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Sábháil athruithe ar phróifíl %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Ní féidir gléas móideim %1 a oscailt."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Earráid Mhóideim"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Nasctha "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Comhéadan Srathach"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Leabhar Seoltaí"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Fuinneoga"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ainm"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Ordú"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heics"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Cuir Leis..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Eagar..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Rith"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Ionchur:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Aschur:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Toradh:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Iontráil luach ar %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Ag dul i dteagmháil le d'fhón póca."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Taispeáin teirminéal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Taispeáin comhéadan grafach soghluaiste"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ná taispeáin comhéadan grafach soghluaiste"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Ainm an chomhaid próifíle ordaithe"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Móideim as."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Móideim gnóthach."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Leabhar fóin póca á léamh..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Leabhar fóin póca á scríobh..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Scríobhadh an leabhar fóin póca."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Leabhar seoltaí TDE á léamh..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Léadh leabhar seoltaí TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Scríobhadh leabhar seoltaí TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Léadh an leabhar fóin póca."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Iontráil Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Iontráil Mhóibíleach:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Iontrálacha Contrártha"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Úsáid Iontráil Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Úsáid Iontráil Mhóibíleach"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Sioncrónaíodh na leabhair fhóin."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Leabhar Seoltaí TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Leabhar Seoltaí TDE (athraithe)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Tá athruithe gan sábháil sa leabhar seoltaí TDE."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Athruithe gan sábháil"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Leabhar Fóin Póca"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Leabhar Fóin Póca (athraithe)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Tá athruithe gan sábháil sa leabhar fóin póca."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Teirminéal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Ní féidir gléas '%1' a oscailt. Féach an bhfuil na ceadanna cuí agat."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Theip ar shocrú cumarsáide (cód tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "theip ar tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Ní féidir gléas '%1' a chur faoi ghlas."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Ní féidir comhad glais '%1' a oscailt."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Ní féidir comhad glais '%1' a léamh."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Níorbh fhéidir aitheantas próisis a fháil ó chomhad '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Tá an próiseas le haitheantas %1, atá ag glasáil an ghléis, ag rith fós."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Níorbh fhéidir comhartha a sheoladh chuig aitheantas an chomhaid glasála atá "
-"ann."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ní féidir comhad glasála '%1' a chruthú. Féach an bhfuil na ceadanna cuí agat."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Taispeáin"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Airíonna an Ordaithe"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ainm:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Teaghrán:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Toradh Heics"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Ionad"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Paraiméadar"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Luach"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Gléas Móibíleach"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Eolas faoin tsamhail"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Samhail:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Sraithuimhir:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Déantóir:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Leagan GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Leabhair Seoltaí"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Fón"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Léigh"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Scríobh"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Sábháil go Comhad..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sionc"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stádas"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Lucht an chadhnra:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Cáilíocht an chomhartha:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Athnuaigh"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Socraigh an Clog"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Gléas srathach"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Ráta bád"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Comhadlann ghlasála"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Oscail an móideim ag am tosaithe"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Socraigh clog an fhóin póca go huathoibríoch ag am nasctha"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Eisiaigh uimhreacha baile"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Eisiaigh uimhreacha oibre"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Eisiaigh uimhreacha curtha teachtaireachtaí"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Eisiaigh uimhreacha facs"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Eisiaigh uimhreacha fón póca"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Eisiaigh uimhreacha fón físe"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Eisiaigh uimhreacha bosca poist"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Eisiaigh uimhreacha móideim"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Eisiaigh uimhreacha fón cairr"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Eisiaigh uimhreacha  ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Eisiaigh uimhreacha glaoire"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Úsáid iarmhír bhaile"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Úsáid iarmhír oibre"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Úsáid iarmhír churtha teachtaireachtaí"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Úsáid iarmhír fhacs"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Úsáid iarmhír fhóin póca"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Úsáid iarmhír fhóin físe"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Úsáid iarmhír bhosca poist"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Úsáid iarmhír mhóideim"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Úsáid iarmhír fhóin cairr"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Úsáid iarmhír ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Úsáid iarmhír ghlaoire"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Iarmhír bhaile"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Iarmhír oibre"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Iarmhír churtha teachtaireachtaí"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Iarmhír fhacs"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Iarmhír fhóin póca"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Iarmhír fhóin físe"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Iarmhír bhosca poist"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Iarmhír mhóideim"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Iarmhír fhóin cairr"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Iarmhír ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Iarmhír ghlaoire"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Oscail teirminéal ag am tosaithe"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Oscail fuinneog mhóibíleach ag am tosaithe"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Taispeáin"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Gléas Móibíleach"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Eolas faoin tsamhail"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Samhail:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Sraithuimhir:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Déantóir:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Leagan GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Leabhair Seoltaí"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Fón"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Léigh"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Scríobh"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Sábháil go Comhad..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sionc"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stádas"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Lucht an chadhnra:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Cáilíocht an chomhartha:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Athnuaigh"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Socraigh an Clog"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ní féidir comhad glais '%1' a oscailt."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ní féidir comhad glais '%1' a léamh."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Níorbh fhéidir aitheantas próisis a fháil ó chomhad '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Tá an próiseas le haitheantas %1, atá ag glasáil an ghléis, ag rith fós."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Níorbh fhéidir comhartha a sheoladh chuig aitheantas an chomhaid glasála "
+#~ "atá ann."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ní féidir comhad glasála '%1' a chruthú. Féach an bhfuil na ceadanna cuí "
+#~ "agat."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "theip ar tcgetattr()."
diff --git a/tde-i18n-gl/messages/tdepim/kandy.po b/tde-i18n-gl/messages/tdepim/kandy.po
index bd5dbb7e077..8997ab530f2 100644
--- a/tde-i18n-gl/messages/tdepim/kandy.po
+++ b/tde-i18n-gl/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-12-30 13:37+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -26,7 +26,7 @@ msgstr ""
 "Máximo Coejo Cores\n"
 "Xabi García"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -34,692 +34,652 @@ msgstr ""
 "maximodutty@terra.es\n"
 "xabigf@gmx.net"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Novo comando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Insira o nome do parámetro:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Erro do Módem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Desconectado"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Non se pode cargar o ficheiro %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Non se puido gardar o ficheiro %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI móbiil"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Conectar"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Novo perfil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Gravar mudanzas ao perfil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Non se pode abrir o dispositivo módem %1"
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Erro do Módem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Conectado "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interface Serie"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Cadernos de Enderezos"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Fiestras"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Comando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Engadir..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Editar..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Executar"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Entrada:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Saida:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultado:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Introduza o valor para %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Comunicando co seu teléfono móbil."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Amosar fiestra de terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Amosar GUI do Móbil"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Non amosar GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nome do ficheiro do perfil dos comandos"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "O módem está apagado."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "O módem está ocupado."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Lendo axenda de teléfonos do móbil..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Escribindo a axenda de teléfonos no móbil..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Escrita a axenda de teléfonos no móvil."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Lendo o caderno de enderezos de TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Ler axenda de enderezos de TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Escrita o caderno de enderezos de TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Ler axenda de teléfonos do móvil."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Entrada de Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Entrada do Móbil:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Conflicto entre entradas"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Usar Entrada de Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Usar Entrada do Móbil"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Sincronizado de axendas de teléfonos."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Caderno de enderezos TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Caderno de enderezos TDE (modificado)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "O caderno de enderezos de TDE contén mudanzas sen se gardar."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Mudanzas sen se gardar"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Caderno de teléfonos do Móbil"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Caderno de teléfonos do Móbil (modificado)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "O caderno de teléfonos do móbil contén mudanzas sen se gardar."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Imposíbel abrir o dispositivo '%1'. Por favor, comprobe que ten suficientes "
 "permisos de escritura."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Fallo a configuración da comunicación (código tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() fallou."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Imposíbel bloquear o dispositivo '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Imposíbel abrir o ficheiro bloqueado '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Imposíbel ler o ficheiro bloqueado '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Imposíbel obter o PID do ficheiro '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"O proceso co PID %1, que está a bloquear o dispositivo, está aínda a se "
-"executar."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Imposíbel emitir o sinal para o PID do ficheiro de bloqueo existente."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Imposíbel crear o ficheiro de bloqueo '%1'. Por favor, comprobe que ten "
-"permisos suficientes."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Amosar"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Propiedades dos comandos"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nome:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Cadea:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Resultado hex"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posición"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parámetro"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositivo Móbil"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Información do modelo"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modelo:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Número de serie:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabricante:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versión GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Cadernos de enderezos"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Teléfono"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Ler"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Escribir"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Gravar a Ficheiro..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sincronizar"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Estado"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Carga da Batería:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Calidade da sinal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Anovar"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Axustar Reloxo"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dispositivo serie"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Razón en baudios"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Cartafol de bloqueo"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Abrir o módem o iniciar"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Autoaxustar o reloxo do móbil na conexión"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Omitir números da casa"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Omitir números do traballo"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Omitir números de mensaxería"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Omitir números de fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Omitir números de celulares"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Omitir números de teléfonos de video"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Omitir números de mailbox"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Omitir números de modem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Omitir números de teléfonos de coches"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Omitir números ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Omitir números de paxinador"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Empregar sufixo da casa"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Empregar sufixo do traballo"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Empregar sufixo de mensaxería"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Empregar sufixo de fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Empregar sufixo de móbil"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Empregar sufixo de video"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Empregar sufixo de mailbox"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Empregar sufixo de modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Empregar sufixo de coche"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Empregar sufixo de ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Empregar sufixo de paxinador"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Sufixo de casa"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Sufixo de traballo"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sufixo de mensaxería"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Sufixo de fax"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Sufixo de celular"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Sufixo de video"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Sufixo de mailbox"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Sufixo de modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Sufixo de coche"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Sufixo de ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Sufixo de paxinador"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Abrir unha fiestra terminal no comezo"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Abrir fiestra do móbil no comezo"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Amosar"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositivo Móbil"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Información do modelo"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modelo:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Número de serie:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabricante:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versión GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Cadernos de enderezos"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Teléfono"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Ler"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Escribir"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Gravar a Ficheiro..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sincronizar"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Estado"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Carga da Batería:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Calidade da sinal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Anovar"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Axustar Reloxo"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Imposíbel abrir o ficheiro bloqueado '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Imposíbel ler o ficheiro bloqueado '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Imposíbel obter o PID do ficheiro '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "O proceso co PID %1, que está a bloquear o dispositivo, está aínda a se "
+#~ "executar."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Imposíbel emitir o sinal para o PID do ficheiro de bloqueo existente."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Imposíbel crear o ficheiro de bloqueo '%1'. Por favor, comprobe que ten "
+#~ "permisos suficientes."
diff --git a/tde-i18n-he/messages/tdepim/kandy.po b/tde-i18n-he/messages/tdepim/kandy.po
index c0b4ceac963..be2329f3154 100644
--- a/tde-i18n-he/messages/tdepim/kandy.po
+++ b/tde-i18n-he/messages/tdepim/kandy.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-08-26 02:35+0300\n"
 "Last-Translator: Diego Iastrubni <elcuco@kde.org>\n"
 "Language-Team: hebrew <kde-il@yahoogroups.com>\n"
@@ -24,698 +24,646 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "צוות התרגום של TDE ישראל"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "kde-il@yahoogroups.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "פקודה חדשה"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "ארגומנט %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "הזן שם פרמטר:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "שגיאה עם המודם"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " מנותק "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "אין אפשרות לטעון את הקובץ %1."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "אין אפשרות לשמור את הקובץ %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "חלון טלפון נייד"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "התחבר"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "התנתק"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "פרופיל חדש"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "האם לשמור את השינויים בפרופיל %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "אין אפשרות לפתוח את התקן המודם %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "שגיאה עם המודם"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " מחובר "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "ממשק טורי"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "פנקס הכתובות"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "חלונות"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "שם"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "פקודה"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "הקס"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "הוספה..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "עריכה..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "הפעל"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "קלט:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "פלט:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "תוצאה:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "הזן ערך עבור %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "ניהול קשר עם הטלפון הנייד שלך."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "          הצג חלון מסוף"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "    הצג חלון טלפון נייד"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "אל תציג ממשק"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "שם הקובץ של פרופיל הפקודות"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "המודם כבוי."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "המודם תפוס."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "קורא את ספר הטלפונים הנייד..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "כותב את ספר הטלפונים הנייד..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "ספר הטלפונים הנייד נכתב."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "קורא את פנקס הכתובות של TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "פנקס הכתובות של TDE נקרא."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "פנקס הכתובות של TDE נכתב."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "ספר הטלפונים הנייד נקרא."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "רשומה של Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "רשומה של הנייד:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "התנגשות בין רשומות"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "השתמש ברשומה של Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "השתמש ברשומה של הנייד"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "ספרי הטלפונים סונכרנו."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "פנקס הכתובות של TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "פנקס הכתובות של TDE (שונה)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "פנקס הכתובות של TDE מכיל שינויים שלא נשמרו."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "שינויים שלא נשמרו"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "ספר טלפונים נייד"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "ספר טלפונים נייד (שונה)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "הטלפון הנייד שלך מכיל שינויים שלא השתנו."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "מסוף"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "אין אפשרות לפתוח את התקן \"%1\". אנא בדוק שיש לך הרשאות מתאימות."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "נכשלה הקריאה אל )(tcsetattr."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "אין אפשרות לנעול את התקן \"%1\"."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "אין אפשרות לפתוח את קובץ נעילה \"%1\"."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "אין אפשרות לקרוא את קובץ נעילה \"%1\"."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "אין אפשרות לקבל את ה־PID מהקובץ \"%1\"."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&תצוגה"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "מאפייני פקודה"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "שם:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "מחרוזת:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "תוצאת הקס"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "מיקום"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "פרמטר"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "ערך"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "התקן נייד"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "פרטי דגם"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "דגם:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "מספר סידורי:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "יצרן:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "גירסת GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "פנקסי כתובות"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "טלפון"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "קרא"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "כתוב"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "שמירה לקובץ..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "סנכרן"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "מצב"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "מטען סוללה:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "איכות אות:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "רענן"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "קבע שעון"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "התקן טורי"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "נעל ספרייה"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "פתח את המודם בעת ההפעלה"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "לא כולל מספרי בתים"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "לא כולל מספרי עבודה"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "לא כולל מספרי הודעות"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "לא כולל מספרי פקס"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "לא כולל מספרים ניידים"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "לא כולל מספרים של וידאופון"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "לא כולל מספרי תיבות דואר"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "לא כולל מספרי מודם"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "לא כולל מספרי טלפון באוטו"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "לא כולל מספרי ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "לא כולל מספרי איתורית"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "פתח את חלון המסוף בעת ההפעלה"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "פתח את חלון הטלפון הנייד בעת ההפעלה"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&תצוגה"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "התקן נייד"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "פרטי דגם"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "דגם:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "מספר סידורי:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "יצרן:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "גירסת GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "פנקסי כתובות"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "טלפון"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "קרא"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "כתוב"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "שמירה לקובץ..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "סנכרן"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "מצב"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "מטען סוללה:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "איכות אות:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "רענן"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "קבע שעון"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "אין אפשרות לפתוח את קובץ נעילה \"%1\"."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "אין אפשרות לקרוא את קובץ נעילה \"%1\"."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "אין אפשרות לקבל את ה־PID מהקובץ \"%1\"."
diff --git a/tde-i18n-hi/messages/tdepim/kandy.po b/tde-i18n-hi/messages/tdepim/kandy.po
index dbc6b6e4fd4..d14ed7c94f7 100644
--- a/tde-i18n-hi/messages/tdepim/kandy.po
+++ b/tde-i18n-hi/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-08-24 10:19+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -14,716 +14,673 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "रविशंकर श्रीवास्तव"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "raviratlami@yahoo.com , http://www.geocities.com/raviratlami/"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "नया कमांड"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "आर्गु.%1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "पैरामीटर नाम भरें:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "मॉडेम त्रुटि"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "डिस्कनेक्टेड"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "फ़ाइल %1 लोड नही कर सका"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "फ़ाइल %1 सहेज नहीं सका."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "मोबाइल जीयूआई"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "कनेक्ट"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "डिस्कनेक्ट"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "नया प्रोफ़ाइल"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "क्या आप परिवर्तनों को प्रोफ़ाइल %1 में सहेजना चाहेंगे?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "मॉडेम उपकरण %1 को खोल नहीं सकता."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "मॉडेम त्रुटि"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "कनेक्टेड"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "सीरियल इंटरफेस"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "पता पुस्तिका"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "विंडोज़"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "नाम"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "कमांड"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "हेक्स"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "जोड़ें..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "संपादन... "
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "चलाएँ"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "इनपुटः"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "आउटपुटः"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "परिणामः"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1 के लिए मान भरें:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "आपके मोबाइल फोन से संचार करने में."
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "टर्मिनल विंडो दिखाएँ."
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "मोबाइल जीयूआई दिखाएँ."
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "जीयूआई न दिखाएँ."
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "कमांड प्रोफ़ाइल फ़ाइल का फ़ाइलनाम."
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "मॉडम बन्द है."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "मॉडम व्यस्त है."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "केंडी"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "मोबाइल फोनबुक पढ़ा जा रहा है..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "मोबाइल फोनबुक लिख रहे..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "मोबाइल फोनबुक लिखा"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "केडीई पता पुस्तिका पढ़ा जा रहा है."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "केडीई पता पुस्तिका पढ़ा जा रहा है."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "केडीई पता पुस्तिका लिख रहे"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "मोबाइल फोनबुक पढ़ा."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "केएबी प्रविष्टिः"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "मोबाइल प्रविष्टिः"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "परस्पर-विरोधी प्रविष्टियाँ"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "केएबी प्रविष्टि इस्तेमाल करें"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "मोबाइल प्रविष्टि इस्तेमाल करें"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "सिंक्ड फोन-पुस्तिकाएँ."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "केडीई पता पुस्तिका"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "केडीई पता पुस्तिका"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "मोबाइल फोन पुस्तिका"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "मोबाइल फोन पुस्तिका"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "टर्मिनल"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
-msgstr ""
-"उपकरण  '%1' खोलने में अक्षम. जाँचें कि आपके पास  पर्याप्त अनुमतियाँ हैं."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
+msgstr "उपकरण  '%1' खोलने में अक्षम. जाँचें कि आपके पास  पर्याप्त अनुमतियाँ हैं."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() असफल"
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "लाक '%1' फ़ाइल पढ़ने में अक्षम."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "लाक '%1' फ़ाइल खोलने में अक्षम."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "लाक '%1' फ़ाइल पढ़ने में अक्षम."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "फ़ाइल '%1' से पीआईडी पाने में अक्षम."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"पीआईडी %1 के साथ प्रक्रिया, जो कि उपकरण को तालाबंद किए है, अभी भी चल रहा है."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "उपलब्ध लॉक फ़ाइल के पीआईडी पर सिग्नल विकीर्ण करने में अक्षम."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"लॉक फ़ाइल '%1' नहीं बना सकता. कृपया जाँचें कि आपके पास पर्याप्त अनुमतियाँ हैं."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "दिखाएँ (&S)"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "कमांड गुण"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "नाम:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "स्ट्रिंगः"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "हेक्स परिणाम:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "स्थिति"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "पेरामीटर"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "मान"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "मोबाइल उपकरण"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "मोबाइल जानकारी"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "मॉडलः"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "सरल क्रमांक:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "उत्पादक:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "जीएसएम संस्करण:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "पता पुस्तिका"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "दूरभाष"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Read"
-msgstr "पढ़ें"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "लिखें"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "फ़ाइल में सहेजें..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "सिंक"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "स्थिति"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "बैटरी चार्जः"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "सिग्नल विशेषताः"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "ताज़ा करें"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "सीरियल उपकरण"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "शुरूआत में मॉडेम खोलें"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "मोबाइल प्रविष्टि इस्तेमाल करें"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "मॉडम बन्द है."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "शुरूआत में टर्मिनल विंडो खोलें"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "शुरूआत में मोबाइल विंडो खोलें"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "दिखाएँ (&S)"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "मोबाइल उपकरण"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "मोबाइल जानकारी"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "मॉडलः"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "सरल क्रमांक:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "उत्पादक:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "जीएसएम संस्करण:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "पता पुस्तिका"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "दूरभाष"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "पढ़ें"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "लिखें"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "फ़ाइल में सहेजें..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "सिंक"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "स्थिति"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "बैटरी चार्जः"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "सिग्नल विशेषताः"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "ताज़ा करें"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "लाक '%1' फ़ाइल खोलने में अक्षम."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "लाक '%1' फ़ाइल पढ़ने में अक्षम."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "फ़ाइल '%1' से पीआईडी पाने में अक्षम."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "पीआईडी %1 के साथ प्रक्रिया, जो कि उपकरण को तालाबंद किए है, अभी भी चल रहा है."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "उपलब्ध लॉक फ़ाइल के पीआईडी पर सिग्नल विकीर्ण करने में अक्षम."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr "लॉक फ़ाइल '%1' नहीं बना सकता. कृपया जाँचें कि आपके पास पर्याप्त अनुमतियाँ हैं."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() असफल"
 
diff --git a/tde-i18n-hr/messages/tdepim/kandy.po b/tde-i18n-hr/messages/tdepim/kandy.po
index 6fb5064c012..af8b018292b 100644
--- a/tde-i18n-hr/messages/tdepim/kandy.po
+++ b/tde-i18n-hr/messages/tdepim/kandy.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy 0\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-04-20 13:21+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,748 +12,707 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Jerko Škifić"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "lokalizacija@linux.hr"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nova naredba"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, fuzzy, c-format
 msgid "Arg %1"
 msgstr "Arg. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 #, fuzzy
 msgid "Enter parameter name:"
 msgstr "Unesite ime parametra:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemska greška"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "Odspojen"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, fuzzy, c-format
 msgid "Could not load file %1"
 msgstr "Nisam mogao da učitam datoteka %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr ""
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 #, fuzzy
 msgid "Mobile GUI"
 msgstr "GUI mobilnog"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Spoji"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Novi profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 #, fuzzy
 msgid "Save changes to profile %1?"
 msgstr "Da li da snimim izmjene profila %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, fuzzy, c-format
 msgid "Cannot open modem device %1."
 msgstr "Ne mogu otvoriti modemski uređaj %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 #, fuzzy
 msgid "Modem Error"
 msgstr "Modemska greška"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "Spojen"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 #, fuzzy
 msgid "Serial Interface"
 msgstr "Serijski interfejs"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresari"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Windows"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Naredba"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Izvrši"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Upis"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 #, fuzzy
 msgid "Output:"
 msgstr "Izlaz:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Rezultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 #, fuzzy
 msgid "Enter value for %1:"
 msgstr "Unesite vrijednost za %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Komuniciranje sa vašim mobilnim telefonom."
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Pokaži prozor terminala."
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Pokaži GUI mobilnog."
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Ime datotekaa sa profilom naredbi."
 
-#: main.cpp:69
+#: src/main.cpp:69
 #, fuzzy
 msgid "Modem is off."
 msgstr "Modem je isključen."
 
-#: main.cpp:74
+#: src/main.cpp:74
 #, fuzzy
 msgid "Modem is busy."
 msgstr "Modem je zauzet."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy "
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 #, fuzzy
 msgid "Reading mobile phonebook..."
 msgstr "Čitam telefonski iizbornikk mobilnog..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 #, fuzzy
 msgid "Writing mobile phonebook..."
 msgstr "Zapisujem telefonski iizbornikk mobilnog..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 #, fuzzy
 msgid "Wrote mobile phonebook."
 msgstr "Zapisan je telefonski iizbornikk mobilnog."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Pročitan je TDE-ov adresar."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 #, fuzzy
 msgid "Read TDE address book."
 msgstr "Pročitan je TDE-ov adresar."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Zapisan je TDE-ov adresar."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 #, fuzzy
 msgid "Read mobile phonebook."
 msgstr "Pročitan je telefonski iizbornikk mobilnog."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 #, fuzzy
 msgid "Kab Entry:"
 msgstr "Kab stavka:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 #, fuzzy
 msgid "Mobile Entry:"
 msgstr "Stavka mobilnog:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 #, fuzzy
 msgid "Conflicting Entries"
 msgstr "Stavke u konfliktu"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 #, fuzzy
 msgid "Use Kab Entry"
 msgstr "Koristi Kab stavku"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 #, fuzzy
 msgid "Use Mobile Entry"
 msgstr "Koristi stavku mobilnog"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 #, fuzzy
 msgid "Synced phonebooks."
 msgstr "Telefonski iizbornikci su sinhronizovani."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, fuzzy, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-ov adresar"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "TDE-ov adresar"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, fuzzy, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonski iizbornikk mobilnog"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonski iizbornikk mobilnog"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 #, fuzzy
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Ne mogu otvoriti uređaj „%1“. Provjerite da li imate dovoljne dozvole za to."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 #, fuzzy
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() nije uspio."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Ne mogu da pročitam datoteka za zaključavanje „%1“."
 
-#: modem.cpp:301
-#, fuzzy
-msgid "Unable to open lock file '%1'."
-msgstr "Ne mogu otvoriti datoteka za zaključavanje „%1“."
-
-#: modem.cpp:309
-#, fuzzy
-msgid "Unable to read lock file '%1'."
-msgstr "Ne mogu da pročitam datoteka za zaključavanje „%1“."
-
-#: modem.cpp:319
-#, fuzzy
-msgid "Unable to get PID from file '%1'."
-msgstr "Ne mogu da dobavim PID iz datotekaa „%1“."
-
-#: modem.cpp:325
-#, fuzzy
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces sa PID-om %1, koji je zaključao uređaj, i dalje radi."
-
-#: modem.cpp:331
-#, fuzzy
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Ne mogu da emitujem signal PID-u postojećeg datotekaa za zaključavanje."
-
-#: modem.cpp:337
-#, fuzzy
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ne mogu napraviti datoteka za zaključavanje „%1“. Provjerite da li imate "
-"dovoljne dozvole."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "Pri&kaži"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Osnovna svojstva"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, fuzzy, no-c-format
 msgid "String:"
 msgstr "Niz:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, fuzzy, no-c-format
 msgid "Hex result"
 msgstr "Heks. rezultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Položaj"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametar"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Vrijednost"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilni uređaj"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, fuzzy, no-c-format
-msgid "Model Information"
-msgstr "Informacije o modelu"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serijski broj:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Proizvođač:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, fuzzy, no-c-format
-msgid "GSM version:"
-msgstr "GSM inačica:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresari"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Čitaj"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Zapisivanje"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Spremi u datoteku..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sinhroniziraj"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, fuzzy, no-c-format
-msgid "Battery charge:"
-msgstr "Popunjenost baterije:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, fuzzy, no-c-format
-msgid "Signal quality:"
-msgstr "Kvalitetu signala:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, fuzzy, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Osvježi"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serijski uređaj"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, fuzzy, no-c-format
 msgid "Open modem on startup"
 msgstr "Otvori modem po pokretanju"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Koristi stavku mobilnog"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Modem je isključen."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, fuzzy, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Otvori prozor terminala po pokretanju"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, fuzzy, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Otvori prozor mobilnog po pokretanju"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "Pri&kaži"
+
+#: src/mobilegui_base.ui:16
+#, fuzzy, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilni uređaj"
+
+#: src/mobilegui_base.ui:41
+#, fuzzy, no-c-format
+msgid "Model Information"
+msgstr "Informacije o modelu"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serijski broj:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Proizvođač:"
+
+#: src/mobilegui_base.ui:113
+#, fuzzy, no-c-format
+msgid "GSM version:"
+msgstr "GSM inačica:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresari"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Čitaj"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Zapisivanje"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Spremi u datoteku..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinhroniziraj"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, fuzzy, no-c-format
+msgid "Battery charge:"
+msgstr "Popunjenost baterije:"
+
+#: src/mobilegui_base.ui:413
+#, fuzzy, no-c-format
+msgid "Signal quality:"
+msgstr "Kvalitetu signala:"
+
+#: src/mobilegui_base.ui:429
+#, fuzzy, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Osvježi"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ne mogu otvoriti datoteka za zaključavanje „%1“."
+
+#, fuzzy
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ne mogu da pročitam datoteka za zaključavanje „%1“."
+
+#, fuzzy
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Ne mogu da dobavim PID iz datotekaa „%1“."
+
+#, fuzzy
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces sa PID-om %1, koji je zaključao uređaj, i dalje radi."
+
+#, fuzzy
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Ne mogu da emitujem signal PID-u postojećeg datotekaa za zaključavanje."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ne mogu napraviti datoteka za zaključavanje „%1“. Provjerite da li imate "
+#~ "dovoljne dozvole."
+
 #, fuzzy
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() nije uspio."
diff --git a/tde-i18n-hu/messages/tdepim/kandy.po b/tde-i18n-hu/messages/tdepim/kandy.po
index 99dadbb6e89..340b5243673 100644
--- a/tde-i18n-hu/messages/tdepim/kandy.po
+++ b/tde-i18n-hu/messages/tdepim/kandy.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2008-01-02 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,702 +12,662 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Szántó Tamás"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "tszanto@interware.hu"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Új parancs"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "%1. argumentum"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Adja meg a paraméter nevét:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemhiba"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Nincs kapcsolat "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "A(z) %1 fájl betöltése nem sikerült."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "A(z) %1 fájlt nem sikerült elmenteni."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "A mobil kezelőfelülete"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Csatlakozás"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Leválasztás"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Új profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Elmentsem a változásokat a(z) %1 profilba?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "A(z) %1 modemeszköz megnyitása nem sikerült."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemhiba"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Csatlakozva "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Soros felület"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Ablakok"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Név"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Parancs"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hexa"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Hozzáadás..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Szerkesztés..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Végrehajtás"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Bemenet:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Kimenet:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Eredmény:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Adja meg %1 értékét:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikáció folyik a mobiltelefonnal."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminálablak megjelenítése"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mobiltelefon-kezelőfelület megjelenítése"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ne jelenjen meg grafikus felület"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "A parancsprofil fájlneve"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "A modem ki van kapcsolva."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "A modem foglalt."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "A mobiltelefon címjegyzékének beolvasása..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "A mobiltelefon címjegyzékének mentése..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "A mobil címjegyzékének mentése megtörtént."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "A TDE címjegyzék beolvasása..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "A TDE címjegyzék beolvasása megtörtént."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Adatok lettek kiírva a TDE címjegyzékbe."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "A mobil címjegyzékének beolvasása megtörtént."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "A TDE-ben található bejegyzés:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "A mobilban található bejegyzés:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Ütköző bejegyzések"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "A TDE-ben található cím használata"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "A mobilban található cím használata"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "A címjegyzékek szinkronizálása megtörtént."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE címjegyzék"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE címjegyzék (módosítva)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "A TDE címjegyzék nem mentett módosításokat tartalmaz."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Nem mentett módosítások"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "A mobil címjegyzéke"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "A mobil címjegyzéke (módosítva)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "A mobil címjegyzéke nem mentett módosításokat tartalmaz."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminál"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Nem sikerült megnyitni a(z) '%1' eszközt. Ellenőrizze, hogy megfelelőek-e a "
 "jogosultságok."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "A kommunikációt nem sikerült beállítani (tcgetattr-kód: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Egy tcsetattr() függvényhívás nem sikerült."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Nem sikerült zárolni ezt az eszközt: '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Nem sikerült megnyitni a(z) '%1' zárolási fájlt."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Nem sikerült olvasni a(z) '%1' zárolási fájlból."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Nem sikerült beolvasni a folyamatazonosítót a(z) '%1' fájlból."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Az eszközt zároló, %1 azonosítójú folyamat még fut."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Nem sikerült szignált küldeni a zárolási fájlban jelzett folyamatnak."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Nem sikerült létrehozni a(z) '%1' nevű zárolási fájlt. Ellenőrizze, hogy "
-"megfelelőek-e a jogosultságok."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Megjelenítés"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Parancsjellemzők"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Név:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Sztring:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hexa eredmény"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozíció"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Paraméter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Érték"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobileszköz"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modelljellemzők"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modell:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Sorozatszám:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Gyártó:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM verzió:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Címjegyzékek"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Beolvasás"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Írás"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Mentés fájlba..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Szinkronizálás"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Állapot"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "A feltöltöttség szintje:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "A jel minősége:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Frissítés"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Az óra beállítása"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Soros eszköz"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Átviteli sebesség"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "A címjegyzék lezárása"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "A modem megnyitása induláskor"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Az óra automatikus beállítása csatlakozás után"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Az otthoni számok kihagyása"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "A munkahelyi számok kihagyása"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Az üzenetküldési számok kihagyása"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "A faxszámok kihagyása"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "A mobilszámok kihagyása"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "A videotelefon-számok kihagyása"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "A postafiók-számok kihagyása"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "A modemszámok kihagyása"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Az autótelefon-számok kihagyása"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Az ISDN-számok kihagyása"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "A csipogószámok kihagyása"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Az otthoni utótag használata"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "A munkahelyi utótag használata"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Az üzenetküldés utótag használata"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "A fax utótag használata"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "A mobil utótag használata"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "A videó utótag használata"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "A postafiók utótag használata"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "A modem utótag használata"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Az autó utótag használata"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Az ISDN utótag használata"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "A csipogó utótag használata"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Az otthoni szám utótagja"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "A munkahelyi szám utótagja"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Üzenetküldési utótag"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "A fax utótagja"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "A mobil utótagja"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "A videotelefon utótagja"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "A postafiók utótagja"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "A modem utótagja"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Az autótelefon utótagja"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Az ISDN utótagja"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "A csipogó utótagja"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Terminálablak megnyitása induláskor"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "A mobil ablakának megnyitása induláskor"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Megjelenítés"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobileszköz"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modelljellemzők"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modell:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Sorozatszám:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Gyártó:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM verzió:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Címjegyzékek"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Beolvasás"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Írás"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Mentés fájlba..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Szinkronizálás"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Állapot"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "A feltöltöttség szintje:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "A jel minősége:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Frissítés"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Az óra beállítása"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Nem sikerült megnyitni a(z) '%1' zárolási fájlt."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Nem sikerült olvasni a(z) '%1' zárolási fájlból."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Nem sikerült beolvasni a folyamatazonosítót a(z) '%1' fájlból."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Az eszközt zároló, %1 azonosítójú folyamat még fut."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Nem sikerült szignált küldeni a zárolási fájlban jelzett folyamatnak."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Nem sikerült létrehozni a(z) '%1' nevű zárolási fájlt. Ellenőrizze, hogy "
+#~ "megfelelőek-e a jogosultságok."
diff --git a/tde-i18n-is/messages/tdepim/kandy.po b/tde-i18n-is/messages/tdepim/kandy.po
index c62a63ee357..f76f32f7c99 100644
--- a/tde-i18n-is/messages/tdepim/kandy.po
+++ b/tde-i18n-is/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-08-26 02:57+0000\n"
 "Last-Translator: Þröstur Svanbergsson <throstur@bylur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -16,711 +16,671 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Pjetur G. Hjaltason"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "pjetur@pjetur.net"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ný skipun"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Breyta %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Sláðu inn nafn breytu:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Mótaldsvilla"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Aftengdur"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Gat ekki lesið skrá %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Gat ekki skrifað skrá %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Grafiskt farsíma viðmót"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Tengjast"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Aftengja"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nýtt snið"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Vista breytingar á sniði %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Get ekki opnað mótald %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Mótaldsvilla"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Tengdur "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serial tengi"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Vistfangaskrár"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Gluggar"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nafn"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Skipun"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Bæta við..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Breyta..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Keyra"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Inntak:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Úttak:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Niðurstaða:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Gefið gildi fyrir %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Tengist farsímanum þínum"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Sýna skjáglugga"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Sýna farsímaviðmót"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ekki sýna viðmót"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Skráarnafn skipanasniðs"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Slökkt á mótaldi."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Mótald er upptekið."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Les símaskrá úr farsíma..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Skrifa símaskrá í farsíma..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Skrifaði í símaskrá farsíma."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Les vistfangaskrá TDE."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Les vistfangaskrá TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Skrifaði í vistfangaskrá TDE"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Lesa símaskrá farsíma."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab færsla:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Farsíma færsla:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Færslum ber ekki saman"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Nota frá Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Nota frá farsíma"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Samræmdi símaskrár."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Vistfangaskrá TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "Vistfangaskrá TDE"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Farsímaskrá"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Farsímaskrá"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Skjár"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Gat ekki opnað tæki '%1'. Atugaðu hvort þú hefur nægilegar aðgangsheimildir."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Aðgerð mistókst (tcsetattr)."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Get ekki lesið læsingarskrá '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Get ekki opnað læsingarskrá '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Get ekki lesið læsingarskrá '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Get ekki lesið PID úr skrá '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Forrit sem er að vinna með tækið (PID '%1') er enn keyrandi."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Get ekki sent signal til forrits í núverandi læsingarskrá."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Get ekki læst skrá '%1'. Athugaðu hvort þú hefur nægilegar aðgangsheimildir"
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Sýna"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Eiginleikar skipunar"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nafn:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Strengur:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex gildi"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Staða"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Viðfang"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Gildi"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Farsími"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Upplýsingar um farsíma"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Tegund:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Raðnúmer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Framleiðandi:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM útgáfa:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Vistfangaskrár"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Sími"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lesa"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skrifa"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Vista í skrá"
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Samræma"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Staða"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Hleðsla rafhlöðu:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Styrkur merkis"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Endurlesa"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serial tæki"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Opna mótald við ræsingu"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Nota frá farsíma"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Slökkt á mótaldi."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Opna skjáglugga við ræsingu"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Opna Farsímaglugga við ræsingu"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Sýna"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Farsími"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Upplýsingar um farsíma"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Tegund:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Raðnúmer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Framleiðandi:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM útgáfa:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Vistfangaskrár"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Sími"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lesa"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skrifa"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Vista í skrá"
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Samræma"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Staða"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Hleðsla rafhlöðu:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Styrkur merkis"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Endurlesa"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Get ekki opnað læsingarskrá '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Get ekki lesið læsingarskrá '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Get ekki lesið PID úr skrá '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Forrit sem er að vinna með tækið (PID '%1') er enn keyrandi."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Get ekki sent signal til forrits í núverandi læsingarskrá."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Get ekki læst skrá '%1'. Athugaðu hvort þú hefur nægilegar "
+#~ "aðgangsheimildir"
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "Aðgerð mistókst (tcgetattr)."
 
diff --git a/tde-i18n-it/messages/tdepim/kandy.po b/tde-i18n-it/messages/tdepim/kandy.po
index 66202bbe334..1fc8053f02a 100644
--- a/tde-i18n-it/messages/tdepim/kandy.po
+++ b/tde-i18n-it/messages/tdepim/kandy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-09-25 15:16+0200\n"
 "Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -18,703 +18,663 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Nicola Ruggero,Alessandro Pasotti,Federico Cozzi"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "nicola@nxnt.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nuovo comando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argomento %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Immetti il nome del parametro:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Errore del modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Disconnesso "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Impossibile caricare il file %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Impossibile salvare il file %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI del cellulare"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Connetti"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nuovo profilo"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Salvo le modifiche al profilo %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Impossibile aprire il dispositivo modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Errore del modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Connesso "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interfaccia seriale"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Rubrica indirizzi"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Finestre"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Comando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Esadecimale"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Esegui"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Input:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Output:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Risultato:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Immetti il valore di %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Comunicazione con il cellulare in corso."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Mostra la finestra di terminale"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mostra la GUI del cellulare"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Non mostrare la GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nome file del file profilo comandi"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Il modem è spento."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Il modem è occupato."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Lettura della rubrica del cellulare..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Scrittura della rubrica del cellulare..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Rubrica del cellulare scritta."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Lettura rubrica di TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Lettura rubrica di TDE completata."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Scrittura rubrica di TDE completata."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Rubrica del cellulare letta."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Usa la voce di Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Usa la voce del cellulare:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Voci in conflitto"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Usa la voce di Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Usa la voce del cellulare"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Rubriche sincronizzate."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Rubrica indirizzi di TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Rubrica indirizzi di TDE (modificata)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "La rubrica di TDE contiene modifiche non salvate."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Cambiamenti non salvati"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Rubrica del cellulare"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Rubrica del cellulare (modificata)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "La rubrica del cellulare contiene modifiche non salvate."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminale"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Impossibile aprire il dispositivo \"%1\". Per favore controlla di avere i "
 "permessi necessari."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Impostazione comunicazione non riuscita (codice tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() non riuscito."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Impossibile bloccare il dispositivo \"%1\"."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Impossibile aprire il file lock \"%1\"."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Impossibile leggere il file lock \"%1\"."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Impossibile leggere il PID dal file \"%1\"."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Il processo con PID \"%1\", che sta bloccando il dispositivo è ancora attivo."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Impossibile emettere un segnale al PID del file lock esistente."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Impossibile creare il file lock \"%1\". Per favore controlla di avere i "
-"permessi necessari."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Mostra"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Proprietà comando"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nome:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Stringa:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Risultato esadecimale"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posizione"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametro"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valore"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositivo cellulare"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informazioni modello"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modello:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Numero di serie:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Produttore:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versione GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Rubriche indirizzi"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefono"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Leggi"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Scrivi"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Salva su file..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sincronizza"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stato"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Carica della batteria:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Qualità del segnale:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Aggiorna"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Imposta orario"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dispositivo seriale"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Velocità baud"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Blocca directory"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Apri il modem all'avvio del programma"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Regola automaticamente l'ora del cellulare alla connessione"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Escludi i numeri di casa"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Escludi i numeri di lavoro"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Escludi i numeri di messaggistica"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Escludi i numeri di fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Escludi i numeri di cellulare"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Escludi i numeri di videotelefoni"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Escludi i numeri di caselle di posta"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Escludi i numeri di modem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Escludi i numeri di telefono automobile"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Escludi i numeri di ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Escludi i numeri di cercapersone"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Usa il suffisso di casa"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Usa il suffisso di lavoro"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Usa il suffisso di messaggistica"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Usa il suffisso di fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Usa il suffisso di cellulare"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Usa il suffisso di videotelefono"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Usa il suffisso di casella di posta"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Usa il suffisso di modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Usa il suffisso di telefono automobile"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Usa il suffisso di ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Usa il suffisso di cercapersone"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Suffisso di Casa"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Suffisso di Lavoro"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Suffisso di Messaggistica"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Suffisso di Fax"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Suffisso di Cellulare"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Suffisso di Videotelefono"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Suffisso di Casella di posta"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Suffisso di Modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Suffisso di Telefono automobile"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Suffisso di ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Suffisso di Cercapersone"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Apri la finestra del terminale all'avvio"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Apri la finestra del cellulare all'avvio"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Mostra"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositivo cellulare"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informazioni modello"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modello:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Numero di serie:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Produttore:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versione GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Rubriche indirizzi"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefono"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Leggi"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Scrivi"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Salva su file..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sincronizza"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stato"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Carica della batteria:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Qualità del segnale:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Imposta orario"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Impossibile aprire il file lock \"%1\"."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Impossibile leggere il file lock \"%1\"."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Impossibile leggere il PID dal file \"%1\"."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Il processo con PID \"%1\", che sta bloccando il dispositivo è ancora "
+#~ "attivo."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Impossibile emettere un segnale al PID del file lock esistente."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Impossibile creare il file lock \"%1\". Per favore controlla di avere i "
+#~ "permessi necessari."
diff --git a/tde-i18n-ja/messages/tdepim/kandy.po b/tde-i18n-ja/messages/tdepim/kandy.po
index 7b928a46c20..6cb7c61c801 100644
--- a/tde-i18n-ja/messages/tdepim/kandy.po
+++ b/tde-i18n-ja/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-03-13 22:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -18,698 +18,658 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Noboru Sinohara,Shinichi Tsunoda"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "shinobo@leo.bekkoame.ne.jp,tsuno@ngy.1st.ne.jp"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "新規コマンド"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "引数 %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "パラメータ名を入力:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "モデムエラー"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " 接続されていません "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "ファイル %1 を読み込めませんでした"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "ファイル %1 を保存できませんでした。"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "モバイル GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "接続"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "切断"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "新規プロファイル"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "プロファイル %1 の変更を保存しますか？"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "モデム装置 %1 を開けません。"
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "モデムエラー"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " 接続済み "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "シリアルインターフェース"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "名前"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "コマンド"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "16 進"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "追加..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "編集..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "実行"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "入力:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "出力:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "結果:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1 の値を入力:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "携帯電話との通信。"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "ターミナルウィンドウを表示"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "モバイル GUI を表示"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "GUI を表示しない"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "コマンド プロファイル ファイルのファイル名"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "モデムはオフです。"
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "モデムはビジーです。"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "携帯電話の電話帳を読み込み中..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "携帯電話の電話帳を書き込み中..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "携帯電話の電話帳に書き出す。"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE アドレス帳を読み込み..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE アドレス帳を読み込む。"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE アドレス帳に書き出す"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "携帯電話の電話帳を読む。"
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab エントリ:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "モバイルエントリ:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "衝突するエントリ"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Kab エントリを使う"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "モバイルエントリを使う"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "同期した電話帳。"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE アドレス帳"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE アドレス帳 (修正済)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE アドレス帳に未保存の変更が含まれます。"
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "未保存の変更"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "携帯電話の電話帳"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "携帯電話の電話帳 (修正済)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "携帯電話には未保存の変更が含まれます。"
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "ターミナル"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "デバイス %1 を開けません。十分な権限があるか確認してください。"
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "通信セットアップ失敗 (tcgetattr code: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() 失敗。"
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "デバイス %1 をロックできません。"
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "ロックファイル %1 を開けません。"
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "ロックファイル %1 を読み込めません。"
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "ファイル %1 から PID を取得できません。"
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "デバイスをロックしている PID %1 プロセスが依然動いています。"
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "既存のロックファイルを持つ PID に対しシグナルを発行できません。"
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "ロックファイル %1 を作成できません。十分な権限があるか確認してください。"
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "表示(&S)"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "コマンドプロパティ"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "名前:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "文字列:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "16 進値結果"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "位置"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "パラメータ"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "値"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "モバイルデバイス"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "モデル情報"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "モデル:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "シリアル番号:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "製造者:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM バージョン:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "アドレス帳"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "電話"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "読み込み"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "書き込み"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "ファイルに保存..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "同期"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "状況"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "バッテリ充電:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "信号特性:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "更新"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "時刻を設定"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "シリアルデバイス"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "通信速度"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "ディレクトリをロック"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "起動時にモデムを開く"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "接続時にモバイルの時刻を自動設定する"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "自宅の電話番号を除く"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "仕事場の電話番号を除く"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "メッセージング番号を除く"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "ファクス番号を除く"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "携帯電話の番号を除く"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "ビデオ電話の番号を除く"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "メールボックスの番号を除く"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "モデムの番号を除く"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "自動車電話の番号を除く"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN 番号を除く"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "ポケベルの番号を除く"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "自宅のサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "仕事場のサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "メッセージングのサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "ファクスサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "モバイルサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "ビデオサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "メールボックスサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "モデムサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "自動車電話サフィックスを使用"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN のサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "ポケベルのサフィックスを使用"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "自宅のサフィックス"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "仕事場のサフィックス"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "メッセージングサフィックス"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "ファクスのサフィックス"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "携帯電話のサフィックス"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "ビデオサフィックス"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "メールボックスサフィックス"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "モデムサフィックス"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "自動車電話のサフィックス"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN のサフィックス"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "ポケベルのサフィックス"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "起動時にターミナルウィンドウを開く"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "起動時にモバイルウィンドウを開く"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "表示(&S)"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "モバイルデバイス"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "モデル情報"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "モデル:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "シリアル番号:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "製造者:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM バージョン:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "アドレス帳"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "電話"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "読み込み"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "書き込み"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "ファイルに保存..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "同期"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "状況"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "バッテリ充電:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "信号特性:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "更新"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "時刻を設定"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "ロックファイル %1 を開けません。"
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "ロックファイル %1 を読み込めません。"
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "ファイル %1 から PID を取得できません。"
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "デバイスをロックしている PID %1 プロセスが依然動いています。"
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "既存のロックファイルを持つ PID に対しシグナルを発行できません。"
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "ロックファイル %1 を作成できません。十分な権限があるか確認してください。"
diff --git a/tde-i18n-kk/messages/tdepim/kandy.po b/tde-i18n-kk/messages/tdepim/kandy.po
index c443ea761d8..66cbfaf5318 100644
--- a/tde-i18n-kk/messages/tdepim/kandy.po
+++ b/tde-i18n-kk/messages/tdepim/kandy.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-04-15 16:18+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -15,700 +15,660 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Сайран Киккарин"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "sairan@computer.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Жаңа команда"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Арг %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Параметр атауын келтіріңіз:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Модем қатесі"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Ажыратылған "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 файлы жүктелмеді"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "%1 файлы сақталмады."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Қалта телефонының графикалық интерфейсі"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Қосылу"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Ажырату"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Жаңа профилі"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Өзгерістер %1 профиліне сақталсын ба?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "%1 модем құрылғысы ашылмады."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Модем қатесі"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Қосылды "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Тізбекті интерфейсі"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Адрес кітапшасы"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Терезелер"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Атауы"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Команда"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Оналтылық"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Қосу..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Өңдеу..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Орындау"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Кірісі:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Шығысы:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Нәтижесі:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1 мәнін келтіріңіз:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Қалта телефоныңызбен байланыс құру."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Терминал терезесін көрсету"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Телефонның интерфейсін көрсету"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Телефонның интерфейсін көрсетпеу"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Командалар профилінің файл атауы"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модем сөндірулі."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модем істе."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Қалта телефонының кітапшасын оқу..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Қалта телефонының кітапшасына жазу..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Қалта телефонының кітапшасы жазылды."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE адрестік кітапшасын оқу..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE адрестік кітапшасы оқылды."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE адрестік кітапшасы жазылды."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Телефонның кітапшасы оқылды."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "TDE адр.кітапшаның жазуы:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Телефондағы жазу:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Қайшылы жазулар"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "TDE адр.кітапшасынан алу"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Телефондағыны алу"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Кітапшалар қадамдастырылды."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE адрестік кітапшасы"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE адрестік кітапшасы (өзгертілген)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE адрестік кітапшасында сақталмаған өзгерістер бар."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Сқаталмаған өзгерістер"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Қалта телефон кітапшасы"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Қалта телефон кітапшасы (өзгертілген)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Қалта телефон кітапшасында сақталмаған өзгерістер бар."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "'%1' құрылғысы ашылмады. Жеткілікті рұқсаттарға ие екеніңізді тексеріңіз."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Байланыс баптау жаңылысы (tcgetattr коды: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() жаңылысы."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "'%1' құрылғысын бұғаттауы болмады."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "'%1' бұғат файл ашылмады."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "'%1' бұғат файл оқылмады."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "'%1' файлынан PID нөмірі алынбады."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Құрылғыны бұғаттап тұрған PID нөмірі %1 процесы әлі орындалуда."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Бұғат файлы бар PID нөмірлі процесқа сигнал жіберілмейді."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"'%1' бұғат файлы құрылмады. Жеткілікті рұқсаттарға ие екеніңізді тексеріңіз."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Көрсету"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Команда қасиеттері"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Атауы:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Жол:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Оналтылық нәтижесі"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Орны"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметрі"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Мәні"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Қалта құрылғысы"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Үлгінің мәліметі"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Үлгісі:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Тізбекті нөмірі:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Өндірушісі:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM нұсқасы:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адрес кітапшалары"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефоны"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Оқу"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Жазу"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Файлға сақтау..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Қадамдастыру"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Күй-жайы"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Батареясының толтырылуы:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Сигналдың сапасы:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Жаңарту"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Уақытты орнату"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Тізбекті құрылғысы"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Берілім жылдамдығы"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Бұғат каталогы"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Бастағанда модем ашылсын"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Қосылғанда ұялыда уақыт авто-орнатылсын"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Үй нөмерлері болмасын"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Жұмыс нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "А/Жауапбергіш нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Факс нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Үялы нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Бейнефон нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Дауыс пошта нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Модем нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Машинадағы нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Пейджер нөмірлері болмасын"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Үй жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Жұмыс жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "А/Ж жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Факс жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Ұялы жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Бейнефон жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Д/П жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Модем жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Машинадағы жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Пейджер жұрнағын теру"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Үй жұрнағы"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Жұмыс жұрнағы"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "А/Ж жұрнағы"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Факс жұрнағы"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Ұялы жұрнағы"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Бейнефон жұрнағы"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Д/П жұрнағы"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Модем жұрнағы"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Машинадағы жұрнағы"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN жұрнағы"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Пейджер жұрнағы"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Бастағанда терминал терезесі ашылсын"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Бастағанда телефонның терезесі ашылсын"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Көрсету"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Қалта құрылғысы"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Үлгінің мәліметі"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Үлгісі:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Тізбекті нөмірі:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Өндірушісі:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM нұсқасы:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адрес кітапшалары"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефоны"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Оқу"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Жазу"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Файлға сақтау..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Қадамдастыру"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Күй-жайы"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Батареясының толтырылуы:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Сигналдың сапасы:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Жаңарту"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Уақытты орнату"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "'%1' бұғат файл ашылмады."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "'%1' бұғат файл оқылмады."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "'%1' файлынан PID нөмірі алынбады."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Құрылғыны бұғаттап тұрған PID нөмірі %1 процесы әлі орындалуда."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Бұғат файлы бар PID нөмірлі процесқа сигнал жіберілмейді."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "'%1' бұғат файлы құрылмады. Жеткілікті рұқсаттарға ие екеніңізді "
+#~ "тексеріңіз."
diff --git a/tde-i18n-km/messages/tdepim/kandy.po b/tde-i18n-km/messages/tdepim/kandy.po
index 73347ed5218..e7f1beaeacb 100644
--- a/tde-i18n-km/messages/tdepim/kandy.po
+++ b/tde-i18n-km/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2008-07-14 16:38+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -16,704 +16,659 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"khoemsokhem@khmeros.info,soursdey@khmeros.info, "
-"evannak@khmeros.info,piseth_dv@khmeros.info"
+"khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
+"piseth_dv@khmeros.info"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "ពាក្យ​បញ្ជា​ថ្មី"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "អាគុយម៉ង់ %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "បញ្ចូល​ឈ្មោះ​ប៉ារ៉ាម៉ែត្រ ៖"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "កំហុស​ម៉ូដឹម"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " បាន​ផ្ដាច់ "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "មិន​អាច​ផ្ទុក​ឯកសារ %1 បាន​ឡើយ"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "មិន​អាច​រក្សាទុក​ឯកសារ %1 បាន​ឡើយ ។"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "ចំណុច​ប្រទាក់​ក្រាហ្វិក​ឧបករណ៍​ចល័ត"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "ភ្ជាប់"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "ផ្ដាច់"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "ទម្រង់​ថ្មី"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "រក្សាទុក​ការផ្លាស់ប្ដូរ​ទៅ​ទម្រង់ %1 ?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "មិន​អាច​បើក​ឧបករណ៍​ម៉ូដឹម %1 បាន​ឡើយ ។"
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "កំហុស​ម៉ូដឹម"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " បាន​ភ្ជាប់ "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "ចំណុច​ប្រទាក់​សៀរៀល"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "សៀវភៅអាសយដ្ឋាន"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "បង្អួច"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "ពាក្យ​បញ្ជា"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "ដប់​ប្រាំមួយ"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "បន្ថែម..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "កែសម្រួល..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "ប្រតិបត្តិ"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "បញ្ចូល ៖"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "បង្ហាញ ៖"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "លទ្ធផល ៖"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "បញ្ចូល​តម្លៃ​សម្រាប់ %1 ៖"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "ទំនាក់ទំនង​ជាមួយ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "បង្ហាញ​បង្អួច​ស្ថានីយ"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "បង្ហាញ​ចំណុច​ប្រទាក់​ក្រាហ្វិក​ឧបករណ៍​ចល័ត"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "កុំ​បង្ហាញ​ចំណុច​ប្រទាក់​ក្រាហ្វិក​ឧបករណ៍​ចល័ត"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "ឈ្មោះ​ឯកសារ​នៃ​ឯកសារ​ទម្រង់​ពាក្យ​បញ្ជា"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "ម៉ូដឹម បិទ ។"
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "ម៉ូដឹម រវល់ ។"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "កំពុង​អានសៀវភៅ​ទូរស័ព្ទ​ចល័ត..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "កំពុង​សសេរ​សៀវភៅ​ទូរស័ព្ទ​ចល័ត..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "បាន​សរសេរ​សៀវភៅ​ទូរស័ព្ទ​ចល័ត ។"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "កំពុង​អាន​សៀវភៅ​អាសយដ្ឋាន​របស់ TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "អាន​សៀវភៅ​អាសយដ្ឋាន​របស់ TDE..."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "បាន​សរសេរ​សៀវភៅ​អាសយដ្ឋាន​របស់ TDE ។"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "អាន​សៀវភៅ​អាសយដ្ឋាន​ចល័ត ។"
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "ធាតុ Kab ៖"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "ធាតុ​ឧបករណ៍​ចល័ត ៖"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "ធាតុ​កំពុង​ប៉ះទង្គិច​គ្នា"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "ប្រើ​ធាតុ Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "ប្រើ​ធាតុ​ឧបករណ៍​ចល័ត"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "បាន​ធ្វើ​សមកាលកម្ម​សៀវភៅ​ទូរស័ព្ទ ។"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "សៀវភៅ​អាសយដ្ឋាន​របស់ TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "សៀវភៅ​អាសយដ្ឋាន​របស់ TDE (បានកែប្រែ)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "សៀវភៅ​អាសយដ្ឋាន​របស់ TDE មាន​ការ​ផ្លាស់ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក ។"
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "ការ​ផ្លាស់​ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "សៀវភៅ​ទូរស័ព្ទ​ចល័ត"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "សៀវភៅ​ទូរស័ព្ទ​ចល័ត (បាន​កែ​ប្រែ)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "សៀវភៅ​ទូរស័ព្ទ​ចល័ត​មាន​ការ​ផ្លាស់ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក ។"
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "ស្ថានីយ"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
-msgstr ""
-"មិន​អាច​បើក​ឧបករណ៍​ '%1' បាន​ឡើយ ។ សូម​ពិនិត្យ​ថា​អ្នក​មាន​សិទ្ធិ​គ្រប់គ្រាន់ ។"
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
+msgstr "មិន​អាច​បើក​ឧបករណ៍​ '%1' បាន​ឡើយ ។ សូម​ពិនិត្យ​ថា​អ្នក​មាន​សិទ្ធិ​គ្រប់គ្រាន់ ។"
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "ការ​រៀបចំ​ការ​ទំនាក់​ទំនង​បាន​បរាជ័យ​ហើយ (កូដ tcgetattr ៖ %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() បានបរាជ័យ ។"
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "មិន​អាច​ចាក់​សោ​ឧបករណ៍ '%1' បាន​ឡើយ ។"
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "មិន​អាច​បើក​ឯកសារ​សោ '%1' បាន​ឡើយ ។"
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "មិន​អាច​អាន​ឯកសារ​សោ '%1' បាន​ឡើយ ។"
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "មិន​អាច​យក​លេខ​ដំណើរការ​ពី​ឯកសារ '%1' បាន​ឡើយ ។"
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "ដំណើរការ​លេខ %1 ដែល​កំពុង​ចាក់​សោ​ឧបករណ៍ គឺ​កំពុង​រត់​នៅ​ឡើយ​ទេ ។"
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"មិន​អាច​បញ្ចេញ​សញ្ញា​ទៅ​លេខ​ដំណើរការ របស់​ឯកសារ​សោ​មាន​ស្រាប់​បាន​ឡើយ ។"
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"មិន​អាច​បង្កើត​ឯកសារ​​សោ '%1' បាន​ឡើយ ។ "
-"សូម​ពិនិត្យ​ថាអ្នក​មាន​សិទ្ធិ​គ្រប់គ្រាន់ ។"
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "បង្ហាញ"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "លក្ខណៈ​សម្បត្តិ​ពាក្យ​បញ្ជា"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "ឈ្មោះ ៖"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "ខ្សែ​អក្សរ ៖"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "លទ្ធផល​គោល​ដប់​ប្រាំមួយ"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "ទីតាំង"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "ប៉ារ៉ាម៉ែត្រ"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "តម្លៃ"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "ឧបករណ៍​ចល័ត"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "ព័ត៌មាន​អំពី​ម៉ូដែល"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "ម៉ូដែល ៖"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "លេខ​សម្គាល់ ៖"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "ក្រុមហ៊ុនផលិត ៖"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "កំណែ GSM ៖"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "សៀវភៅ​អាសយដ្ឋាន"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "ទូរស័ព្ទ"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "អាន"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "សរសេរ"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "រក្សាទុក​ទៅ​ឯកសារ..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "ធ្វើ​សមកាលកម្ម"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "ស្ថានភាព"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "ចំណុះ​ថ្ម ៖"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "គុណភាព​សញ្ញា ៖"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "ធ្វើ​ឲ្យ​ស្រស់"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "កំណត់​នាឡិកា"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "ឧបករណ៍​សៀរៀល"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "អត្រា Baud"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "ថត​សោ"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "បើក​ម៉ូដឹម ពេល​ចាប់ផ្តើម"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "កំណត់​នាឡិកា​របស់​ឧបករណ៍​ចល័ត​ដោយ​ស្វ័យប្រវត្តិ ពេល​តភ្ជាប់"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "ដក​លេខ​ផ្ទះ​ចេញ"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "ដក​លេខ​កន្លែង​ធ្វើការ​ចេញ"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "ដក​លេខ​សារ​ចេញ"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "ដក​លេខ​ទូរសារ​ចេញ"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "ដក​បច្ច័យ​ឥត​ខ្សែ​ចេញ"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "ដក​លេខ​ទូរស័ព្ទ​វីដេអូ​ចេញ"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "ដក​លេខ​ប្រអប់​សំបុត្រ​ចេញ"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "ដក​លេខ​ម៉ូដឹម​ចេញ"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "ដក​លេខ​ទូរស័ព្ទ​រថយន្ត​ចេញ"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ដក​លេខ ISDN ចេញ"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "ដក​លេខ​ភេកយ័រ​ចេញ"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "ប្រើ​បច្ច័យ​នៅ​ផ្ទះ"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "ប្រើ​បច្ច័យ​កន្លែង​ធ្វើការ"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "ប្រើ​បច្ច័យ​ផ្ញើសារ"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "ប្រើ​បច្ច័យ​ទូរសារ"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "ប្រើ​បច្ច័យ​ឧបករណ៍​ចល័ត"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "ប្រើ​បច្ច័យ​វីដេអូ"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "ប្រើ​បច្ច័យ​ប្រអប់​សំបុត្រ"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "ប្រើ​បច្ច័យ​ម៉ូដឹម"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "ប្រើ​បច្ច័យ​រថយន្ត"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ប្រើ​បច្ច័យ ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "ប្រើ​បច្ច័យ​ភេកយ័រ"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "បច្ច័យ​នៅ​ផ្ទះ"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "បច្ច័យ​កន្លែង​ធ្វើការ"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "បច្ច័យ​ផ្ញើសារ"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "បច្ច័យ​ទូរសារ"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "បច្ច័យ​ឥត​ខ្សែ"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "បច្ច័យ​វីដេអូ"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "បច្ច័យ​ប្រអប់​សំបុត្រ"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "បច្ច័យ​ម៉ូដឹម"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "បច្ច័យ​រថយន្ត"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "បច្ច័យ ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "បច្ច័យ​ភេកយ័រ"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "បើក​បង្អួច​ស្ថានីយ ពេល​ចាប់ផ្ដើម"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "បើក​បង្អួច​ឧបករណ៍​ចល័ត ពេល​ចាប់ផ្ដើម"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "បង្ហាញ"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "ឧបករណ៍​ចល័ត"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "ព័ត៌មាន​អំពី​ម៉ូដែល"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "ម៉ូដែល ៖"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "លេខ​សម្គាល់ ៖"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "ក្រុមហ៊ុនផលិត ៖"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "កំណែ GSM ៖"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "សៀវភៅ​អាសយដ្ឋាន"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "ទូរស័ព្ទ"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "អាន"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "សរសេរ"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "រក្សាទុក​ទៅ​ឯកសារ..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "ធ្វើ​សមកាលកម្ម"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "ស្ថានភាព"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "ចំណុះ​ថ្ម ៖"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "គុណភាព​សញ្ញា ៖"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "ធ្វើ​ឲ្យ​ស្រស់"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "កំណត់​នាឡិកា"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "មិន​អាច​បើក​ឯកសារ​សោ '%1' បាន​ឡើយ ។"
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "មិន​អាច​អាន​ឯកសារ​សោ '%1' បាន​ឡើយ ។"
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "មិន​អាច​យក​លេខ​ដំណើរការ​ពី​ឯកសារ '%1' បាន​ឡើយ ។"
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "ដំណើរការ​លេខ %1 ដែល​កំពុង​ចាក់​សោ​ឧបករណ៍ គឺ​កំពុង​រត់​នៅ​ឡើយ​ទេ ។"
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "មិន​អាច​បញ្ចេញ​សញ្ញា​ទៅ​លេខ​ដំណើរការ របស់​ឯកសារ​សោ​មាន​ស្រាប់​បាន​ឡើយ ។"
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr "មិន​អាច​បង្កើត​ឯកសារ​​សោ '%1' បាន​ឡើយ ។ សូម​ពិនិត្យ​ថាអ្នក​មាន​សិទ្ធិ​គ្រប់គ្រាន់ ។"
diff --git a/tde-i18n-ko/messages/tdepim/kandy.po b/tde-i18n-ko/messages/tdepim/kandy.po
index 3256a3841df..9ae8faf8739 100644
--- a/tde-i18n-ko/messages/tdepim/kandy.po
+++ b/tde-i18n-ko/messages/tdepim/kandy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-12-04 19:32+0900\n"
 "Last-Translator: \n"
 "Language-Team:  <ko@li.org>\n"
@@ -17,699 +17,659 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Kyuhyong Yoo,Kyungho Lee,Hongsoo Byun"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "master@aerobuster.com, leedos@hanmail.net, freeyama@gmail.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "새 명령"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "변수 %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "파라미터 이름을 입력하십시오:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "모뎀 오류"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " 접속 끊김 "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 파일을 읽을 수 없습니다"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "%1 파일을 저장할 수 없습니다."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "모바일 GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "연결"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "연결 해제"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "새 프로필"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "%1 프로필의 변경사항을 저장하시겠습니까?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "모뎀 장치 %1을(를) 열 수 없습니다."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "모뎀 오류"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " 연결됨 "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "시리얼 인터페이스"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "주소록"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "창"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "이름"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "명령"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex(6진수)"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "추가..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "편집..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "실행"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "입력:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "출력:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "결과:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1의 값을 입력하십시오."
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "여러분의 휴대폰과 통신중입니다"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "터미널 창 보기"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "모바일 GUI 보기"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "GUI 보기 안함"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "명령 프로필 파일의 파일명"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "모뎀이 꺼져있습니다."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "모뎀이 사용중입니다."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "휴대폰 전화번호부를 읽는 중..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "휴대폰 전화번호부에 쓰는 중..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "모바일 전화번호부에 기록 하였습니다."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE 주소록을 읽습니다."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE 주소록을 읽습니다."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE 주소록에 기록 하였습니다."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "모바일 전화번호부를 읽습니다."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab 항목:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "모바일 항목:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "항목이 충돌합니다."
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Kab 항목 사용"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "모바일 항목 사용"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "전화번호부가 동기화 되었습니다."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE 주소록"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE 주소록(수정됨)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE 주소록에 저장되지 않은 변경사항이 있습니다."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "저장되지 않은 변경사항"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "휴대폰 전화번호부"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "휴대폰 전화번호부(수정됨)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "휴대폰 전화번호부에 저장되지 않은 변경사항이 있습니다."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "터미널"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "장치 '%1'을(를) 열 수 없습니다. 사용자의 권한을 확인하십시오."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Communication setup failed (tcgetattr code: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() 실패."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "잠금 파일 '%1'을(를) 열 수 없습니다."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "잠금 파일 '%1'을(를) 열 수 없습니다."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "잠금 파일 '%1'을(를) 읽을 수 없습니다."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "파일 '%1'(으)로 부터 프로세스 ID를 가져올 수 없습니다."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "장치를 고정하고 있는 프로세스 ID %1의 프로세스가 아직 실행중입니다."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "고정 파일의 프로세서 ID로 신호를 전송할 수 없습니다."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "고정 파일 %1을(를) 생성할 수 없습니다. 사용자의 권한을 확인하십시오."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "보기(&S)"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "명령 등록정보"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "이름:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "문자열:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "HEX 결과"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "위치"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "파라미터"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "값"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "휴대용 장치"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "모델 정보"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "모델:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "시리얼 번호:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "제조 업체:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM 버전:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "주소록"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "전화번호"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "읽기"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "쓰기"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "파일로 저장..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "동기화"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "상태"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "배터리 충전:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "신호 품질:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "새로 고침"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "시각 설정"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "시리얼 장치"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud rate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "디렉터리 보기"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "시작시 모뎀 열기"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "연결시 휴대폰 시각 자동 설정"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "집 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "회사 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "메시지 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "팩스 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "휴대폰 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "비디오폰 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "이메일 주소 제외"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "모뎀 번호 제외"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "카폰 전화번호 제외"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN 번호 제외"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "삐삐 번호 제외"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "집전화 접미사 사용"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "회사전화 접미사 사용"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "메시지 접미사 사용"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "팩스 접미사 사용"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "휴대폰 접미사 사용"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "비디오폰 접미사 사용"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "이메일 접미사 사용"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "모뎀 접미사 사용"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "카폰 접미사 사용"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN 접미사 사용"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "삐삐 접미사 사용"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "집전화 접미사"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "회사전화 접미사"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "메시지 접미사"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "팩스 접미사"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "휴대폰 접미사"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "비디오폰 접미사"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "이메일 접미사"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "모뎀 접미사"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "카폰 접미사"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN 접미사"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "삐삐 접미사"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "시작할 때 터미널 창 열기"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "시작할 때 모바일 창 열기"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "보기(&S)"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "휴대용 장치"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "모델 정보"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "모델:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "시리얼 번호:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "제조 업체:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM 버전:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "주소록"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "전화번호"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "읽기"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "쓰기"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "파일로 저장..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "동기화"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "상태"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "배터리 충전:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "신호 품질:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "새로 고침"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "시각 설정"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "잠금 파일 '%1'을(를) 열 수 없습니다."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "잠금 파일 '%1'을(를) 읽을 수 없습니다."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "파일 '%1'(으)로 부터 프로세스 ID를 가져올 수 없습니다."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "장치를 고정하고 있는 프로세스 ID %1의 프로세스가 아직 실행중입니다."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "고정 파일의 프로세서 ID로 신호를 전송할 수 없습니다."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "고정 파일 %1을(를) 생성할 수 없습니다. 사용자의 권한을 확인하십시오."
diff --git a/tde-i18n-lt/messages/tdepim/kandy.po b/tde-i18n-lt/messages/tdepim/kandy.po
index 2021087c291..d5683a2db0f 100644
--- a/tde-i18n-lt/messages/tdepim/kandy.po
+++ b/tde-i18n-lt/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-09-02 17:30+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -15,708 +15,646 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 #, fuzzy
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "(niekas)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 #, fuzzy
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "(niekas)"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nauja komanda"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr ""
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr ""
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+msgid "Error"
+msgstr ""
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr ""
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr ""
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr ""
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, fuzzy, no-c-format
 msgid "Connect"
 msgstr "Prisijungti"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Atjungti"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr ""
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr ""
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr ""
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr ""
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr ""
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr ""
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresų knygelė"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Langai"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, fuzzy, no-c-format
 msgid "Name"
 msgstr "Vardas"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Komanda"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr ""
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 #, fuzzy
 msgid "Add..."
 msgstr "Įdėti..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 #, fuzzy
 msgid "Edit..."
 msgstr "Redaguoti..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 #, fuzzy
 msgid "Input:"
 msgstr "Įvestis:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Išvestis:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr ""
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr ""
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr ""
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr ""
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr ""
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr ""
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr ""
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr ""
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr ""
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr ""
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr ""
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Neišsaugoti pakeitimai"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr ""
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminalas"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 #, fuzzy
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Autentikacija nepavyko (naudotojo vardas=%1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Nepavyko įkelti „%1“."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Rodyti"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Komandos savybės"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, fuzzy, no-c-format
 msgid "Name:"
 msgstr "Vardas:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, fuzzy, no-c-format
 msgid "Position"
 msgstr "Pozicija"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, fuzzy, no-c-format
 msgid "Parameter"
 msgstr "Parametras"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, fuzzy, no-c-format
 msgid "Value"
 msgstr "Reikšmė"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modelis:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Eilės numeris:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Gamintojas:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresų knygelė"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefonas"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Skaityti"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Įrašyti"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sinchronizavimas"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, fuzzy, no-c-format
-msgid "Status"
-msgstr "Būsena"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Signal quality:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, fuzzy, no-c-format
-msgid "Refresh"
-msgstr "Atnaujinti"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr ""
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Rodyti"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr ""
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr ""
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modelis:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Eilės numeris:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Gamintojas:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr ""
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresų knygelė"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefonas"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Skaityti"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Įrašyti"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr ""
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinchronizavimas"
+
+#: src/mobilegui_base.ui:388
+#, fuzzy, no-c-format
+msgid "Status"
+msgstr "Būsena"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr ""
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr ""
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr ""
+
+#: src/mobilegui_base.ui:472
+#, fuzzy, no-c-format
+msgid "Refresh"
+msgstr "Atnaujinti"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
diff --git a/tde-i18n-lv/messages/tdepim/kandy.po b/tde-i18n-lv/messages/tdepim/kandy.po
index 5a3db613ef1..661a78fbc7a 100644
--- a/tde-i18n-lv/messages/tdepim/kandy.po
+++ b/tde-i18n-lv/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2001-05-02 23:31EET\n"
 "Last-Translator: Andris Maziks <andris.m@delfi.lv>\n"
 "Language-Team: Latvian\n"
@@ -15,701 +15,639 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andris Maziks"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "andris.m@delfi.lv"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Jauna Komanda"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 #, fuzzy
 msgid "Enter parameter name:"
 msgstr "Ievadiet parametra nosaukumu"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+msgid "Error"
+msgstr ""
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr ""
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nevar ielādēt failu %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "Nevar ielādēt failu %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr ""
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr ""
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr ""
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr ""
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr ""
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr ""
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr ""
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr ""
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr ""
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Logi"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Vārds"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Komanda"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heksa"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr ""
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr ""
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr ""
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr ""
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr ""
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr ""
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr ""
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr ""
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr ""
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr ""
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr ""
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr ""
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr ""
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr ""
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr ""
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr ""
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr ""
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Termināls"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr ""
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Vārds:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozīcija"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Vērtība"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Mobile Device"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Model Information"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
+#: src/kandy.kcfg:10
 #, no-c-format
-msgid "Model:"
-msgstr "Modelis:"
+msgid "Serial device"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
+#: src/kandy.kcfg:14
 #, no-c-format
-msgid "Serial number:"
+msgid "Baud rate"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
+#: src/kandy.kcfg:18
 #, no-c-format
-msgid "x"
+msgid "Lock directory"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/kandy.kcfg:22
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Ražotājs:"
+msgid "Open modem on startup"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
+#: src/kandy.kcfg:26
 #, no-c-format
-msgid "GSM version:"
+msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
+#: src/kandy.kcfg:33
 #, no-c-format
-msgid "Address Books"
+msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
+#: src/kandy.kcfg:37
 #, no-c-format
-msgid "Phone"
+msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
+#: src/kandy.kcfg:41
 #, no-c-format
-msgid "Read"
-msgstr "Lasīt"
+msgid "Exclude messaging numbers"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
+#: src/kandy.kcfg:45
 #, no-c-format
-msgid "Write"
-msgstr "Rakstīt"
+msgid "Exclude fax numbers"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
+#: src/kandy.kcfg:49
 #, no-c-format
-msgid "Save to File..."
+msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
+#: src/kandy.kcfg:53
 #, no-c-format
-msgid "Sync"
+msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
+#: src/kandy.kcfg:57
 #, no-c-format
-msgid "Status"
-msgstr "Statuss"
+msgid "Exclude mailbox numbers"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
+#: src/kandy.kcfg:61
 #, no-c-format
-msgid "Battery charge:"
+msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
+#: src/kandy.kcfg:65
 #, no-c-format
-msgid "Signal quality:"
+msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
+#: src/kandy.kcfg:69
 #, no-c-format
-msgid "xx %"
+msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/kandy.kcfg:73
 #, no-c-format
-msgid "Refresh"
-msgstr "Atsvaidze"
+msgid "Exclude pager numbers"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/kandy.kcfg:78
 #, no-c-format
-msgid "Set Clock"
+msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:82
 #, no-c-format
-msgid "Serial device"
+msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:86
 #, no-c-format
-msgid "Baud rate"
+msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:90
 #, no-c-format
-msgid "Lock directory"
+msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:94
 #, no-c-format
-msgid "Open modem on startup"
+msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:98
 #, no-c-format
-msgid "Auto-set clock of mobile on connection"
+msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:102
 #, no-c-format
-msgid "Exclude home numbers"
+msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:106
 #, no-c-format
-msgid "Exclude work numbers"
+msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:110
 #, no-c-format
-msgid "Exclude messaging numbers"
+msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:114
 #, no-c-format
-msgid "Exclude fax numbers"
+msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:118
 #, no-c-format
-msgid "Exclude cell numbers"
+msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:123
 #, no-c-format
-msgid "Exclude video phone numbers"
+msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:127
 #, no-c-format
-msgid "Exclude mailbox numbers"
+msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:131
 #, no-c-format
-msgid "Exclude modem numbers"
+msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:135
 #, no-c-format
-msgid "Exclude car phone numbers"
+msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:139
 #, no-c-format
-msgid "Exclude ISDN numbers"
+msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:143
 #, no-c-format
-msgid "Exclude pager numbers"
+msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:147
 #, no-c-format
-msgid "Use home suffix"
+msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:151
 #, no-c-format
-msgid "Use work suffix"
+msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:155
 #, no-c-format
-msgid "Use messaging suffix"
+msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:159
 #, no-c-format
-msgid "Use fax suffix"
+msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:163
 #, no-c-format
-msgid "Use mobile suffix"
+msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:171
 #, no-c-format
-msgid "Use video suffix"
+msgid "Open terminal window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:175
 #, no-c-format
-msgid "Use mailbox suffix"
+msgid "Open mobile window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
 #, no-c-format
-msgid "Use modem suffix"
+msgid "&Show"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/mobilegui_base.ui:16
 #, no-c-format
-msgid "Use car suffix"
+msgid "Mobile Device"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/mobilegui_base.ui:41
 #, no-c-format
-msgid "Use ISDN suffix"
+msgid "Model Information"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/mobilegui_base.ui:50
 #, no-c-format
-msgid "Use pager suffix"
-msgstr ""
+msgid "Model:"
+msgstr "Modelis:"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/mobilegui_base.ui:59
 #, no-c-format
-msgid "Home suffix"
+msgid "Serial number:"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
 #, no-c-format
-msgid "Work suffix"
+msgid "x"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/mobilegui_base.ui:104
 #, no-c-format
-msgid "Messaging suffix"
-msgstr ""
+msgid "Manufacturer:"
+msgstr "Ražotājs:"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/mobilegui_base.ui:113
 #, no-c-format
-msgid "Fax suffix"
+msgid "GSM version:"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/mobilegui_base.ui:145
 #, no-c-format
-msgid "Cell suffix"
+msgid "Address Books"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
 #, no-c-format
-msgid "Video suffix"
+msgid "Phone"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
 #, no-c-format
-msgid "Mailbox suffix"
-msgstr ""
+msgid "Read"
+msgstr "Lasīt"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
 #, no-c-format
-msgid "Modem suffix"
+msgid "Write"
+msgstr "Rakstīt"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/mobilegui_base.ui:332
 #, no-c-format
-msgid "Car suffix"
+msgid "Sync"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/mobilegui_base.ui:388
 #, no-c-format
-msgid "ISDN suffix"
+msgid "Status"
+msgstr "Statuss"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/mobilegui_base.ui:413
 #, no-c-format
-msgid "Pager suffix"
+msgid "Signal quality:"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/mobilegui_base.ui:429
 #, no-c-format
-msgid "Open terminal window on startup"
+msgid "xx %"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/mobilegui_base.ui:472
 #, no-c-format
-msgid "Open mobile window on startup"
+msgid "Refresh"
+msgstr "Atsvaidze"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
 msgstr ""
 
 #~ msgid "&Modem"
diff --git a/tde-i18n-mk/messages/tdepim/kandy.po b/tde-i18n-mk/messages/tdepim/kandy.po
index e21a4ec0b0b..874712e8b52 100644
--- a/tde-i18n-mk/messages/tdepim/kandy.po
+++ b/tde-i18n-mk/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-10-15 23:27+0200\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -16,699 +16,659 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Виктор Стојановски"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "viktor@lugola.net"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Нова наредба"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Аргумент %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Внесете име на параметарот:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Модемска грешка"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Исклучено "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Не можам да ја вчитам датотеката %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Не можам да ја зачувам датотеката %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI за мобилен"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Поврзување"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Отповрзи се"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Нов профил"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Зачувај промени во профил %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Не можам да се поврзам со модемот %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Модемска грешка"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Поврзано "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Сериски интерфејс"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Адресар"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Прозорци"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Име"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Наредба"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Хексадец."
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Додај..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Промени..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Изврши"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Влез:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Излез:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Резултат:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Внесете вредност за %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Се поврзувам со Вашиот мобилен телефон."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Прикажи прозорец со терминал"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Прикажи GUI за мобилен"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Не прикажувај GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модемот е исклучен."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модемот е зафатен."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Вчитувам адресар од мобилен..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Пишувам адресар во мобилен..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Завршив со внесување на адресарот во мобилниот уред."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Вчитувам адресар од TDE"
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Завршив со читање од адресарот на TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Го внесов TDE адресарот "
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Читај адресар од мобилниот уред."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab влез:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Мобилен влез:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Конфликт на влезови"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Користи Kab влез"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Kористи Мобилен влез"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Синхронизирани адресари."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Адресар од TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Адресар од TDE (променет)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Адресарот на TDE содржи незачувани промени."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Незачувани промени"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Адресар од мобилен уред"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Адресар од мобилен уред (променет)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Адресарот во мобилниот уред содржи незачувани промени."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Не можам да го отворам уредот'%1'. Проверете дали дозвола."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Врската е неуспешна (tcgetattr код: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() паднат."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Неможaм да го заклучам уредот '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Неможам да отворам заклучена датотека '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Неможам да прочитам заклучена датотека '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Неможам да примам PID од датотека '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Процесот со PID %1, што го заклучува уредот, сеуште се извршува."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Неможам да пренесувам сигнал до PID на постоечката заклучена датотека."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Неможам да креирам заклучена датотеа '%1'. Проверете дали имате дозвола."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Прикажи"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Својства на командата"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Име:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Низа:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Резултат во хекс"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Позиција"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметар"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Вредност"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Мобилен уред"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Информации за модел"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Модел:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Сериски број:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Производител:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Верзија на GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адресар"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Читај"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Пишувај"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Зачувај во датотека..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Синхронизирај"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Статус"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Состојба на батерија:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Квалитет на мрежа:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Освежи"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Постави време"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Сериски уред"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Заклучи папка"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Отвори модем на почеток"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Автоматски постави време на мобилниот уред при поврзување"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Исклучи домашни броеви"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Исклучи броеви од работа"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Исклучи броеви за пораки"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Исклучи броеви за факс"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Исклучи броеви за мобилни броеви"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Исклучи броеви за видео конференција"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Исклучи броеви за говорна пошта"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Исклучи броеви за модем"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Исклучи броеви за телефони од автомобил"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Исклучи броеви за ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Исклучи броеви за пејџер"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Користи суфикс дома"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Користи суфикс работа"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Користи суфикс пораки"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Користи суфикс факс"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Користи суфикс мобилен"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Користи суфикс видео"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Користи суфикс говорна пошта"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Користи суфикс модем"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Користи суфикс автомобил"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Користи суфикс ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Користи суфикс пејџер"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Суфикс дома"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Суфикс работа"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Суфикс пораки"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Суфикс факс"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Суфикс мобилен"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Суфикс видео"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Суфикс говорна пошта"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Суфикс модем"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Суфикс автомобил"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Суфикс ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Суфикс пејџер"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "На почеток отвори прозорец со терминал"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "На почеток отвори прозорец за мобилен"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Прикажи"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Мобилен уред"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Информации за модел"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Модел:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Сериски број:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Производител:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Верзија на GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адресар"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Читај"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Пишувај"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Зачувај во датотека..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Синхронизирај"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Статус"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Состојба на батерија:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Квалитет на мрежа:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Освежи"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Постави време"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Неможам да отворам заклучена датотека '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Неможам да прочитам заклучена датотека '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Неможам да примам PID од датотека '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Процесот со PID %1, што го заклучува уредот, сеуште се извршува."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Неможам да пренесувам сигнал до PID на постоечката заклучена датотека."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Неможам да креирам заклучена датотеа '%1'. Проверете дали имате дозвола."
diff --git a/tde-i18n-ms/messages/tdepim/kandy.po b/tde-i18n-ms/messages/tdepim/kandy.po
index f89193afea2..e0d9a4649be 100644
--- a/tde-i18n-ms/messages/tdepim/kandy.po
+++ b/tde-i18n-ms/messages/tdepim/kandy.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mimos\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-10-06 11:31+0800\n"
 "Last-Translator: MIMOS <opensource@mimos.my>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -13,703 +13,663 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "MIMOS"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "opensource@mimos.my"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Arahan Baru"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Masukkan nama parameter:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Ralat Modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "Sambungan putus"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Tidak dapat memuatkan fail   %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Tidak dapat menyimpan fail %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI mudah alih"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Sambungkan"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Putuskan"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Profail Baru"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Simpan perubahan ke profail %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Tidak dapat membuka peranti modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Ralat Modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "Disambungkan"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Antaramuka Bersiri"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Buku Alamat"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Tetingkap"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nama"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Arahan"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Tambah..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Edit..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Laksanakan"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Input:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Output:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Keputusan:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Masukkan nilai untuk %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Berkomunikasi dengan telefon mudah alih anda."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Paparkan tetingkap terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Paparkan GUI mudah alih"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Jangan paparkan GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nama fail profail arahan"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem ditutup"
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem sibuk"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Membaca buku telefon mudah alih..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Menulis buku telefon mudah alih..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Telah tulis buku telefon mudah alih."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Membaca buku alamat TDE."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Baca buku alamat TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Telah menulis  buku alamat TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Baca buku telefon mudah alih."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Entri Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Entri Mudah Alih:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Entri Berkonflik"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Gunakan Entri Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Gunakan Entri Mudah Alih"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Buku telefon segerak"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Buku Alamat TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Buku Alamat TDE (diubah suai)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Buku alamat TDE mengandungi perubahan tak disimpan."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Perubahan Tak Disimpan"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Buku Telefon Mudah Alih"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Buku Telefon Mudah Alih (diubah suai)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Buku telefon mudah alih mengandungi perubahan yang tak disimpan"
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Tidak dapat membuka peranti '%1'. Pastikan anda mempunyai cukup keizinan."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() gagal."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Tidak dapat memasak peranti %1."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Tidak dapat membuka fail pasak '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Tidak dapat membaca fail pasak '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Tidak dapat mengambil PID dari fail '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proses menggunakan PID %1 yang memasak peranti, masih berjalan."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Tidak dapat memberikan isyarat kepada fail pasak PID sedia ada."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Tidak dapat mencipta fail pasak '%1'. Pastikan anda mempunyai cukup keizinan."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Paparkan"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Ciri  Arahan"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nama:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Rentetan:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Keputusan Hex"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posisi"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Nilai"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Peranti Mudah Alih"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Maklumat Model"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Nombor Siri:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Pembuat:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versi GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Buku Alamat"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Tel"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Baca"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Tulis"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Simpan ke fail..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Segerakkan"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Caj bateri:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kualiti isyarat:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Muat semula"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Setkan Jam"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Peranti Bersiri"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Kadar Baud"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Pasak direktori"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Buka modem semasa permulaan"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Autosetkan jam mudah alih pada sambungan"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Keluarkan nombor rumah"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Keluarkan nombor kerja"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Keluarkan nombor penghantaran mesej"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Keluarkan nombor faks"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Keluarkan nombor sel"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Keluarakan nombor telefon video"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Keluarkan nombor kotak mel"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Keluarkan nombor modem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Keluarkan nombor telefon kereta"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Keluarkan nombor ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Keluarkan nombor alat kelui"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Gunakan akhiran kediaman"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Gunakan  akhiran kerja"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Gunakan akhiran penghantaran mesej"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Gunakan akhiran faks"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Gunakan akhiran mudah alih"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Gunakan akhiran video"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Gunakan akhiran kotak mel"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Gunakan akhiran modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Gunakan akhiran kereta"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Gunakan akhiran ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Gunakan akhiran alat kelui"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Akhiran Kediaman"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Akhiran kerja"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Akhiran penghantaran mesej"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Akhiran faks"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Akhiran sel"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Akhiran video"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Akhiran kotak mel"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Akhiran modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Akhiran kereta"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Akhiran ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Akhiran alat kelui"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Buka tetingkap terminal pada permulaan"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Buka tetingkap mudah alih pada permulaan"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Paparkan"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Peranti Mudah Alih"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Maklumat Model"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Nombor Siri:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Pembuat:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versi GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Buku Alamat"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Tel"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Baca"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Tulis"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Simpan ke fail..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Segerakkan"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Caj bateri:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kualiti isyarat:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Muat semula"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Setkan Jam"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Tidak dapat membuka fail pasak '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Tidak dapat membaca fail pasak '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Tidak dapat mengambil PID dari fail '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proses menggunakan PID %1 yang memasak peranti, masih berjalan."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Tidak dapat memberikan isyarat kepada fail pasak PID sedia ada."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Tidak dapat mencipta fail pasak '%1'. Pastikan anda mempunyai cukup "
+#~ "keizinan."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() gagal."
diff --git a/tde-i18n-nb/messages/tdepim/kandy.po b/tde-i18n-nb/messages/tdepim/kandy.po
index eb06722ed86..670f49ce846 100644
--- a/tde-i18n-nb/messages/tdepim/kandy.po
+++ b/tde-i18n-nb/messages/tdepim/kandy.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-10-21 21:20GMT+2\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -22,703 +22,662 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Knut Yrvin,Bjørn Steensrud,Nils Kristian Tomren"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "knuty@skolelinux.no,bjornst@powertech.no,project@nilsk.net"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ny kommando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Skriv inn parameternavn:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemfeil"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Frakoblet "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Kunne ikke laste fil %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Kunne ikke lagre fila %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobil GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Koble til"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Ny profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Lagre endringer til profil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Kan ikke åpne modemenhet %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemfeil"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Tilkoblet "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serielt grensesnitt"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Vinduer"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Navn"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Kommando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heks"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Legg til …"
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Rediger …"
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Kjør"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Inndata:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Utdata:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Skriv inn verdi for %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommuniserer med mobiltelefonen"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Vis terminalvindu"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Vis mobil-GUI"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ikke vis GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Filnavn på kommandoprofil-filen"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modemet er av."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modemet er opptatt."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Leser mobilens telefonliste …"
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Skriver mobilens telefonliste …"
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Skrev mobilens telefonliste."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Leser TDE-adressebok …"
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Les TDEs adressebok"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Skrev TDE-adressebok."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Leste mobilens telefonliste."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab-oppføring:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobil-oppføring:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Konflikt mellom oppføringer"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Bruk Kab-oppføring"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Bruk mobil-oppføring"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Syknkroniserte telefonlistene."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-adressebok"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-adressebok (endret)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE-adresseboka inneholder ulagrede endringer."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Ulagrede endringer"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonliste for mobil"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonliste for mobil (endret)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Telefonlista for mobil inneholder ulagrede endringer."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Kan ikke åpne enheten «%1». Se etter at du har tilstrekkelig rettighet."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Klarte ikke å sette opp kommunikasjonen (tcgetattr code: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() mislyktes."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Klarer ikke å åpne låsefila «%1»."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Klarer ikke åpne låsefil «%1»."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Klarer ikke lese låsefil «%1»."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Klarer ikke finne PID fra fila «%1»."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Prosess med PID %1, som låser enheten, kjører fremdeles."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Klarer ikke gi signal til PID av eksisterende låsefil."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Klarer ikke lage låsefil «%1». Se etter at du har tilstrekkelig rettighet."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Vis"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Kommandoinnstillinger"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Navn:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Streng:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Heksadesimalt-resultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posisjon"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Verdi"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilenhet"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modellinformasjon"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modell:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serienummer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Produsent:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-versjon:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adressebøker"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Les"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skriv"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Lagre til fil …"
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synkroniser"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batterinivå:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signalkvalitet:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Oppdater"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Juster klokke"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Seriell enhet"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud rate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Lås mappe"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Åpne modem ved oppstart"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Auto-justering av klokke for mobil-tilkobling"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Ekskludér hjemmenummer"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Ekskludér arbeidsnummer"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Ekskludér beskjednummer"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Ekskludér faksnummer"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Ekskludér mobilnummer"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Ekskludér videotelefon-nummer"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Ekskludér postboksnummer"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Ekskludér modemnummer"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Ekskludér mobilnummer"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Ekskludér ISDN-nummer"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Ekskludér personsøker-nummer"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Bruk hjemme-oppføring"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Bruk arbeid-oppføring"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Bruk beskjed-oppføring"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Bruk faks-oppføring"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Bruk mobil-oppføring"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Bruk video-oppføring"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Bruk postboks-oppføring"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Bruk modem-oppføring"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Bruk mobil-oppføring"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Bruk ISDN-oppføring"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Bruk personsøker-oppføring"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Hjeme-oppføring"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Arbeids-oppføring"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Beskjed-oppføring"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Faks-oppføring"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobil-oppføring"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video-oppføring"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Postboks-oppføring"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modem-oppføring"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Mobil-oppføring"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN-oppføring"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Personsøker-oppføring"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Åpne terminalvindu ved oppstart"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Åpne mobilvindu ved oppstart"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Vis"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilenhet"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modellinformasjon"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modell:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serienummer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Produsent:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-versjon:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adressebøker"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Les"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skriv"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Lagre til fil …"
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synkroniser"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batterinivå:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signalkvalitet:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Juster klokke"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Klarer ikke åpne låsefil «%1»."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Klarer ikke lese låsefil «%1»."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Klarer ikke finne PID fra fila «%1»."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Prosess med PID %1, som låser enheten, kjører fremdeles."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Klarer ikke gi signal til PID av eksisterende låsefil."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Klarer ikke lage låsefil «%1». Se etter at du har tilstrekkelig rettighet."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() mislyktes."
diff --git a/tde-i18n-nds/messages/tdepim/kandy.po b/tde-i18n-nds/messages/tdepim/kandy.po
index 616c6907225..78508c83267 100644
--- a/tde-i18n-nds/messages/tdepim/kandy.po
+++ b/tde-i18n-nds/messages/tdepim/kandy.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-04-08 13:34+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -14,703 +14,663 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Sönke Dibbern"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "s_dibbern@web.de"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nieg Befehl"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argument %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parameternaam ingeven:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemfehler"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "Afkoppelt"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Datei \"%1\" lett sik nich laden"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Datei \"%1\" lett sik nich sekern."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobiltelefoon"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Tokoppeln"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Afkoppeln"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nieg Profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Ännern an dat Profil \"%1\" sekern?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Modem %1 lett sik nich opmaken."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemfehler"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Tokoppelt "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Seriell Koppelsteed"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adressbook"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Finstern"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Naam"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Befehl"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Tofögen..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Bewerken..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Utföhren"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Ingaav:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Utgaav:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultaat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Weert för %1 ingeven:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunikatschoon mit dat Mobiltelefoon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminalfinster wiesen"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mobiltelefoon-Böversiet wiesen"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Böversiet nich wiesen"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Dateinaam vun de Profildatei"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem us ut."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem hett to doon."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Telefoonbook vun dat Mobiltelefoon warrt leest..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Telefoonbook vun dat Mobiltelefoon warrt schreven..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Telefoonbook vun dat Mobiltelefoon schreven."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE-Adressbook warrt leest..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE-Adressbook leest."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE-Adressbook schreven."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Telefoonbook vun dat Mobiltelefoon schreven."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Indrag vun KAB:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Indrag op Telefoon:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Konfliktindrääg"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "KAB-Indrag bruken"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Telefoon-Indrag bruken"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefoonböker synkroniseert."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-Adressbook"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-Adressbook (ännert)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Dat TDE-Adressbook wöör ännert, man noch nich sekert."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Ännern nich sekert"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefoonbook op't Mobiltelefoon"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefoonbook op't Mobiltelefoon (ännert)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Dat Telefoonbook vun't Mobiltelefoon wöör änner, man noch nich sekert."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "De Reedschap \"%1\" lett sik nich opmaken. Bitte prööv, wat Du noog Verlöven "
 "hest."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Inrichten vun de Kommunikatschoon is fehlslaan (tcgetattr-Kode: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() fehlslaan."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Reedschap \"%1\" lett sik nich afsluten."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Slottdatei \"%1\" lett sik nich opmaken."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Slottdatei \"%1\" lett sik nich lesen."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "PID lett sik nich ut Datei \"%1\" inlesen."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "De Perzess mit de PID %1 hett de Reedschap afslaten un löppt noch."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Dat is nich mööglich, en Signaal na den Perzess vun de Slottdatei to sennen."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Slottdatei \"%1\" lett sik nich opstellen. Bitte prööv, wat Du noog Verlöven "
-"hest."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Wiesen"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Befehlegenschappen"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Naam:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Tekenkeed:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Resultaat (hex.)"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Positschoon"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Weert"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilreedschap"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modell-Informatschoon"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modell:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Seriennummer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Maker:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-Verschoon:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adressböker"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefoon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lesen"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Schrieven"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "As Datei sekern..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synkroniseren"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batterieladen:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signaalgööd:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Opfrischen"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Klock stellen"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Seriell Reedschap"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud-Tall"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Orner afsluten"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Modem bi Programmstart opmaken"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Na't Tokoppeln automaatsch de Klock vun't Mobiltelefoon stellen"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Private Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Warfliche Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Kortnarichten-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Fax-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Mobil-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Videotelefoon-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Antermaschien-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modem-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Autotelefoon-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Pager-Nummern utsluten"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Privaat-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Warflich Suffix bruken"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Kortnarichten-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Fax-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Mobil-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Video-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Antermaschien-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Modem-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Auto-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Pager-Suffix bruken"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Privaat-Suffix"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Warflich Suffix"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Kortnarichten-Suffix"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Fax-Suffix"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobil-Suffix"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video-Suffix"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Antermaschien-Suffix"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modem-Suffix"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Auto-Suffix"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN-Suffix"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Pager-Suffix"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Terminalfinster bi't Starten opmaken"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Mobiltelefoonfinster bi't Starten opmaken"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Wiesen"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilreedschap"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modell-Informatschoon"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modell:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Seriennummer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Maker:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-Verschoon:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adressböker"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefoon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lesen"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Schrieven"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "As Datei sekern..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synkroniseren"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batterieladen:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signaalgööd:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Opfrischen"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Klock stellen"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Slottdatei \"%1\" lett sik nich opmaken."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Slottdatei \"%1\" lett sik nich lesen."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "PID lett sik nich ut Datei \"%1\" inlesen."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "De Perzess mit de PID %1 hett de Reedschap afslaten un löppt noch."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Dat is nich mööglich, en Signaal na den Perzess vun de Slottdatei to "
+#~ "sennen."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Slottdatei \"%1\" lett sik nich opstellen. Bitte prööv, wat Du noog "
+#~ "Verlöven hest."
diff --git a/tde-i18n-nl/messages/tdepim/kandy.po b/tde-i18n-nl/messages/tdepim/kandy.po
index fa65984d939..053d03fdfe3 100644
--- a/tde-i18n-nl/messages/tdepim/kandy.po
+++ b/tde-i18n-nl/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2007-07-14 12:51+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -19,638 +19,486 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Otto Bruggeman,Rinse de Vries,Bram Schoenmakers,Marout Yasuo Borms"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ",rinse@kde.nl,bramschoenmakers@kde.nl,"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nieuw commando"
 
 # arg is neem ik aan een argument bij een commando. verderop is GUI ook volledig vertaald dus afkorting hier dan toch ook?
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argument %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parameternaam invoeren:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem-fout"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Niet verbonden "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Kon het bestand %1 niet laden."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Kon het bestand %1 niet opslaan."
 
 # GUI is verderop wel volledig vertaald.
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Grafische interface van mobiele telefoon"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Verbinden"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Verbinding verbreken"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nieuw profiel"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Wijzigingen in profiel %1 opslaan?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Het modem-station %1 kon niet worden geopend."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem-fout"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Verbonden "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Seriële interface"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Vensters"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Naam"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Commando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hexidecimaal"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Toevoegen..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Bewerken..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Invoer:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Uitvoer:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultaat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Waarde invoeren voor %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Communicatie met uw mobiele telefoon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminalvenster tonen"
 
 # GUI is verderop wel volledig vertaald
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Grafische interface van mobiele telefoon tonen"
 
 # voorgaande bericht was volledig dus hier ook 'van mobile telefoon' toegevoegd
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Geen grafische interface van mobiele telefoon tonen"
 
 # moeten we niet letten op te lange samengestelde woorden? Dit ivm duidelijkheid?
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Bestandsnaam van commandoprofiel"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem staat uit."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem is bezet."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Bezig met lezen van telefoonboek van mobiele telefoon..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Bezig met schrijven naar telefoonboek van mobiele telefoon..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Telefoonboek van mobiele telefoon opgeslagen."
 
 # dit type bericht wordt voorgaand steeds met 'bezig met...' vertaald
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Bezig met lezen van TDE-adresboek..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE-adresboek gelezen."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE-adresboek geschreven."
 
 # in ID 41 en 42 wordt dit vertaald met  een voltooide tijd.
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Telefoonboek van mobiele telefoon gelezen."
 
 # KAB volledig vertalen
 # lang samengesteld woord
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Item van TDE-Adresboek:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Ingang van mobiele telefoon:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Conflicterende ingangen"
 
 # KAB volledig vertalen met TDE-adresboek
 # om lange samengestelde woorden te vermijden heb ik er 'item uit' van gemaakt
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Item uit TDE-adresboek gebruiken"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Ingang van mobiele telefoon gebruiken"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefoonboeken gesynchroniseerd."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-adresboek"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-adresboek (gewijzigd)"
 
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
 # onopgeslagen.... is dit niet verwarrend? vraagt dit er niet om dat men er overheen leest?
 # voorstel: 'niet-opgeslagen' geeft het gevaar mogelijk duidelijker weer.
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Het TDE-adresboek bevat niet-opgeslagen wijzigingen."
 
 # onopgeslagen.... is dit niet verwarrend? vraagt dit er niet om dat men er overheen leest?
 # voorstel: 'niet-opgeslagen' geeft het gevaar mogelijk duidelijker weer.
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Niet-opgeslagen wijzigingen"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefoonboek van mobiele telefoon"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefoonboek van mobiele telefoon (gewijzigd)"
 
 # onopgeslagen.... is dit niet verwarrend? vraagt dit er niet om dat men er overheen leest?
 # voorstel: 'niet-opgeslagen' geeft het gevaar mogelijk duidelijker weer.
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 "Het telefoonboek van de mobiele telefoon bevat niet-opgeslagen wijzigingen."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Station '%1' kon niet worden geopend. Controleer of u de benodigde "
 "toegangsrechten hebt."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Communicatiesetup is mislukt (tcgetattr code: %1)"
 
 # nietszeggende melding
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "De aanroep tcsetattr() is mislukt."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Kon het apparaat '%1' niet vergrendelen."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Vergrendelbestand '%1' kon niet worden geopend."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Vergrendelbestand '%1' kon niet worden gelezen."
-
-# krom nederlands? PID van een bestand lijkt me duidelijker
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "PID van bestand '%1' kon niet worden achterhaald."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Het proces met PID '%1', dat het apparaat vergrendelt, draait nog steeds."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Er kon geen signaal worden verzonden naar het proces van het bestaande "
-"vergrendelbestand."
-
-# taalvaudt gecorrigeerd
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Vergrendelbestand '%1' kon niet worden aangemaakt. Controleer of u de benodigde "
-"toegangsrechten hebt."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Tonen"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Commando-eigenschappen"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Naam:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Tekenreeks:"
 
 # elders is Hex ook volledig vertaald
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hexadecimaal-resultaat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Positie"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Waarde"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobiel apparaat"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modelinformatie"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serienummer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabrikant:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-versie:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresboeken"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefoon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Lezen"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Schrijven"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Opslaan naar bestand..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synchroniseren"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batterijlading:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kwaliteit van signaal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Verversen"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Klok instellen"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serieel apparaat"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baudrate"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Map vergrendelen"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Modem openen bij het opstarten"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Klok van mobiel automatisch instellen bij verbinding"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Thuisnummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Werknummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Berichtnummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Faxnummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Mobiele nummers uitsluiten"
 
 # videotelefonie heet in de volksmond 'beeldtelefonie' (als zodanig ook in ziekkenfondspakket ;-))
 # lange samengestelde woorden vermijden
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Beeldtelefoonnummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Postbusnummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modemnummers uitsluiten"
 
 # lange samengestelde woorden
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Autotelefoonnummers uitsluiten"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN-nummers uitsluiten"
 
 # pager = semafoon
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Semafoonnummers uitsluiten"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Doorkiesnummer thuis gebruiken"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Doorkiesnummer werk gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Doorkiesnummer voor berichten gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Doorkiesnummer voor fax gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # hier had men het opeens over een voorvoegsel ipv achtervoegsel
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Doorkiesnummer voor mobiele telefoon gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # videotelefonie = beeldtelefonie
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Doorkiesnummer voor beeldtelefoon gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # die postbus... bedoelen ze neit gewoon een voicemailbox? kunnen we dat niet duidelijker maken?
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Doorkiesnummer voor voicemailbox gebruiken"
@@ -658,121 +506,232 @@ msgstr "Doorkiesnummer voor voicemailbox gebruiken"
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # modem... daaarmee bedoelden ze in mijn tijd de data-verbinding mee.
 # is de vertaling 'data' een alternatief?
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Doorkiesnummer voor modem gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # autoachtervoegsel; dat is een aanhangwagen ;-) Autotelefoon dus ;-)
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Doorkiesnummer voor autotelefoon gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Doorkiesnummer voor ISDN gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # pager = semafoon
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Doorkiesnummer voor semafoon gebruiken"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Doorkiesnummer thuis"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Doorkiesnummer werk"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Doorkiesnummer voor berichten"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Doorkiesnummer voor fax"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Doorkiesnummer voor mobiele telefoon"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
 # beeldtelefoon
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Doorkiesnummer voor beeldtelefoon"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Doorkiesnummer voor voicemailbox"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Doorkiesnummer voor modem"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Doorkiesnummer voor autotelefoon"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Doorkiesnummer voor ISDN"
 
 # erg onduidelijk met die achtervoegsels.... men bedoelt hier waarschijnlijk doorkiesnummers....?
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Doorkiesnummer voor semafoon"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Terminalvenster openen bij het opstarten"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Venster van mobiele telefoon openen bij opstarten"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Tonen"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobiel apparaat"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modelinformatie"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serienummer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabrikant:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-versie:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresboeken"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefoon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Lezen"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Schrijven"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Opslaan naar bestand..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synchroniseren"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batterijlading:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kwaliteit van signaal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Verversen"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Klok instellen"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Vergrendelbestand '%1' kon niet worden geopend."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Vergrendelbestand '%1' kon niet worden gelezen."
+
+# krom nederlands? PID van een bestand lijkt me duidelijker
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "PID van bestand '%1' kon niet worden achterhaald."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Het proces met PID '%1', dat het apparaat vergrendelt, draait nog steeds."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Er kon geen signaal worden verzonden naar het proces van het bestaande "
+#~ "vergrendelbestand."
+
+# taalvaudt gecorrigeerd
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Vergrendelbestand '%1' kon niet worden aangemaakt. Controleer of u de "
+#~ "benodigde toegangsrechten hebt."
diff --git a/tde-i18n-nn/messages/tdepim/kandy.po b/tde-i18n-nn/messages/tdepim/kandy.po
index 1053bc61b10..ba9adefc094 100644
--- a/tde-i18n-nn/messages/tdepim/kandy.po
+++ b/tde-i18n-nn/messages/tdepim/kandy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-08-04 17:42+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -20,709 +20,669 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gaute Hvoslef Kvalnes, Håvard Korsvoll"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "gaute@verdsveven.com, korsvoll@skulelinux.no"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ny kommando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Skriv inn parameternamnet:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemfeil"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Kopla frå "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Klarte ikkje lasta fila %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Klarte ikkje lagra fila «%1»."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobilgrensesnitt"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Kopla til"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Kopla frå"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Ny profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Lagra endringane i profilen %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Kan ikkje opna modemeininga %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemfeil"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Tilkopla "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serielt grensesnitt"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Adressebøker"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Vindauge"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Namn"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Kommando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heksadesimal"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Legg til …"
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Rediger …"
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Køyr"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Inn:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Ut:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Oppgje verdi for %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Kommuniserer med mobiltelefonen"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Vis terminalvindauge"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Vis mobilgrensesnitt"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ikkje vis grensesnitt"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Filnamnet på kommandoprofilfila"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modemet er av."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modemet er oppteke."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Les nummerliste frå mobiltelefon …"
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Skriv nummerliste til mobiltelefon …"
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Skreiv nummerliste til mobiltelefon."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Las TDE-adressebok"
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Las TDE-adressebok"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Skreiv TDE-adressebok"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Les nummerliste frå mobiltelefon."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab-oppføring:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobiloppføring:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Oppføringar med konflikt"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Bruk Kab-oppføring"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Bruk mobiloppføring"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Synkroniserte nummerlister."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-adressebok"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "TDE-adressebok"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonliste for mobil"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonliste for mobil"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Klarer ikkje opna eining «%1». Sjå etter at du har nødvendige løyve."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() feila."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Klarer ikkje opna låsefil «%1»."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Klarer ikkje opna låsefil «%1»."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Klarer ikkje lesa låsefil «%1»."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Klarer ikkje få PID frå fil «%1»."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Prosess med PID %1, som låser eininga, køyrer framleis."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Klarer ikkje gje signal til PID av eksisterande låsefil."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "Klarer ikkje laga låsefil «%1». Sjå etter at du har nødvendige løyve."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Vis"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Kommandoeigenskapar"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Namn:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Streng:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Heksresultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posisjon"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Verdi"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobileining"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modellinformasjon"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modell:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serienummer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Produsent:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-versjon:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adressebøker"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Les"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skriv"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Lagra til fil …"
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synkroniser"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batterinivå:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signalstyrke:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Frisk opp"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Seriell eining"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Opna modem ved oppstart"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Bruk mobiloppføring"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Modemet er av."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Opna terminalvindauge ved oppstart"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Opna mobilvindauge ved oppstart"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Vis"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobileining"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modellinformasjon"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modell:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serienummer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Produsent:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-versjon:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adressebøker"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Les"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skriv"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Lagra til fil …"
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synkroniser"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batterinivå:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signalstyrke:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Frisk opp"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Klarer ikkje opna låsefil «%1»."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Klarer ikkje lesa låsefil «%1»."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Klarer ikkje få PID frå fil «%1»."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Prosess med PID %1, som låser eininga, køyrer framleis."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Klarer ikkje gje signal til PID av eksisterande låsefil."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Klarer ikkje laga låsefil «%1». Sjå etter at du har nødvendige løyve."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() feila."
 
diff --git a/tde-i18n-pl/messages/tdepim/kandy.po b/tde-i18n-pl/messages/tdepim/kandy.po
index 3b4b8f525eb..e29a0ea06ca 100644
--- a/tde-i18n-pl/messages/tdepim/kandy.po
+++ b/tde-i18n-pl/messages/tdepim/kandy.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-12-05 21:23+0100\n"
 "Last-Translator: Michal Rudolf <mrudolf@kdewebdev.org>\n"
 "Language-Team: Polish <kdei18n-pl-devel@lists.sourceforge.net>\n"
@@ -22,705 +22,665 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Marcin Giedz, Mikolaj Machowski, Marcin Bokszczanin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "mgiedz@elka.pw.edu.pl, mikmach@wp.pl, mboksz _at_ bcig.pl"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nowe polecenie"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Wprowadź nazwę parametru:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Błąd modemu"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Odłączony "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nie można wczytać pliku %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Nie można zapisać pliku %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Okno komórki"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Połącz"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nowy profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Zapisać zmiany profilu %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Nie można otworzyć modemu %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Błąd modemu"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Połączony "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interfejs szeregowy"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Okna"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nazwa"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Polecenie"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Wejście:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Wyjście:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Wynik:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Wprowadź wartość dla %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Komunikacja z Twoim telefonem komórkowym."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Pokaż okno terminala"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Pokaż okno komórki"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Nie pokazuj okna komórki"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nazwa pliku profilu poleceń"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem jest wyłączony."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem jest zajęty."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Czytanie książki adresowej komórki..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Zapisywanie książki telefonicznej komórki..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Zapisano książkę adresową komórki."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Czytanie książki adresowej TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Wczytano książkę adresową TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Zapisano książkę adresową TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Wczytano książkę adresową komórki."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Wpis Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Wpis w komórce:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Wpisy wykluczające się"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Użyj wpisu Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Użyj wpisu z komórki"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Książki adresowe zsynchronizowane."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Książka adresowa TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Książka adresowa TDE (zmieniona)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Książka adresowa TDE zawiera niezapisane zmiany."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Niezapisane zmiany"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Książka telefoniczna komórki"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Książka telefoniczna komórki (zmieniona)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Książka telefoniczna komórki zawiera niezapisane zmiany."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Nie można otworzyć urządzenia '%1'. Proszę, sprawdź czy masz odpowiednie "
 "uprawnienia."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Nawiązanie komunikacji nie powiodło się (kod tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() nie powiodło się."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Nie można utworzyć blokady dla urządzenia '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Nie można otworzyć pliku blokady '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Nie można odczytać pliku blokady '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Nie można uzyskać PID z pliku '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces o PID %1, który blokuje urządzenie, cały czas jest uruchomiony."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Nie można wysłać sygnału do PID istniejącego pliku blokady."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Nie można utworzyć pliku blokady '%1'. Proszę, sprawdź czy masz odpowiednie "
-"uprawnienia."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Pokaż"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Właściwości polecenia"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nazwa:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Ciąg znaków:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Wynik Hex"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozycja"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametr"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Wartość"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Urządzenie przenośne"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informacja o modelu"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Numer seryjny:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Producent:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Wersja GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Książki adresowe"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Czytaj"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Zapisz"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Zapisz do pliku..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synchronizuj"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Stan baterii:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Jakość sygnału:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Odśwież"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Ustaw zegar"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Urządzenie szeregowe"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Prędkość (b/s)"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Katalog blokad"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Otwórz modem przy starcie"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Automatycznie ustaw zegar komórki przy połączeniu"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Wyłącz numery domowe"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Wyłącz numery do pracy"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Wyłącz numery komunikatorów"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Wyłącz numery faksów"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Wyłącz numery komórek"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Wyłącz numery wideofonów"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Wyłącz numery skrzynek pocztowych"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Wyłącz numery modemów"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Wyłącz numery telefonów w samochodach"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Wyłącz numery ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Wyłącz numery pagerów"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Użyj przyrostka domowego"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Użyj przyrostka do pracy"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Użyj przyrostka komunikatorowego"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Użyj przyrostka faksu"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Użyj przyrostka komórek"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Użyj przyrostka wideo"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Użyj przyrostka pocztowego"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Użyj przyrostka modemowego"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Użyj przyrostka samochodowego"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Użyj przyrostka ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Użyj przyrostka pagera"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Przyrostek"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Otwórz okno terminala przy starcie"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Otwórz okno komórki przy starcie"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Pokaż"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Urządzenie przenośne"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informacja o modelu"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Numer seryjny:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Producent:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Wersja GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Książki adresowe"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Czytaj"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Zapisz"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Zapisz do pliku..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synchronizuj"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Stan baterii:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Jakość sygnału:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Ustaw zegar"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Nie można otworzyć pliku blokady '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Nie można odczytać pliku blokady '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Nie można uzyskać PID z pliku '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Proces o PID %1, który blokuje urządzenie, cały czas jest uruchomiony."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Nie można wysłać sygnału do PID istniejącego pliku blokady."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Nie można utworzyć pliku blokady '%1'. Proszę, sprawdź czy masz "
+#~ "odpowiednie uprawnienia."
diff --git a/tde-i18n-pt/messages/tdepim/kandy.po b/tde-i18n-pt/messages/tdepim/kandy.po
index eaa9810e615..6d99432f467 100644
--- a/tde-i18n-pt/messages/tdepim/kandy.po
+++ b/tde-i18n-pt/messages/tdepim/kandy.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-09-20 22:35+0100\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -14,703 +14,664 @@ msgstr ""
 "X-POFile-IgnoreConsistency: Read\n"
 "X-POFile-SpellExtra: pager\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "José Nuno Pires,Pedro Morais"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "jncp@netcabo.pt,morais@kde.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Novo Comando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Indique o nome do parâmetro:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Erro do Modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Desligado "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Não consigo ler do ficheiro %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Não foi possível gravar o ficheiro %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Interface do Telemóvel"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Ligar"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Desligar"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Novo Perfil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Gravar as alterações no perfil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Não consigo abrir o dispositivo do modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Erro do Modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Ligado "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interface Série"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Livro de Endereços"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Janelas"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Comando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Adicionar..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Editar..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Executar"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Entrada:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Saída:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultado:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Indique um valor para %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "A comunicar com o seu telemóvel."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Mostra a janela do terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mostra a interface do telemóvel"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Não mostrar a interface"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Ficheiro com o perfil de comandos"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "O modem está desligado."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "O modem está ocupado."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "A ler a agenda do telemóvel..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "A gravar na agenda do telemóvel..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Agenda do telemóvel gravada."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "A ler o livro de endereços do TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Livro de endereços do TDE lido."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Livro de endereços do TDE gravado."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Agenda do telemóvel lida."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Item do Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Item do Telemóvel:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Itens em Conflito"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Usar o Item do Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Usar o Item do Telemóvel"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Agendas sincronizadas."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Livro de Endereços do TDE:"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Livro de Endereços do TDE (modificado)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "O livro de endereços do TDE contém alterações por gravar."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Alterações Não Gravadas"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Agenda do Telemóvel"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Agenda do Telemóvel (modificado)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "A agenda to telemóvel contém alterações por gravar."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Não foi possível abrir o dispositivo '%1'. Por favor verifique que tem "
 "permissão."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Início da comunicação falho (código tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() falhou."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Não foi possível trancar o dispositivo '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Não foi possível abrir o ficheiro de exclusão '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Não foi possível ler o ficheiro de exclusão '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Não foi possível obter o PID do ficheiro '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Processo com o PID %1, a trancar o dispositivo, ainda está a correr."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Não foi possível emitir sinal para o PID do ficheiro de exclusão existente."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Não foi possível criar o ficheiro de exclusão '%1'. Por favor verifique que tem "
-"permissão."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "Mo&strar"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Propriedades do Comando"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nome:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Texto:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Resultado hex"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posição"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parâmetro"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositivo Móvel"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informação do Modelo"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modelo:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Número de série:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabricante:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versão do GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Livros de Endereços"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefone"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Leitura"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Escrita"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Gravar num Ficheiro..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sincronizar"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Estado"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Carga da bateria:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Qualidade do sinal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Actualizar"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Acertar o Relógio"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dispositivo série"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Taxa de baud"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Pasta de bloqueio"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Aceder ao modem no arranque"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Acertar automaticamente o relógio do telemóvel ao ligar"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Excluir os números da residência"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Excluir os números do trabalho"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Excluir os números de mensagens"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Excluir os números de fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Excluir os números de telemóvel"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Excluir os números de videofone"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Excluir os números da caixa do correio"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Excluir os números do modem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Excluir os números do telefone da viatura"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Excluir os números de RDIS"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Excluir os números do 'pager'"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Usar o sufixo da residência"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Usar o sufixo do trabalho"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Usar o sufixo das mensagens"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Usar o sufixo do fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Usar o sufixo do telemóvel"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Usar o sufixo do vídeo"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Usar o sufixo da caixa de correio"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Usar o sufixo do modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Usar o sufixo da viatura"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Usar o sufixo de RDIS"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Usar o sufixo do 'pager'"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Sufixo da residência"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Sufixo do trabalho"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sufixo de mensagens"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Sufixo do fax"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Sufixo do telemóvel"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Sufixo do vídeo"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Sufixo da caixa do correio"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Sufixo do modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Sufixo da viatura"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Sufixo de RDIS"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Sufixo do 'pager'"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Abrir um terminal no arranque"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Abrir a janela do telemóvel no arranque"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "Mo&strar"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositivo Móvel"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informação do Modelo"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modelo:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Número de série:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabricante:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versão do GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Livros de Endereços"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefone"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Leitura"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Escrita"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Gravar num Ficheiro..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sincronizar"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Estado"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Carga da bateria:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Qualidade do sinal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Acertar o Relógio"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Não foi possível abrir o ficheiro de exclusão '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Não foi possível ler o ficheiro de exclusão '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Não foi possível obter o PID do ficheiro '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Processo com o PID %1, a trancar o dispositivo, ainda está a correr."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Não foi possível emitir sinal para o PID do ficheiro de exclusão "
+#~ "existente."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Não foi possível criar o ficheiro de exclusão '%1'. Por favor verifique "
+#~ "que tem permissão."
diff --git a/tde-i18n-pt_BR/messages/tdepim/kandy.po b/tde-i18n-pt_BR/messages/tdepim/kandy.po
index eafcd99161e..7d40fe8776d 100644
--- a/tde-i18n-pt_BR/messages/tdepim/kandy.po
+++ b/tde-i18n-pt_BR/messages/tdepim/kandy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-10-12 16:51-0300\n"
 "Last-Translator: Henrique Pinto <henrique.pinto@kdemail.net>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_BR@kde.org>\n"
@@ -18,707 +18,666 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Lisiane Sztoltz Teixeira, Antonio Sergio de Mello e Souza"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "lisiane@kdemail.net, asergioz@bol.com.br"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Novo comando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argumento %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Digite o nome do parâmetro:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Erro de Modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "Desconectado"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Não foi possível carregar o arquivo %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Não foi possível salvar o arquivo %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI Móvel"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Conectar"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Novo Perfil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Salvar mudanças para o perfile %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Não foi possível abrir o dispositivo de modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Erro de Modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "Conectado"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interface Serial"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Livros de Endereços"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Janelas"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Comando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hexadecimal"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Adicionar..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Editar..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Executar"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Entrada:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Saída:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultado:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Digite o valor para %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Comunicando com seu telefone móvel."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Mostrar janela de terminal"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Mostrar Interface Móvel"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Não mostrar interface"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Nome de arquivo de perfil de comando"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "O Modem está desligado."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "O Modem está ocupado."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Lendo detalhes do telefone móvel ..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Escrevendo configurações do telefone móvel ..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Escreveu no Livro de telefones móvel."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Lendo o Livro de Endereços do TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Leu o Livro de Endereços do TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Livro de Endereços do TDE foi salvo."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Leu livro de telefones móvel."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Entrada do Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Entrada móvel:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Entradas conflitantes."
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Usar Entrada do KAB"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Usar Entrada Móvel"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Livro de telefones Sincronizado."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Livro de Endereços do TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Livro de Endereços do TDE (modificado)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "O Livro de Endereços do TDE contém modificações que não foram salvas."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Modificações não-salvas"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Livro de Telefones Móvel"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Livro de Telefones Móvel (modificado)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "O Livro de Telefones Móvel contém modificações que não foram salvas."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Não foi possível abrir o dispositivo '%1'. Por favor, verifique se você tem "
 "permissões suficientes."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Configuração de comunicação falhou (código do tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() falhou."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Impossível travar dispositivo '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Impossível abrir arquivo de trava '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Impossível ler arquivo de trava '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Impossível obter PID a partir do arquivo '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Processo com pid %1, o qual está travando o dispositivo, ainda está em "
-"execução."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Impossível emitir sinal para PID do arquivo de trava existente."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Impossível criar arquivo de trava '%1'. Por favor, verifique se você tem "
-"permissões suficientes."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Mostrar"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Propriedades do comando"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nome:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "String:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Resultado em hexadecimal"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Posição"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parâmetro"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispositivo móvel"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informações sobre o Modelo"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modelo:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Número serial:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Fabricante:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "versão GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Livros de Endereços"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefone"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Leitura"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Escrita"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Salvar em arquivo..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sincronizar"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Carga da bateria:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Qualidade do sinal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Atualizar"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Configurar Relógio"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Dispositivo serial"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Taxa de transmissão"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Diretório de lock"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Abrir modem na inicialização"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Configurar automaticamente o relógio do disp móvel ao conectar"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Excluir membros de Casa"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Excluir membros de Trabalho"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Excluir números do mensageiro (IM)"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Excluir números de fax"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Excluir números de celulares"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Excluir números de vídeo-fone"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Excluir números de caixas de correio"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Excluir números de modem"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Excluir números de telefones automotivos"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Excluir números de ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Excluir números de pager"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Usar sufixo de Casa"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Usar sufixo do Trabalho"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Usar sufixo do IM"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Usar sufixo do Fax"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Usar sufixo do Disp Móvel"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Usar sufixo de vídeo"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Usar sufixo da caixa de correio"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Usar sufixo do modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Usar sufixo do Carro"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Usar sufixo do ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Usar sufixo do Pager"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Sufixo de Casa"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Sufixo do Trabalho"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sufixo do IM"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Sufixo do Fax"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Sufixo do Celular"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Sufixo de vídeo"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Sufixo da caixa de correio"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Sufixo do modem"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Sufixo do Carro"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Sufixo do ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Sufixo do Pager"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Abrir janela de terminal na inicialização"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Abrir janela móvel na inicialização"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Mostrar"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispositivo móvel"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informações sobre o Modelo"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modelo:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Número serial:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Fabricante:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "versão GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Livros de Endereços"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefone"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Leitura"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Escrita"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Salvar em arquivo..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sincronizar"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Carga da bateria:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Qualidade do sinal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Configurar Relógio"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Impossível abrir arquivo de trava '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Impossível ler arquivo de trava '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Impossível obter PID a partir do arquivo '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Processo com pid %1, o qual está travando o dispositivo, ainda está em "
+#~ "execução."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Impossível emitir sinal para PID do arquivo de trava existente."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Impossível criar arquivo de trava '%1'. Por favor, verifique se você tem "
+#~ "permissões suficientes."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() falhou."
diff --git a/tde-i18n-ro/messages/tdepim/kandy.po b/tde-i18n-ro/messages/tdepim/kandy.po
index 697f115e998..040e527b9d7 100644
--- a/tde-i18n-ro/messages/tdepim/kandy.po
+++ b/tde-i18n-ro/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2001-04-17 22:12+0200\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <ro-kde@egroups.com>\n"
@@ -15,710 +15,649 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9alpha\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Claudiu Costin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "claudiuc@kde.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Comandă nouă"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argument %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 #, fuzzy
 msgid "Enter parameter name:"
 msgstr "Introduceţi numele parametrului"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Eroare modem"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr ""
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nu pot încărca fişierul %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "Nu pot salva fişierul %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr ""
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr ""
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Profil nou"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Salvez modificările în profilul %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Nu pot deschide dispozitivul modem %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Eroare modem"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr ""
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Interfaţă serială"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Scrie în Cartea de adrese TDE"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nume"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Comandă"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hexa"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr ""
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr ""
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Execută"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Intrare:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Ieşire:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Rezultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 #, fuzzy
 msgid "Enter value for %1:"
 msgstr "Introduceţi valoarea pentru %1"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr ""
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr ""
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modemul este oprit."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modemul este ocupat."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Citeşte din Cartea de adrese TDE"
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 #, fuzzy
 msgid "Read TDE address book."
 msgstr "Citeşte din Cartea de adrese TDE"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Scrie în Cartea de adrese TDE"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, fuzzy, no-c-format
 msgid "TDE Address Book"
 msgstr "Scrie în Cartea de adrese TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "Scrie în Cartea de adrese TDE"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, fuzzy, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Carte de telefon"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Carte de telefon"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr ""
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Afişează"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Proprietăţi comandă"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nume:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Text:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, fuzzy, no-c-format
 msgid "Hex result"
 msgstr "Rezultat hexa"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Poziţie"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametru"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Valoare"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Dispozitiv mobil"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Model Information"
-msgstr "Informaţii model"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, fuzzy, no-c-format
-msgid "Serial number:"
-msgstr "Număr serial:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Producător:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Versiune GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "Address Books"
-msgstr "Scrie în Cartea de adrese TDE"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Phone"
-msgstr "Carte de telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Write"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Save to File..."
-msgstr "Salvează în fişier"
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stare"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, fuzzy, no-c-format
-msgid "Battery charge:"
-msgstr "Încărcare baterie:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, fuzzy, no-c-format
-msgid "Signal quality:"
-msgstr "Calitate semnal:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Actualizează"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
-#, no-c-format
-msgid "Set Clock"
-msgstr ""
-
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, fuzzy, no-c-format
 msgid "Serial device"
 msgstr "Dispozitiv serial"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Modemul este oprit."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr ""
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Afişează"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Dispozitiv mobil"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informaţii model"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, fuzzy, no-c-format
+msgid "Serial number:"
+msgstr "Număr serial:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Producător:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Versiune GSM:"
+
+#: src/mobilegui_base.ui:145
+#, fuzzy, no-c-format
+msgid "Address Books"
+msgstr "Scrie în Cartea de adrese TDE"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, fuzzy, no-c-format
+msgid "Phone"
+msgstr "Carte de telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr ""
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr ""
+
+#: src/mobilegui_base.ui:276
+#, fuzzy, no-c-format
+msgid "Save to File..."
+msgstr "Salvează în fişier"
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr ""
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stare"
+
+#: src/mobilegui_base.ui:405
+#, fuzzy, no-c-format
+msgid "Battery charge:"
+msgstr "Încărcare baterie:"
+
+#: src/mobilegui_base.ui:413
+#, fuzzy, no-c-format
+msgid "Signal quality:"
+msgstr "Calitate semnal:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Actualizează"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
 #, fuzzy
 #~ msgid "&Modem"
 #~ msgstr "Model:"
diff --git a/tde-i18n-ru/messages/tdepim/kandy.po b/tde-i18n-ru/messages/tdepim/kandy.po
index 0118872478b..08632bb3377 100644
--- a/tde-i18n-ru/messages/tdepim/kandy.po
+++ b/tde-i18n-ru/messages/tdepim/kandy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-09-19 13:36+0400\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -16,705 +16,665 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Виталий Лопатин,Андрей Черепанов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "vitls@chat.ru,sibskull@mail.ru"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Новая команда"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Аргумент %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Введите имя параметра:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Ошибка модема"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Разъединён "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Не удаётся загрузить файл %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Не удаётся сохранить файл %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Графический интерфейс с телефоном"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Подключиться"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Отключиться"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Новый профиль"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Сохранить изменения в профиле %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Не удаётся открыть устройство модема %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Ошибка модема"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Соединён "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Последовательный интерфейс"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Окна"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Имя"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Команда"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Шестнадцатеричный"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Добавить..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Выполнить"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Ввод:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Вывод:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Результат:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Введите значение для %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Соединение с мобильным телефоном."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Показать окно терминала"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Показать экран телефона"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Не показывать экран"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Имя файла профиля команд"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модем выключен."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модем занят."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Читаю мобильную телефонную книгу..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Запись мобильной телефонной книги..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Записана мобильная телефонная книга."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Чтение из адресной книги TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Прочитана адресная книга TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Записана адресная книга TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Прочитана мобильная телефонная книга."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Запись адресной книги TDE:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Запись с телефона:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Конфликтующие записи"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Использовать запись из адресной книги TDE"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Использовать запись с телефона"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Телефонные книги синхронизированы."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Адресная книга TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Адресная книга TDE (изменена)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Адресная книга TDE содержит несохранённые изменения."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Несохранённые изменения"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Телефонная книга мобильного телефона"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Телефонная книга мобильного телефона (изменена)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Адресная книга мобильного телефона содержит несохранённые изменения."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Не удаётся открыть устройство '%1'. Проверьте права доступа к файлу."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Ошибка подключения (код tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Ошибка вызова tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Невозможно заблокировать устройство '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Не удаётся открыть файл блокировки '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Не удаётся прочитать файл блокировки '%1'."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Не удаётся получить номер процесса из файла '%1'."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Процесс с номером %1, который заблокировал устройство, всё ещё запущен."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Невозможно послать сигнал процессу с номером, определённым в файле блокировки."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Не удаётся создать файл блокировки '%1'. Проверьте права доступа к файлу."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Показать"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Свойства команд"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Имя:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Строка:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Шестнадцатеричный результат"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Расположение"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметр"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Значение"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Мобильное устройство"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Сведения о модели"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Модель:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Серийный номер:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Manufacturer:"
-msgstr "Производитель:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Версия GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адресные книги"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Прочитать"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Записать"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Сохранить в файл..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Синхронизировать"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Статус"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Заряд батарей:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Качество сигнала:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Обновить"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Установка времени"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Последовательное устройство"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Скорость передачи данных"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Заблокировать каталог"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Подключиться к модему при запуске"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Установить время на мобильном телефоне при запуске"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Исключить домашние номера"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Исключить служебные номера"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Исключить номера автоответчиков"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Исключить номера факсов"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Исключить номера мобильных"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Исключить номера видеотелефонов"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Исключить номера голосовых ящиков"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Исключить номера модемов"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Исключить номера телефонов в автомобилях"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Исключить номера ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Исключить номера пейджеров"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Использовать суффикс для домашних номеров"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Использовать суффикс для служебных номеров"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Использовать суффикс для автоответчиков"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Использовать суффикс для факсов"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Использовать суффикс для мобильных номеров"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Использовать суффикс для видеотелефонов"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Использовать суффикс для голосовых ящиков"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Использовать суффикс для модемов"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Использовать суффикс для телефонов в автомобилях"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Использовать суффикс для номеров ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Использовать суффикс для пейджеров"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Суффикс домашних номеров"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Суффикс служебных номеров"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Суффикс автоответчиков"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Суффикс факсов"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Суффикс мобильных"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Суффикс видеотелефонов"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Суффикс голосовых ящиков"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Суффикс модемов"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Суффикс телефонов в автомобилях"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Суффикс номеров ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Суффикс пейджеров"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Открыть окно терминала при запуске"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Открыть окно телефона при запуске"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Показать"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Мобильное устройство"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Сведения о модели"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Модель:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Серийный номер:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Производитель:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Версия GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адресные книги"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Прочитать"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Записать"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Сохранить в файл..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Синхронизировать"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Статус"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Заряд батарей:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Качество сигнала:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Обновить"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Установка времени"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Не удаётся открыть файл блокировки '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Не удаётся прочитать файл блокировки '%1'."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Не удаётся получить номер процесса из файла '%1'."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Процесс с номером %1, который заблокировал устройство, всё ещё запущен."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Невозможно послать сигнал процессу с номером, определённым в файле "
+#~ "блокировки."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Не удаётся создать файл блокировки '%1'. Проверьте права доступа к файлу."
diff --git a/tde-i18n-rw/messages/tdepim/kandy.po b/tde-i18n-rw/messages/tdepim/kandy.po
index 66131364673..76db7e08a97 100644
--- a/tde-i18n-rw/messages/tdepim/kandy.po
+++ b/tde-i18n-rw/messages/tdepim/kandy.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-05-25 18:53-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -32,7 +32,7 @@ msgstr ""
 "Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
 "NSENGIYUMVA"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -40,733 +40,692 @@ msgstr ""
 "muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
 "ndonatienuk@yahoo.co.uk"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ibwirizwa Rishya"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, fuzzy, c-format
 msgid "Arg %1"
 msgstr "<Komatanya %1>"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 #, fuzzy
 msgid "Enter parameter name:"
 msgstr "Ikintu Izina: : "
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Ikosa "
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 #, fuzzy
 msgid " Disconnected "
 msgstr "Byatandukanye"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, fuzzy, c-format
 msgid "Could not load file %1"
 msgstr "OYA Ibirimo Idosiye %1 "
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, fuzzy, c-format
 msgid "Could not save file %1."
 msgstr "OYA Kubika Idosiye %1 . "
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 #, fuzzy
 msgid "Mobile GUI"
 msgstr "Igendanwa"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Kwihuza"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Gucomokora"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 #, fuzzy
 msgid "New Profile"
 msgstr "Ibijyana Bishya..."
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 #, fuzzy
 msgid "Save changes to profile %1?"
 msgstr "Kubika Amahinduka Kuri Ibijyana %1 ? "
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, fuzzy, c-format
 msgid "Cannot open modem device %1."
 msgstr "Gufungura Modemu APAREYE %1 . "
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 #, fuzzy
 msgid "Modem Error"
 msgstr "Ikosa "
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 #, fuzzy
 msgid " Connected "
 msgstr "Kwihuza"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 #, fuzzy
 msgid "Serial Interface"
 msgstr "Ahagenewe Ukoresha"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Agatabo k'Aderesi"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Windows"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Izina"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Icyo wifuza"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr ""
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Ongera..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Kwandika..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Gukora"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 #, fuzzy
 msgid "Input:"
 msgstr "Iyinjiza"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 #, fuzzy
 msgid "Output:"
 msgstr "Ibisohoka"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 #, fuzzy
 msgid "Result:"
 msgstr "Igisubizo"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 #, fuzzy
 msgid "Enter value for %1:"
 msgstr "Agaciro: ya:  %1 : "
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Na: Telefoni igendanwa Telefone . "
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Bihera Idirishya "
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Telefoni igendanwa "
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "OYA Herekana %S "
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Bya command Ibijyana Idosiye "
 
-#: main.cpp:69
+#: src/main.cpp:69
 #, fuzzy
 msgid "Modem is off."
 msgstr "ni Bidakora . "
 
-#: main.cpp:74
+#: src/main.cpp:74
 #, fuzzy
 msgid "Modem is busy."
 msgstr "ni Irahuze . "
 
-#: main.cpp:90
+#: src/main.cpp:90
 #, fuzzy
 msgid "Kandy"
 msgstr "na"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 #, fuzzy
 msgid "Reading mobile phonebook..."
 msgstr "Telefoni igendanwa ... "
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 #, fuzzy
 msgid "Writing mobile phonebook..."
 msgstr "Telefoni igendanwa ... "
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 #, fuzzy
 msgid "Wrote mobile phonebook."
 msgstr "Telefoni igendanwa . "
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "MukusanyaTDE Aderesi: Igitabo ... "
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 #, fuzzy
 msgid "Read TDE address book."
 msgstr "MukusanyaTDE Aderesi: Igitabo . "
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "MukusanyaTDE Aderesi: Igitabo . "
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 #, fuzzy
 msgid "Read mobile phonebook."
 msgstr "Telefoni igendanwa . "
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 #, fuzzy
 msgid "Kab Entry:"
 msgstr "Icyinjizwa:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 #, fuzzy
 msgid "Mobile Entry:"
 msgstr "Telefoni igendanwa:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 #, fuzzy
 msgid "Conflicting Entries"
 msgstr "Icyitonderwa cy'ikomeza"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 #, fuzzy
 msgid "Use Kab Entry"
 msgstr "Icyinjizwa cy'ukoresha"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 #, fuzzy
 msgid "Use Mobile Entry"
 msgstr "Icyinjizwa cy'ukoresha"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, fuzzy, no-c-format
 msgid "TDE Address Book"
 msgstr "MukusanyaTDE "
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "MukusanyaTDE ( Byahinduwe: ) "
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 #, fuzzy
 msgid "The TDE address book contains unsaved changes."
 msgstr "MukusanyaTDE Aderesi: Igitabo ifite Amahinduka . "
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 #, fuzzy
 msgid "Unsaved Changes"
 msgstr "Isubiranyuma y'Impinduka"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, fuzzy, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefoni igendanwa"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "( Byahinduwe: ) "
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 #, fuzzy
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Telefoni igendanwa Telefone Igitabo ifite Amahinduka . "
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Bihera"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 #, fuzzy
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Kuri Gufungura APAREYE ' %1 ' . Kugenzura Uruhushya . "
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 #, fuzzy
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Imikorere Byanze ( Inyandikoporogaramu : %1 ) "
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 #, fuzzy
 msgid "tcsetattr() failed."
 msgstr "( ) Byanze . "
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Kuri Gufunga APAREYE ' %1 ' . "
 
-#: modem.cpp:301
-#, fuzzy
-msgid "Unable to open lock file '%1'."
-msgstr "Ntibishoboka gufungura idosiye ifunga."
-
-#: modem.cpp:309
-#, fuzzy
-msgid "Unable to read lock file '%1'."
-msgstr "Kuri Soma Gufunga Idosiye ' %1 ' . "
-
-#: modem.cpp:319
-#, fuzzy
-msgid "Unable to get PID from file '%1'."
-msgstr "Kuri Kubona Kuva: Idosiye ' %1 ' . "
-
-#: modem.cpp:325
-#, fuzzy
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Na: %1 , ni i APAREYE , ni . "
-
-#: modem.cpp:331
-#, fuzzy
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Kuri Kuri Bya Gufunga Idosiye . "
-
-#: modem.cpp:337
-#, fuzzy
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "Byanzeguhimbaidosiyey'ingufuri."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, fuzzy, no-c-format
-msgid "&Show"
-msgstr "Garagaza"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Ibiranga by'ibwiriza"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Izina:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, fuzzy, no-c-format
 msgid "String:"
 msgstr "Ikurikiranyanyuguti"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, fuzzy, no-c-format
 msgid "Hex result"
 msgstr "Igisubizo "
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Ibirindiro"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Ikintu"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Agaciro"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Mobile Device"
-msgstr "Muyunguruzi y'apareye zigendanwa"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, fuzzy, no-c-format
-msgid "Model Information"
-msgstr "Amakuru arenze..."
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Urugero:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Serial number:"
-msgstr "Nomero y'icyiciro:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Umuhanzi:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, fuzzy, no-c-format
-msgid "GSM version:"
-msgstr "Verisiyo : "
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Ibitabo bya ma aderesi"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefone"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Soma"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Kwandika"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Save to File..."
-msgstr "Kubika Kuri Idosiye ... "
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Imimerere"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, fuzzy, no-c-format
-msgid "Battery charge:"
-msgstr "Kongera Umuriro mu Ibuye"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, fuzzy, no-c-format
-msgid "Signal quality:"
-msgstr "Ubwiza : "
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "xx %"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Kugira gishya"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
-#, fuzzy, no-c-format
-msgid "Set Clock"
-msgstr "Shyiraho amabara"
-
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, fuzzy, no-c-format
 msgid "Serial device"
 msgstr "APAREYE "
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, fuzzy, no-c-format
 msgid "Baud rate"
 msgstr "Igipimo "
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, fuzzy, no-c-format
 msgid "Lock directory"
 msgstr "Ububiko "
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, fuzzy, no-c-format
 msgid "Open modem on startup"
 msgstr "Gufungura Modemu ku Gutangira  "
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, fuzzy, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "- Gushyiraho Isaha Bya Telefoni igendanwa ku Ukwihuza "
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, fuzzy, no-c-format
 msgid "Exclude home numbers"
 msgstr "Home Imibare "
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, fuzzy, no-c-format
 msgid "Exclude work numbers"
 msgstr "Akazi Imibare "
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, fuzzy, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Imibare "
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, fuzzy, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Fagisi Imibare "
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, fuzzy, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Akazu Imibare "
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, fuzzy, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "inyerekanamashusho Telefone Imibare "
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, fuzzy, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Agasanduku k'ubutumwa Imibare "
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, fuzzy, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modemu Imibare "
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, fuzzy, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Imodoka Telefone Imibare "
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, fuzzy, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Imibare "
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, fuzzy, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Peja Imibare "
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, fuzzy, no-c-format
 msgid "Use home suffix"
 msgstr "Home Ingereka "
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, fuzzy, no-c-format
 msgid "Use work suffix"
 msgstr "Akazi Ingereka "
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, fuzzy, no-c-format
 msgid "Use messaging suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, fuzzy, no-c-format
 msgid "Use fax suffix"
 msgstr "Fagisi Ingereka "
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Telefoni igendanwa Ingereka "
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, fuzzy, no-c-format
 msgid "Use video suffix"
 msgstr "inyerekanamashusho Ingereka "
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, fuzzy, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Agasanduku k'ubutumwa Ingereka "
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, fuzzy, no-c-format
 msgid "Use modem suffix"
 msgstr "Modemu Ingereka "
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, fuzzy, no-c-format
 msgid "Use car suffix"
 msgstr "Imodoka Ingereka "
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, fuzzy, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, fuzzy, no-c-format
 msgid "Use pager suffix"
 msgstr "Peja Ingereka "
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, fuzzy, no-c-format
 msgid "Home suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, fuzzy, no-c-format
 msgid "Work suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, fuzzy, no-c-format
 msgid "Messaging suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, fuzzy, no-c-format
 msgid "Fax suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, fuzzy, no-c-format
 msgid "Cell suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, fuzzy, no-c-format
 msgid "Video suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, fuzzy, no-c-format
 msgid "Mailbox suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, fuzzy, no-c-format
 msgid "Car suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, fuzzy, no-c-format
 msgid "ISDN suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, fuzzy, no-c-format
 msgid "Pager suffix"
 msgstr "Ingereka "
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, fuzzy, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Gufungura Bihera Idirishya ku Gutangira  "
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, fuzzy, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Gufungura Telefoni igendanwa Idirishya ku Gutangira  "
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, fuzzy, no-c-format
+msgid "&Show"
+msgstr "Garagaza"
+
+#: src/mobilegui_base.ui:16
+#, fuzzy, no-c-format
+msgid "Mobile Device"
+msgstr "Muyunguruzi y'apareye zigendanwa"
+
+#: src/mobilegui_base.ui:41
+#, fuzzy, no-c-format
+msgid "Model Information"
+msgstr "Amakuru arenze..."
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Urugero:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Nomero y'icyiciro:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Umuhanzi:"
+
+#: src/mobilegui_base.ui:113
+#, fuzzy, no-c-format
+msgid "GSM version:"
+msgstr "Verisiyo : "
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Ibitabo bya ma aderesi"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefone"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Soma"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Kwandika"
+
+#: src/mobilegui_base.ui:276
+#, fuzzy, no-c-format
+msgid "Save to File..."
+msgstr "Kubika Kuri Idosiye ... "
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr ""
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Imimerere"
+
+#: src/mobilegui_base.ui:405
+#, fuzzy, no-c-format
+msgid "Battery charge:"
+msgstr "Kongera Umuriro mu Ibuye"
+
+#: src/mobilegui_base.ui:413
+#, fuzzy, no-c-format
+msgid "Signal quality:"
+msgstr "Ubwiza : "
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr ""
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Kugira gishya"
+
+#: src/mobilegui_base.ui:483
+#, fuzzy, no-c-format
+msgid "Set Clock"
+msgstr "Shyiraho amabara"
+
+#, fuzzy
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ntibishoboka gufungura idosiye ifunga."
+
+#, fuzzy
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Kuri Soma Gufunga Idosiye ' %1 ' . "
+
+#, fuzzy
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Kuri Kubona Kuva: Idosiye ' %1 ' . "
+
+#, fuzzy
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Na: %1 , ni i APAREYE , ni . "
+
+#, fuzzy
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Kuri Kuri Bya Gufunga Idosiye . "
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr "Byanzeguhimbaidosiyey'ingufuri."
diff --git a/tde-i18n-se/messages/tdepim/kandy.po b/tde-i18n-se/messages/tdepim/kandy.po
index 10614eb0411..0cf6c969b49 100644
--- a/tde-i18n-se/messages/tdepim/kandy.po
+++ b/tde-i18n-se/messages/tdepim/kandy.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-01-10 20:32+0100\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n"
@@ -13,698 +13,636 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Børre Gaup"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "boerre@skolelinux.no"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Ođđa gohččun"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr ""
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr ""
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+msgid "Error"
+msgstr ""
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr ""
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr ""
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr ""
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Goallus"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr ""
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr ""
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr ""
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr ""
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr ""
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr ""
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr ""
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr ""
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Láset"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Namma"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Gohččun"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr ""
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Lasit …"
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Doaimmat …"
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Vuoje"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr ""
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr ""
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr ""
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr ""
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr ""
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr ""
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr ""
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr ""
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr ""
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr ""
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr ""
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr ""
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr ""
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr ""
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr ""
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr ""
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr ""
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr ""
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr ""
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminála"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr ""
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr ""
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr ""
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr ""
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr ""
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "Čá&jet"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Gohččuniešvuođat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Namma:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Sajádat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Paramehter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Árvu"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Málle:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Ráidonummir:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Buvttadeaddji:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Loga"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stáhtus"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Signal quality:"
-msgstr ""
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Ođasmahte"
-
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr ""
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "Čá&jet"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr ""
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr ""
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Málle:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Ráidonummir:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Buvttadeaddji:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr ""
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr ""
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr ""
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Loga"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr ""
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr ""
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr ""
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stáhtus"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr ""
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr ""
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr ""
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Ođasmahte"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
diff --git a/tde-i18n-sk/messages/tdepim/kandy.po b/tde-i18n-sk/messages/tdepim/kandy.po
index c6f00b66f44..b38e1e88040 100644
--- a/tde-i18n-sk/messages/tdepim/kandy.po
+++ b/tde-i18n-sk/messages/tdepim/kandy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-08-25 20:46+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -19,702 +19,662 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stanislav Višňovský,Pavol Cvengroš,laki,Jozef Říha"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "visnovsky@nenya.ms.mff.cuni.cz,laki@laki.sk,jose1711@gmail.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nový príkaz"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Zadajte meno parametra:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Chyba modemu"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Odpojený "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nie je možné načítať súbor %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Nie je možné uložiť súbor %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Grafické rozhranie pre mobil"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Pripojiť"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Odpojiť"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nový profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Uložiť zmeny do profilu %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Nie je možné otvoriť zariadenie modemu %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Chyba modemu"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Pripojený "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Sériové rozhranie"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresár"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Okná"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Meno"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Príkaz"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Pridať..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Upraviť..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Spustiť"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Vstup:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Výstup:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Výsledok:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Zadajte hodnotu pre %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Komunikácia s vaším mobilným telefónom"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Zobraziť okno terminálu"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Zobraziť grafické rozhranie pre mobil"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Nezobraziť grafické rozhranie"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Meno súboru s príkazovým profilom"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem je vypnutý."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem je zaneprázdnený."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Čítam telefónny zoznam mobilu..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Zapisujem telefónny zoznam mobilu..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Zapísaný telefónny zoznam mobilu."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE adresár sa načítava..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Načítať adresár v TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Zapísaný adresár TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Načítaný telefónny zoznam mobilu."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Údaje z Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Údaje z mobilu:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Konfliktné údaje"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Použiť údaje z Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Použiť údaje z mobilu"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefónne zoznamy zosynchronizované."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE Adresár"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE Adresár (zmenený)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE adresár obsahuje neuložené zmeny."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Neuložené zmeny."
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefónny zoznam mobilu"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefónny zoznam mobilu (zmenený)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Mobilný telefón obsahuje neuložené zmeny."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminál"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Nie je možné otvoriť zariadenie '%1'. Prosím overte si či máte potrebné "
 "privilégia."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Nastavenie komunikácie zlyhalo (tcgetattr kod: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() zlýhalo."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Zariadenie nemôžem uzamknúť '%1'. "
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Nie je možné otvoriť uzamykací súbor '%1'."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Nie je možné prečítať uzamykací súbor '%1'. "
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Nie je možné získať PID zo súboru súbor '%1'. "
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces s pid %1 blokujúci zariadenie je stále spustený."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Nie je možné vyvolať signál pre PID pre ukončenie blokovania súboru."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Nie je možné vytvoriť uzamykací súbor '%1'. Prosím overte si či máte potrebné "
-"privilégia."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Ukázať"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Vlastnosti príkazu"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Meno:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Reťazec:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex výsledok"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozícia"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Hodnota"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Zariadenie mobilu"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informácia o modeli"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Sériové číslo:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Výrobca:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Verzia GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Knihy adries"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefón"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Prečítané"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Zapísať"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Uložiť do súboru..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synchronizovať"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stav"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Nabitie batérie:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kvalita signálu:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Obnoviť"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Nastav hodiny"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Sériové zariadenie"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Prenosová rýchlosť"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Zamkni adresár"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Otvoriť modem pri štarte"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Automatické nastavenie času na telefóne pri pripojení"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Vyňať domáce čísla"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Vyňať pracovné čísla"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Vyňať čísla textových správ"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Vyňať faxové čísla"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Vyňať mobilné čísla"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Vyňať čísla video telefónov"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Vyňať čísla poštových schránok"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Vyňať čísla modemov"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Vyňať čísla auto-telefónov"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Vyňať ISDN čísla"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Vyňať čísla pagerov"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Použiť domácu príponu"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Použiť pracovnú príponu"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Použiť príponu textových správ"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Použiť príponu faxu"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Použiť príponu mobilu"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Použiť video príponu"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Použiť príponu poštovej schránky"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Použiť príponu modemu"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Použiť príponu auta"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Použiť ISDN príponu"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Použiť príponu pageru"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Domáca prípona"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Pracovná prípona"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Prípona textovej správy"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Prípona faxu"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Prípona mobilného telefónu"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Prípona videa"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Prípona poštovej schránky"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Prípona modemu"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Prípona auta"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN prípona"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Prípona pagera"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Otvoriť terminálové okno pri štarte"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Otvoriť okno mobilu pri štarte"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Ukázať"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Zariadenie mobilu"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informácia o modeli"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Sériové číslo:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Výrobca:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Verzia GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Knihy adries"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefón"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Prečítané"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Zapísať"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Uložiť do súboru..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synchronizovať"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stav"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Nabitie batérie:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kvalita signálu:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Obnoviť"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Nastav hodiny"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Nie je možné otvoriť uzamykací súbor '%1'."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Nie je možné prečítať uzamykací súbor '%1'. "
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Nie je možné získať PID zo súboru súbor '%1'. "
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces s pid %1 blokujúci zariadenie je stále spustený."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Nie je možné vyvolať signál pre PID pre ukončenie blokovania súboru."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Nie je možné vytvoriť uzamykací súbor '%1'. Prosím overte si či máte "
+#~ "potrebné privilégia."
diff --git a/tde-i18n-sl/messages/tdepim/kandy.po b/tde-i18n-sl/messages/tdepim/kandy.po
index 333ee1acb5d..4dea6883782 100644
--- a/tde-i18n-sl/messages/tdepim/kandy.po
+++ b/tde-i18n-sl/messages/tdepim/kandy.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-12-04 16:34+0100\n"
 "Last-Translator: Andrej Vernekar <andrej.vernekar@moj.net>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -23,701 +23,660 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Roman Maurer,Andrej Vernekar,Gregor Rakar"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "roman.maurer@amis.net,andrej.vernekar@moj.net,gregor.rakar@kiss.si"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nov ukaz"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Vnesite ime parametra:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemska napaka"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Odklopljeno"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Datoteke %1 ni moč naložiti"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Datoteke %1 ni moč shraniti"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Prenosni GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Povezava"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Odklopi"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Nov profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Shrani spremembe v profil %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Modemske naprave %1 ni moč odpreti."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemska napaka"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Priklopljen"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Zaporedni vmesnik"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresar"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Okna"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Ukaz"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Šestnajstiško"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Dodaj ..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Uredi ..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Izvedi"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Vhod:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Izhod:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Rezultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Vnesite vrednost za %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Komuniciranje z vašim mobilnim telefonom."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Prikaži terminalsko okno"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Prikaži vmesnik mobilnika"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ne prikaži uporabniškega vmesnika"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Ime datoteke z ukaznim profilom"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem je izključen."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem je zaseden."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandi"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Branje imenika naslovov v telefonu ..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Pisanje imenika naslovov v telefon ..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Zapisan adresar v mobilnem telefonu."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Branje adresarja za TDE ..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Prebran adresar za TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Zapisan adresar za TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Prebran imenik iz mobilnega telefona."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Vnos za Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Vnos z mobilnega telefona:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Vnosi v sporu"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Uporabi vnos za Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Uporabi vnos z mobilnega telefona"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Usklajena imenika."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Adresar za TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Adresar za TDE (spremenjen)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Adresar za TDE vsebuje neshranjene spremembe."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Neshranjene spremembe"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Imenik za mobilni telefon"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Imenik za mobilni telefon (spremenjen)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Imenik za mobilni telefon vsebuje neshranjene spremembe."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Ni moč odpreti naprave »%1«. Prosim, preverite če imate zadostna dovoljenja."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Nastavitev komunikacije ni uspela (koda tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() ni uspel."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Ni moč zakleniti datoteke »%1«."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Ni moč odpreti zaklenitvene datoteke »%1«."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Ni moč brati zaklenitvene datoteke »%1«."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Ni moč dobiti PID datoteke »%1«."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces s PID %1, ki zaklepa napravo še vedno teče."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Ni moč oddati signala PID obstoječe datoteke."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ni moč ustaviti datoteke za zaklepanje »%1«. Prosimo, preverite da imate "
-"zadostna dovoljenja."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Prikaži"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Lastnosti ukaza"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Niz:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Šestnajstiški rezultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Položaj"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Vrednost"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilna naprava"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Podatki o modelu"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serijska številka:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Izdelovalec:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Različica GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresarji"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Beri"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Piši"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Shrani v datoteko ..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Uskladitev"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Stanje"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Polnitev baterij:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kakovost signala:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Osveži"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Nastavi uro"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Zaporedna naprava"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Hitrost prenosa"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Zakleni imenik"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Ob zagonu odpri modem"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Samodejno nastavi uro mobilnika ob povezavi"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Izvzemi domače številke"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Izvzemi delovne številke"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Izvzemi številke sporočanja"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Izvzemi faksne številke"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Izvzemi mobilne številke"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Izvzemi številke videotelefonije"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Izvzemi številke poštnih predalov"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Izvzemi modemske številke"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Izvzemi številke avtomobilskih telefonov"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Izvzemi številke ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Izvzemi številke pagerjev"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Uporabi pripono za domači telefon"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Uporabi pripono za delovni telefon"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Uporabi pripono za sporočanje"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Uporabi pripono za faks"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Uporabi pripono mobilnika"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Uporabi pripono za videotelefonijo"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Uporabi pripono za poštno številko"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Uporabi pripono za modem"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Uporabi pripono za avtomobilski telefon"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Uporabi pripono za ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Uporabi pripono za pager"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Pripona za domačo številko"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Pripona za delovno številko"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Pripona sporočanja"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Pripona faksa"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Pripona mobilnika"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Pripona videa"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Pripona poštnega predala"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Pripona modema"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Pripona za avtomobilski telefon"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Pripona za ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Pripona za pager"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Ob zagonu odpri terminalsko okno"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Ob zagonu odpri prenosno okno"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Prikaži"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilna naprava"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Podatki o modelu"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serijska številka:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Izdelovalec:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Različica GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresarji"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Beri"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Piši"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Shrani v datoteko ..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Uskladitev"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Stanje"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Polnitev baterij:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kakovost signala:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Osveži"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Nastavi uro"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ni moč odpreti zaklenitvene datoteke »%1«."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ni moč brati zaklenitvene datoteke »%1«."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Ni moč dobiti PID datoteke »%1«."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces s PID %1, ki zaklepa napravo še vedno teče."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Ni moč oddati signala PID obstoječe datoteke."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ni moč ustaviti datoteke za zaklepanje »%1«. Prosimo, preverite da imate "
+#~ "zadostna dovoljenja."
diff --git a/tde-i18n-sr/messages/tdepim/kandy.po b/tde-i18n-sr/messages/tdepim/kandy.po
index bfe41a312ff..48978ea3564 100644
--- a/tde-i18n-sr/messages/tdepim/kandy.po
+++ b/tde-i18n-sr/messages/tdepim/kandy.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-10-10 20:11+0200\n"
 "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
 "Language-Team: Serbian <kde-yu@kde-yu.org>\n"
@@ -22,701 +22,660 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Часлав Илић,Никола Котур"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "chaslav@sezampro.yu,kotnik@ns-linux.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Нова наредба"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Арг. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Унесите име параметра:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Модемска грешка"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Веза није успостављена "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Нисам могао да учитам фајл %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Нисам могао да снимим фајл %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI мобилног"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Повежи се"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Прекини везу"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Нови профил"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Да ли да снимим измене профила %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Не могу да отворим модемски уређај %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Модемска грешка"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Веза је успостављена "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Серијски интерфејс"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Адресар"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Прозори"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Име"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Наредба"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Хекс."
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Додај..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Уреди..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Изврши"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Унос:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Излаз:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Резултат:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Унесите вредност за %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Комуницирам са вашим мобилни телефоном."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Прикажи прозор терминала"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Прикажи GUI мобилног"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Не приказуј GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Име фајла са профилом команди"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модем је искључен."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модем је заузет."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Читам телефонски именик мобилног..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Записујем телефонски именик мобилног..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Записан је телефонски именик мобилног."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Читам TDE-ов адресар..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Прочитан је TDE-ов адресар."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Записао сам TDE-ов адресар."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Прочитан је телефонски именик мобилног."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab ставка:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Ставка мобилног:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Сукобљене ставке"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Користи Kab ставку"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Користи ставку мобилног"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Телефонски именици су синхронизовани."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-ов адресар"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-ов адресар (измењен)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE-ов адресар садржи неснимљене измене."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Неснимљене измене"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Телефонски именик мобилног"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Телефонски именик мобилног (измењен)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Телефонски именик мобилног садржи неснимљене измене."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Не могу да отворим уређај „%1“. Проверите да ли имате довољне дозволе за то."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Подешавање везе није успело (tcgetattr код: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() није успео."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Не могу да закључам уређај „%1“."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Не могу да отворим фајл за закључавање „%1“."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Не могу да прочитам фајл за закључавање „%1“."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Не могу да добавим PID из фајла „%1“."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Процес са PID-ом %1, који је закључао уређај, и даље ради."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Не могу да емитујем сигнал PID-у постојећег фајла за закључавање."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Не могу да направим фајл за закључавање „%1“. Проверите да ли имате довољне "
-"дозволе."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Прикажи"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Својства наредби"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Име:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Знаковни низ:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Хекс. резултат"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Позиција"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметар"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Вредност"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Мобилни уређај"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Информације о моделу"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Модел:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Серијски број:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Произвођач:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM верзија:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адресари"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Прочитај"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Запиши"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Сними у фајл..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Синхронизуј"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Статус"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Попуњеност батерије:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Квалитет сигнала:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Освежи"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Постави часовник"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Серијски уређај"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Бауда"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Директоријум за закључавање"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Отвори модем по покретању"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Аутоматски постави часовник на мобилном при повезивању"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Искључи кућне бројеве"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Искључи бројеве на послу"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Искључи бројеве за поруке"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Искључи бројеве факсова"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Искључи бројеве мобилних"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Искључи бројеве видеофона"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Искључи бројеве поштанских сандучића"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Искључи модемске бројеве"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Искључи бројеве телефона у колима"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Искључи ISDN бројеве"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Искључи бројеве пејџера"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Користи кућни суфикс"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Користи суфикс на послу"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Користи суфикс за поруке"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Користи факс суфикс"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Користи мобилни суфикс"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Користи видео суфикс"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Користи суфикс поштанских сандучића"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Користи модемски суфикс"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Користи суфикс у колима"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Користи ISDN суфикс"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Користи суфикс пејџера"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Кућни суфикс"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Суфикс на послу"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Суфикс за поруке"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Факс суфикс"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Мобилни суфикс"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Видео суфикс"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Суфикс поштанских сандучића"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Модемски суфикс"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Суфикс у колима"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN суфикс"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Суфикс пејџера"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Отвори прозор терминала по покретању"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Отвори прозор мобилног по покретању"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Прикажи"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Мобилни уређај"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Информације о моделу"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Модел:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Серијски број:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Произвођач:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM верзија:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адресари"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Прочитај"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Запиши"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Сними у фајл..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Синхронизуј"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Статус"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Попуњеност батерије:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Квалитет сигнала:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Освежи"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Постави часовник"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Не могу да отворим фајл за закључавање „%1“."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Не могу да прочитам фајл за закључавање „%1“."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Не могу да добавим PID из фајла „%1“."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Процес са PID-ом %1, који је закључао уређај, и даље ради."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Не могу да емитујем сигнал PID-у постојећег фајла за закључавање."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Не могу да направим фајл за закључавање „%1“. Проверите да ли имате "
+#~ "довољне дозволе."
diff --git a/tde-i18n-sr@Latn/messages/tdepim/kandy.po b/tde-i18n-sr@Latn/messages/tdepim/kandy.po
index 0e8880e1c8b..9e579472778 100644
--- a/tde-i18n-sr@Latn/messages/tdepim/kandy.po
+++ b/tde-i18n-sr@Latn/messages/tdepim/kandy.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-10-10 20:11+0200\n"
 "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
 "Language-Team: Serbian <kde-yu@kde-yu.org>\n"
@@ -22,701 +22,660 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Časlav Ilić,Nikola Kotur"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "chaslav@sezampro.yu,kotnik@ns-linux.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nova naredba"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg. %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Unesite ime parametra:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemska greška"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Veza nije uspostavljena "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Nisam mogao da učitam fajl %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Nisam mogao da snimim fajl %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "GUI mobilnog"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Poveži se"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Novi profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Da li da snimim izmene profila %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Ne mogu da otvorim modemski uređaj %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemska greška"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Veza je uspostavljena "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Serijski interfejs"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adresar"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Prozori"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Naredba"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Heks."
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Izvrši"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Unos:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Izlaz:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Rezultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Unesite vrednost za %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Komuniciram sa vašim mobilni telefonom."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Prikaži prozor terminala"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Prikaži GUI mobilnog"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Ne prikazuj GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Ime fajla sa profilom komandi"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem je isključen."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem je zauzet."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Čitam telefonski imenik mobilnog..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Zapisujem telefonski imenik mobilnog..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Zapisan je telefonski imenik mobilnog."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Čitam TDE-ov adresar..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Pročitan je TDE-ov adresar."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Zapisao sam TDE-ov adresar."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Pročitan je telefonski imenik mobilnog."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab stavka:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Stavka mobilnog:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Sukobljene stavke"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Koristi Kab stavku"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Koristi stavku mobilnog"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Telefonski imenici su sinhronizovani."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-ov adresar"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-ov adresar (izmenjen)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE-ov adresar sadrži nesnimljene izmene."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Nesnimljene izmene"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Telefonski imenik mobilnog"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Telefonski imenik mobilnog (izmenjen)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Telefonski imenik mobilnog sadrži nesnimljene izmene."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Ne mogu da otvorim uređaj „%1“. Proverite da li imate dovoljne dozvole za to."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Podešavanje veze nije uspelo (tcgetattr kod: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() nije uspeo."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Ne mogu da zaključam uređaj „%1“."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Ne mogu da otvorim fajl za zaključavanje „%1“."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Ne mogu da pročitam fajl za zaključavanje „%1“."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Ne mogu da dobavim PID iz fajla „%1“."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Proces sa PID-om %1, koji je zaključao uređaj, i dalje radi."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Ne mogu da emitujem signal PID-u postojećeg fajla za zaključavanje."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Ne mogu da napravim fajl za zaključavanje „%1“. Proverite da li imate dovoljne "
-"dozvole."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Prikaži"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Svojstva naredbi"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Znakovni niz:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Heks. rezultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Pozicija"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametar"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Vrednost"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilni uređaj"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Informacije o modelu"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serijski broj:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Proizvođač:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM verzija:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adresari"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Pročitaj"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Zapiši"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Snimi u fajl..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Sinhronizuj"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Popunjenost baterije:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Kvalitet signala:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Osveži"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Postavi časovnik"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Serijski uređaj"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Bauda"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Direktorijum za zaključavanje"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Otvori modem po pokretanju"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Automatski postavi časovnik na mobilnom pri povezivanju"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Isključi kućne brojeve"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Isključi brojeve na poslu"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Isključi brojeve za poruke"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Isključi brojeve faksova"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Isključi brojeve mobilnih"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Isključi brojeve videofona"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Isključi brojeve poštanskih sandučića"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Isključi modemske brojeve"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Isključi brojeve telefona u kolima"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Isključi ISDN brojeve"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Isključi brojeve pejdžera"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Koristi kućni sufiks"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Koristi sufiks na poslu"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Koristi sufiks za poruke"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Koristi faks sufiks"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Koristi mobilni sufiks"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Koristi video sufiks"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Koristi sufiks poštanskih sandučića"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Koristi modemski sufiks"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Koristi sufiks u kolima"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Koristi ISDN sufiks"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Koristi sufiks pejdžera"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Kućni sufiks"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Sufiks na poslu"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Sufiks za poruke"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Faks sufiks"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobilni sufiks"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video sufiks"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Sufiks poštanskih sandučića"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modemski sufiks"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Sufiks u kolima"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN sufiks"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Sufiks pejdžera"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Otvori prozor terminala po pokretanju"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Otvori prozor mobilnog po pokretanju"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Prikaži"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilni uređaj"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Informacije o modelu"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serijski broj:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Proizvođač:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM verzija:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adresari"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Pročitaj"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Zapiši"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Snimi u fajl..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Sinhronizuj"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Popunjenost baterije:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Kvalitet signala:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Osveži"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Postavi časovnik"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Ne mogu da otvorim fajl za zaključavanje „%1“."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Ne mogu da pročitam fajl za zaključavanje „%1“."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Ne mogu da dobavim PID iz fajla „%1“."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Proces sa PID-om %1, koji je zaključao uređaj, i dalje radi."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Ne mogu da emitujem signal PID-u postojećeg fajla za zaključavanje."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Ne mogu da napravim fajl za zaključavanje „%1“. Proverite da li imate "
+#~ "dovoljne dozvole."
diff --git a/tde-i18n-sv/messages/tdepim/kandy.po b/tde-i18n-sv/messages/tdepim/kandy.po
index e4c6b15932d..04099759f7a 100644
--- a/tde-i18n-sv/messages/tdepim/kandy.po
+++ b/tde-i18n-sv/messages/tdepim/kandy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-12-03 16:09+0100\n"
 "Last-Translator: Stefan Asserhall <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,702 +19,661 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stefan Asserhäll,Mattias Newzella"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "stefan.asserhall@comhem.se,newzella@linux.nu"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Nytt kommando"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Argument %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Ange parameternamn:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modemfel"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Nedkopplad "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Kunde inte ladda filen %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Kunde inte spara filen %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Mobilgränssnitt"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Anslut"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Koppla ned"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Ny profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Spara ändringar i profilen %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Kan inte öppna modemenhet %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modemfel"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Ansluten "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Seriellt gränssnitt"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Fönster"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Namn"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Kommando"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Kör"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Inmatning:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Utmatning:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Resultat:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Ange värde för %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Kommunicerar med din mobiltelefon."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Visa terminalfönster"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Visa mobilgränssnitt"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Visa inte grafiskt gränssnitt"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Filnamn för kommandoprofil"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modemet är av."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modemet är upptaget."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Läser mobilens telefonlista..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Skriver mobilens telefonlista..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Skrev mobilens telefonlista."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Läser TDE:s adressbok..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Läste TDE:s adressbok."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Skrev TDE:s adressbok."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Läste mobilens telefonlista."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab-post:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Mobilpost:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Konflikt mellan poster"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Använd Kab-post"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Använd mobilpost"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Synkroniserade telefonlistor."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE-adressbok"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE-adressbok (ändrad)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE:s adressbok innehåller osparade ändringar."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Mobiltelefonlista"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Mobiltelefonlista (ändrad)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Mobiltelefonlistan innehåller osparade ändringar."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Kan inte öppna enheten \"%1\". Kontrollera att du har tillräckliga "
 "behörigheter."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Inställning av kommunikation misslyckades (kod från tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() misslyckades."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Kan inte låsa enheten '%1'."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Kan inte öppna låsfilen \"%1\"."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Kan inte läsa låsfilen \"%1\"."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Kan inte hämta process-id från filen \"%1\"."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Processen med process-id %1 som låser enheten, körs fortfarande."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Kan inte skicka signal till process-id för befintlig låsfil."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Kan inte skapa låsfilen \"%1\". Kontrollera att du har tillräckliga "
-"behörigheter."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "V&isa"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Kommandoegenskaper"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Namn:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Kommando:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex-resultat"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Position"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parameter"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Värde"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Mobilenhet"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Modellinformation"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modell:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Serienummer:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Tillverkare:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM-version:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adressböcker"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Läs"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Skriv"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Spara till en fil..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Synkronisera"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Status"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batteriladdning:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signalkvalitet:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Uppdatera"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Ställ in klockan"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Seriell enhet"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baudhastighet"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Lås katalog"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Öppna modem vid start"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Ställ in mobiltelefonens klocka automatiskt vid anslutning"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Undanta hemnummer"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Undanta arbetsnummer"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Undanta meddelandenummer"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Undanta telefaxnummer"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Undanta mobilnummer"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Undanta videotelefonnummer"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Undanta postboxnummer"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Undanta modemnummer"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Undanta biltelefonnummer"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Undanta ISDN-nummer"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Undanta personsökarnummer"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Använd hemsuffix"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Använd arbetssuffix"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Använd meddelandesuffix"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Använd telefaxsuffix"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Använd mobilsuffix"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Använd videosuffix"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Använd postboxsuffix"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Använd modemsuffix"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Använd bilsuffix"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Använd ISDN-suffix"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Använd personsökarsuffix"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Hemsuffix"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Arbetssuffix"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Meddelandesuffix"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Telefaxsuffix"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Mobilsuffix"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Videosuffix"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Postboxsuffix"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modemsuffix"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Bilsuffix"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN-suffix"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Personsökarsuffix"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Öppna terminalfönster vid start"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Öppna mobilfönster vid start"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "V&isa"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Mobilenhet"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Modellinformation"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modell:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Serienummer:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Tillverkare:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM-version:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adressböcker"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Läs"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Skriv"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Spara till en fil..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Synkronisera"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Status"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batteriladdning:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signalkvalitet:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Ställ in klockan"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Kan inte öppna låsfilen \"%1\"."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Kan inte läsa låsfilen \"%1\"."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Kan inte hämta process-id från filen \"%1\"."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Processen med process-id %1 som låser enheten, körs fortfarande."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Kan inte skicka signal till process-id för befintlig låsfil."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Kan inte skapa låsfilen \"%1\". Kontrollera att du har tillräckliga "
+#~ "behörigheter."
diff --git a/tde-i18n-ta/messages/tdepim/kandy.po b/tde-i18n-ta/messages/tdepim/kandy.po
index 4e88b01a8c0..ae2db134c7a 100644
--- a/tde-i18n-ta/messages/tdepim/kandy.po
+++ b/tde-i18n-ta/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-03-21 02:43-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -14,705 +14,664 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ழ-கணினி சாந்தகுமார்"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "shanthakumar@zhakanini.org"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "புதுக் கட்டளை"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "தருமதிப்பு %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "அளவுருக்கள் பெயரை உள்ளிடு"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "மோடம் பிழை"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "துண்டிக்கப்பட்டது"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 கோப்பினை ஏற்ற இயல்வில்லை"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "%1 கோப்பினை சேமிக்க இயலவில்லை"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "நடமாடும் GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "இணைப்பில் உள்ளது"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "துண்டிப்பு"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "புதிய தோற்றம்"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "%1ல் மாற்றங்க சேமிக்க வேண்டுமா?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "%1- மோடத்தைத் திறக்க முடியவில்லை "
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "மோடம் பிழை"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "இணைப்பு உள்ளது"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "முகப்பு அமைப்புகள்"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "முகவரிபுத்தகம்"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "சாளரங்கள்"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "பெயர்"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "கட்டளை"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "ஹெக்ஸ்"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "சேர்..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "தொகு..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "செய்"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "உள்ளிடு"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "வெளியீடு"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "தீர்வு"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1ற்கு மதிப்பை உள்ளிடு"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "உங்கள் செல்பேசியுடன் தொடர்பு கொள்கிறது."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "முனையச் சாளரத்தைக் காட்டு"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "மொபைல் GUIயைக் காட்டு"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "GUIயைக் காட்டாதே"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "கட்டளை விளக்ககுறிப்பு கோப்பின் கோப்பு பெயர்"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "மோடம் செயலில் இல்லை"
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "மோடம் பணியில் உள்ளது"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Name=Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "செல்பேசி புத்தகத்தைப் படிக்கிறது.."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "செல்பேசி புத்தகத்தில் எழுதுகிறது.."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "செல்பேசி புத்தகத்தில் எழுது"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE முகவரி புத்தகத்தை படிக்கிறது..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE முகவரி புத்தகத்தை படி"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE முகவரி புத்தகத்தை எழுது."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "செல்பேசிப் புத்தகத்தைப் படி"
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab உள்ளீடு"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "செல்பேசி உள்ளீடு:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "முரண்படும் உள்ளீடுகள்"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Kab உள்ளீட்டை பயன்படுத்து"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "செல்பேசி உள்ளிட்டை பயன்படுத்து"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "ஒருங்கிணைக்கப்பட்ட தொலைபேசிப்புத்தகம்"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE முகவரிப்புத்தகம்"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE முகவரிப்புத்தகம் (மாற்றப்பட்டது)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "கேடியி முகவரிப்புத்தகத்தில் சேமிக்கப்படாத மாற்றங்கள் உள்ளன."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "சேமிக்கப்படாத மாற்றங்கள்"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "செல்பேசி புத்தகம்"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "மொபைல் தொலைபேசி புத்தகம் (மாற்றப்பட்டது)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "மொபைல் தொலைபேசி புத்தகத்தில் சேமிக்கப்படாத மாற்றங்கள் உள்ளன."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "முனையம்"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "'%1'கருவியை இயக்க முடியவில்லை. உங்களுக்கு போதுமான உரிமைகள் உள்ளனவா என்று "
 "சரிபார்க்கவும்."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() இயலவில்லை."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "சாதனம் '%1'ஐ பூட்ட முடியவில்லை."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "'%1' பூட்டிய ஆவணத்தை திறக்க முடியவில்லை."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "'%1' பூட்டிய ஆவணத்தை படிக்க முடியவில்லை."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "'%1'லிருந்து PID பெற இயலவில்லை."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "%1 என்ற PID உள்ள செயல் இயக்கத்திலுள்ளது, இது கருவியை பூட்டிவிடுகிறது."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "அமலிலுள்ள பூட்டு ஆவணத்தின் PIDக்கு சமிக்ஞை தர இயலவில்லை."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"'%1' என்ற பூட்டு ஆவணத்தை உருவாக்க இயலவில்லை. உங்களுக்கு போதுமான உரிமைகள் "
-"உள்ளனவா என்று சரிபார்க்கவும்."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "காட்டு"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "கட்டளை பண்புகள்"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "பெயர்:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "சரம்"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex முடிவுகள்"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "இடம்"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "அளவுருக்கள்"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "மதிப்பு"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "நடமாடும் சாதனம்"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "மாதிரி தகவல்"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "மாதிரி:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "வரிசை எண்"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "தயாரிப்பாளர்:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM பதிப்பு"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "முகவரி புத்தகங்கள்..."
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "தொலைபேசி"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "வாசி"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "எழுது"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "கோப்பில் சேமி.."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "ஒருங்கிணை"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "நிலை"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "மின்கலத்தில் மின்னூட்டம்:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "சமிக்ஞை தரம்"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "புதுப்பி "
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "கடிகாரத்தை அமை"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "தொடர் கருவி"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Baud விகிதம்"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "அடைவைப் பூட்டு"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "துவங்கும் போது மோடத்தைத் திற"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "இணைப்பில் மொபைலின் தானாக அமைக்கும் கடிகாரம்"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "வீட்டு எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "பணி எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "செய்தியிடும் எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "தொலைநகல் எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "செல் எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "படக்காட்சி தொலைபேசி எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "அஞ்சல் பெட்டி எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "மோடம் எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "கார் தொலைபேசி எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "பேஜர் எண்களைத் தவிர்"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "வீட்டு பின்னொட்டைப்  பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "பணி பின்னொட்டை பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "செய்தியிடும் பின்னொட்டை பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "தொலைநகர் பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "மொபைல் பின்னொட்டை பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "படக்காட்சி பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "அஞ்சல்பெட்டி பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "மோடம் பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "கார் பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "பேஜர் பின்னொட்டைப் பயன்படுத்து"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "வீட்டு பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "பணி பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "செய்தியிடும் பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "தொலைநகர் பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "செல் பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "படக்காட்சி பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "அஞ்சல் பெட்டி பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "மோடம் பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "கார் பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN பின்னொட்டு"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "பேஜர் முன்னொட்டு"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "கணினி துவக்கும்போது டெர்மினல் சாளரத்தை திறக்கவும்"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "கணினி துவக்கும்போது மொபைல் சாளரத்தை திறக்கவும்"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "காட்டு"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "நடமாடும் சாதனம்"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "மாதிரி தகவல்"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "மாதிரி:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "வரிசை எண்"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "தயாரிப்பாளர்:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM பதிப்பு"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "முகவரி புத்தகங்கள்..."
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "தொலைபேசி"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "வாசி"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "எழுது"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "கோப்பில் சேமி.."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "ஒருங்கிணை"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "நிலை"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "மின்கலத்தில் மின்னூட்டம்:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "சமிக்ஞை தரம்"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "புதுப்பி "
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "கடிகாரத்தை அமை"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "'%1' பூட்டிய ஆவணத்தை திறக்க முடியவில்லை."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "'%1' பூட்டிய ஆவணத்தை படிக்க முடியவில்லை."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "'%1'லிருந்து PID பெற இயலவில்லை."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "%1 என்ற PID உள்ள செயல் இயக்கத்திலுள்ளது, இது கருவியை பூட்டிவிடுகிறது."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "அமலிலுள்ள பூட்டு ஆவணத்தின் PIDக்கு சமிக்ஞை தர இயலவில்லை."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "'%1' என்ற பூட்டு ஆவணத்தை உருவாக்க இயலவில்லை. உங்களுக்கு போதுமான உரிமைகள் உள்ளனவா "
+#~ "என்று சரிபார்க்கவும்."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() இயலவில்லை."
diff --git a/tde-i18n-tg/messages/tdepim/kandy.po b/tde-i18n-tg/messages/tdepim/kandy.po
index 00b6839cef4..362782c686e 100644
--- a/tde-i18n-tg/messages/tdepim/kandy.po
+++ b/tde-i18n-tg/messages/tdepim/kandy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2004-07-26 20:06-0400\n"
 "Last-Translator: Marina Kolucheva <youth_opportunities@tajik.net>\n"
 "Language-Team: Tajik\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -27,713 +27,672 @@ msgstr ""
 "Tajik Kde Teams: Роджер Ковакс Виктор Ибрагимов, Марина Колючева, Акмал "
 "Саломов, Баҳодур Хушматов "
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "youth_opportunities@tajik.net"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Дастури нав"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Далели %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Номи параметрро дохил кунед:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Хатогии модем"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "Ҷудо карда шудааст"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Қодир ба пурбор кардани файли %1 нестам"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Қодир ба нигоҳ доштани файли %1 нестам."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Интерфейси графики бо телефон"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Пайвастшавӣ"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Ғайри фаъол шудан"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Профили нав"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Тағиротро дар профили %1 нигоҳ дорам?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Наметавонам дастгоҳи модеми %1-ро кушоям."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Хатогии модем"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "Пайваст аст"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Интерфейси пасрав"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 #, fuzzy
 msgid "Address Book"
 msgstr "Китоби адресҳо"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Тирезаҳо"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ном"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Дастур"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Шонздаҳӣ"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Илова кардан..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Дигаргун додан..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Иҷро кардан"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Воридот:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Хурӯҷ:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Натиҷот:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Аҳамияте барои %1 ворид кунед:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 #, fuzzy
 msgid "Communicating with your mobile phone."
 msgstr "Бо телефони мобилӣ пайваст шудан"
 
-#: main.cpp:49
+#: src/main.cpp:49
 #, fuzzy
 msgid "Show terminal window"
 msgstr "Нишон додани тирезаҳои терминал"
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Нишон додани интерфейси графики бо телефон"
 
-#: main.cpp:51
+#: src/main.cpp:51
 #, fuzzy
 msgid "Do not show GUI"
 msgstr "Намоиш надодани интерфейси графикӣ"
 
-#: main.cpp:52
+#: src/main.cpp:52
 #, fuzzy
 msgid "Filename of command profile file"
 msgstr "Номи файли профили команда"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модем ғайри фаъол аст."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модем машғул аст."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Китоби телефони мобилиро хонда истодаам..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Дар ҳолати қайди телефони мобилӣ..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Китоби телефони мобилӣ қайд карда шудааст."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 #, fuzzy
 msgid "Reading TDE address book..."
 msgstr "Китоби суроғаи TDE хонда шудааст."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Китоби суроғаи TDE хонда шудааст."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 #, fuzzy
 msgid "Wrote TDE address book."
 msgstr "Суроғаи китоби TDE қайд карда шудааст"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Китоби телефони мобилӣ хонда шуда."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Қайдоти китоби TDE адресӣ:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Қайд кардан аз телефон:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Қайдҳои ихтилофӣ"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Қайдҳоро истифода бурдан аз китоби адресии TDE"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Қайдҳоро истифода бурдан аз телефон"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Китобҳои телефон синхранизатсия карда шуданд."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Китоби адресии TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 #, fuzzy
 msgid "TDE Address Book (modified)"
 msgstr "Китоби адресии TDE"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr ""
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Китоби телефонии мобилӣ"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 #, fuzzy
 msgid "Mobile Phone Book (modified)"
 msgstr "Китоби телефонии мобилӣ"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr ""
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "Наметавонам дастгоҳи '%1' кушоям. Ҳуқуқи  дастраси ба файлро биозмоед."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr ""
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Хатогии даъвати tcsetattr()."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 #, fuzzy
 msgid "Unable to lock device '%1'."
 msgstr "Наметавонам файли блоконии '%1'-ро хонам."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Қодир ба кушодани файли блоконии '%1' нестам."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Наметавонам файли блоконии '%1'-ро хонам."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Наметавонам адади амалиётро аз файли '%1' қабул кунам."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-"Амалиёти бо адади %1, ки дастгоҳ блокировка кард, то ҳол дар ҳолати шурӯъ "
-"мебошад."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Сигнали амалиётро бо рақаме, ки бо файли блокировка муайян шудааст, фиристодан "
-"имконпазир нест."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Наметавонам файли блокировкагии '%1'-ро созам. Ҳуқуқи дастгоҳи ба файлро "
-"биозмоед."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Нишон додан"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Хусусияти дастур"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ном:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Сатр:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Натиҷаи шонздаҳӣ"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Ҷойгиршавӣ"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметр"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Аҳамият"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Дастгоҳи мобили"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Иттилоот дар бобати услуб"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Услуб:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Адади сериявӣ:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Истеҳсолкунанда:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Раванди GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Китоби адресҳо"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Read"
-msgstr "Хондан"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Навистан"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Нигоҳ доштани файл..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Синхронизатсия кардан"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Вазъият"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Заряди батаре:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr " Сифати сигналҳо:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
-#, no-c-format
-msgid "Refresh"
-msgstr "Бозсозӣ"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Дастгоҳи паиҳам"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Ба модем пайваст шудан дар вақти сар дода  шудан"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, fuzzy, no-c-format
 msgid "Use mobile suffix"
 msgstr "Қайдҳоро истифода бурдан аз телефон"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, fuzzy, no-c-format
 msgid "Modem suffix"
 msgstr "Модем ғайри фаъол аст."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Дар вақти сар додан тирезаҳои терминалро  кушоед"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Дар вақти сар додан тирезаи телефонро кушоед"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Нишон додан"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Дастгоҳи мобили"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Иттилоот дар бобати услуб"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Услуб:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Адади сериявӣ:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Истеҳсолкунанда:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Раванди GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Китоби адресҳо"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Хондан"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Навистан"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Нигоҳ доштани файл..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Синхронизатсия кардан"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Вазъият"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Заряди батаре:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr " Сифати сигналҳо:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Бозсозӣ"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr ""
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Қодир ба кушодани файли блоконии '%1' нестам."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Наметавонам файли блоконии '%1'-ро хонам."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Наметавонам адади амалиётро аз файли '%1' қабул кунам."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr ""
+#~ "Амалиёти бо адади %1, ки дастгоҳ блокировка кард, то ҳол дар ҳолати шурӯъ "
+#~ "мебошад."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Сигнали амалиётро бо рақаме, ки бо файли блокировка муайян шудааст, "
+#~ "фиристодан имконпазир нест."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Наметавонам файли блокировкагии '%1'-ро созам. Ҳуқуқи дастгоҳи ба файлро "
+#~ "биозмоед."
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "Хатогии даъвати tcgetattr()."
 
diff --git a/tde-i18n-tr/messages/tdepim/kandy.po b/tde-i18n-tr/messages/tdepim/kandy.po
index d3ea22a86a6..a6886dfeaa9 100644
--- a/tde-i18n-tr/messages/tdepim/kandy.po
+++ b/tde-i18n-tr/messages/tdepim/kandy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-07-17 01:12+0300\n"
 "Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n"
 "Language-Team: Türkçe <yerelleştirme@kde.org.tr>\n"
@@ -17,701 +17,660 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Görkem Çetin, Ozan Eren BİLGE, Engi Çağatay"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "gorkem@kde.org, oebilgen@uekae.tubitak.gov.tr, engincagatay@yahoo.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Yeni Komut"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Arg %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parametre adını verin:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem Hatası"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Bağlantı koptu "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 dosyası yüklenemedi"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "%1 dosyası kaydedilemedi."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Cep Telefon Grafik Arayüzü"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Bağlan"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Bağlantıyı kes"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Yeni Profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Değişiklikler %1 profiline kaydedilsin mi?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "%1 modem aygıtı açılamadı."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem Hatası"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Bağlantı Kuruldu "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Seri Arayüz"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Pencereler"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "İsim"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Komut"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Onaltılı"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Ekle..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Düzenle..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Girdi:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Çıktı:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Sonuç:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "%1 için değer girin"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Cep telefonu ile iletişim kuruluyor."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminal penceresini göster."
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Cep telefonu grafik arayüzünü göster."
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Grafik arayüz gösterme"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Komut profil dosya adı."
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem kapalı."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem meşgul."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Cep telefonu adres defteri okunuyor..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Cep telefonu adres defterine yazılıyor..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Cep telefonu adres defterine yazıldı."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE adres defteri okunuyor..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE adres defteri okundu."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE adres defterine yazıldı"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Cep telefonu adres defteri okundu."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab Girdisi:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Cep Telefonu Girdisi:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Çakışan Girdiler"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Kab Girdisini Kullan"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Cep Telefonu Girdisini Kullan"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Adres defterleri eşzamanlı hale getirildi."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE Adres Defteri"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE Adres Defteri (değiştirilmiş)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE Adres Defteri kaydedilmemiş değişiklikler içeriyor"
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Kaydedilmemiş Değişiklikler"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Cep Telefonu Adres Defteri"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Cep Telefonu Adres Defteri (değiştirilmiş)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Cep telefonu adres defteri kaydedilmemiş değişiklikler içeriyor"
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "%1 aygıtı açılamadı. Lütfen yeterli izne sahip olup olmadığınızı denetleyin."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Bağlantı yapılandırması başarısız oldu (tcgetattr kodu: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() hatası."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "%1 aygıtı kitlenemiyor."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "%1 kilit dosyası açılamadı."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "%1 kilit dosyası açılamadı."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "'%1' dosyasından PID okunamadı."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Cihazı kitli tutan %1 PID'li süreç halen çalışıyor."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "Varolan kilit dosyasının PID'ine sinyal gönderilemiyor."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"%1 kilit dosyası yaratılamadı. Lütfen yeterli izne sahip olup olmadığınızı "
-"denetleyin."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Göster"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Komut Özellikleri"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Ad:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Dizi:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Onaltılı sonuç"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Konum"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametre"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Değer"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Cep Telefonu Aygıtı"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Model Bilgisi"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Model:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Seri numarası:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Üretici firma:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM sürümü:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Adres Defterleri"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Oku"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Yaz"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Dosyaya Kaydet..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Eşzamanla"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Durum"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Pil yükü:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Sinyal kalitesi:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Yenile"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Saati ayarla"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Seri aygıt"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Bağlantı hızı"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Kilit dizini"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Başlangıçta modemi aç"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Cep telefonunun saatini bağlantı anında kendiliğinden ayarla"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Ev telefonu numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "İş telefonu numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Mesajlaşma numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Faks numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Cep telefonu numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Video telefon numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Posta kutusu numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Modem numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Araç telefonu numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "ISDN numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Pager numaralarını içerme"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Ev soneki kullan"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "İş soneki kullan"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Mesajlaşma soneki kullan"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Fax soneki kullan"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Cep Telefonu soneki kullan"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Video soneki kullan"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Posta kutusu soneki kullan"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Modem soneki kullan"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Araç soneki kullan"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "ISDN soneki kullan"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Pager soneki kullan"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Ev soneki"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "İş soneki"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Mesajlaşma soneki"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Faks soneki"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Cep soneki"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Video soneki"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Posta kutusu soneki"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Modem soneki."
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Araç soneki"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN soneki"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Pager soneki"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Başlangıçta terminal penceresini aç"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Başlangıçta telefon penceresini aç"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Göster"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Cep Telefonu Aygıtı"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Model Bilgisi"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Model:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Seri numarası:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Üretici firma:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM sürümü:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Adres Defterleri"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Oku"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Yaz"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Dosyaya Kaydet..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Eşzamanla"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Durum"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Pil yükü:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Sinyal kalitesi:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Yenile"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Saati ayarla"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "%1 kilit dosyası açılamadı."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "%1 kilit dosyası açılamadı."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "'%1' dosyasından PID okunamadı."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Cihazı kitli tutan %1 PID'li süreç halen çalışıyor."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "Varolan kilit dosyasının PID'ine sinyal gönderilemiyor."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "%1 kilit dosyası yaratılamadı. Lütfen yeterli izne sahip olup "
+#~ "olmadığınızı denetleyin."
diff --git a/tde-i18n-uk/messages/tdepim/kandy.po b/tde-i18n-uk/messages/tdepim/kandy.po
index 97c6f679b80..461005a1e60 100644
--- a/tde-i18n-uk/messages/tdepim/kandy.po
+++ b/tde-i18n-uk/messages/tdepim/kandy.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-09-19 22:11-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -19,706 +19,666 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andriy Rysin,Eugene Onischenko,Іван Петрущак"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "rysin@kde.org,oneugene@ukr.net,ivanpetrouchtchak@yahoo.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Нова команда"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "Арг %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Введіть назву параметра:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Помилка модему"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Роз'єднано "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "Неможливо завантажити файл %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "Не вдалося зберегти файл %1."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "Мобільний інтерфейс"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "З'єднатися"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Роз'єднати"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Новий профіль"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Зберегти зміни до профілю %1?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "Неможливо відкрити пристрій модему %1."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Помилка модему"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " З'єднано "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Послідовний інтерфейс"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Вікна"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Ім'я"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Команда"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "Шістн."
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Додати..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Редагувати..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Виконати"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Ввід:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Вивід:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Результат:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "Введіть значення для %1:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Триває зв'язок з вашим мобільним телефоном."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Показувати вікно терміналу"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "Показувати інтерфейс мобільного"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Не показувати графічний інтерфейс"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Назва файла профілю команд"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модем вимкнено."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модем зайнятий."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Зчитування мобільної телефонної книги..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Записування в мобільну телефонну книгу..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Записування в телефонну книгу мобільного."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "Зчитування адресної книги TDE..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "Зчитування адресної книги TDE."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "Записано адресну книгу TDE."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Зчитати телефонну книгу мобільного."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Запис Kab:"
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "Запис з мобільного:"
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "Конфліктні записи"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "Взяти запис з Kab"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "Взяти запис з мобільного"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Телефонні книги синхронізовані."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "Адресна книга TDE"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "Адресна книга TDE (змінена)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "Адресна книга TDE містить незбережені зміни."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Незбережені зміни"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Телефонна книга мобільного"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Телефонна книга мобільного (змінена)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Телефонна книга мобільного містить незбережені зміни."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Термінал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "Не вдається відкрити пристрій \"%1\". Будь ласка, перевірте права доступу."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Помилка з'єднання (код tcgetattr: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "Виклик tcsetattr() зазнав невдачу."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "Не вдається заблокувати пристрій \"%1\"."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "Не вдається відкрити файл блокування \"%1\"."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "Не вдається прочитати з файла блокування \"%1\"."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "Не вдається отримати номер процесу з файла \"%1\"."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "Процес з номером %1, який заблокував пристрій, все ще виконується."
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-"Не вдається надіслати сигнал до процесу з номером взятим з файла блокування."
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"Не вдається створити файл блокування \"%1\". Будь ласка, перевірте права "
-"доступу."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Показати"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Властивості команд"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Назва:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "Рядок:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Шістн. результат"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Розташування"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметр"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Значення"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Мобільний пристрій"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Інформація про модель"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Модель:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Серійний номер:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Виробник:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "Версія GSM:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Адресні книги"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Зчитування"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Запис"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Зберегти у файл..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Синхронізація"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Стан"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Заряд батарей:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Якість сигналу:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Поновити"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Встановити час"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Послідовний пристрій"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "Швидкість перенесення даних"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Заблокувати каталог"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Відкривати модем при старті"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Автоматично наставляти час мобільного телефону при увімкненні"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "Виключати домашні номери"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "Виключати робочі номери"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "Виключати номери автовідповідачів"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "Виключати номери факсів"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "Виключати номери мобільних телефонів"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "Виключати номери відеотелефонів"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "Виключати номери поштових скриньок"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "Виключати модемні номери"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "Виключати номери автомобільних телефонів"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "Виключати номери ISDN"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "Виключати номери пейджерів"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "Використовувати домашній суфікс"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "Використовувати робочий суфікс"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "Використовувати суфікс автовідповідачів"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "Використовувати суфікс факсів"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "Використовувати суфікс мобільного"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "Використовувати суфікс відео"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "Використовувати суфікс поштових скриньок"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "Використовувати модемний суфікс"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "Використовувати автомобільний суфікс"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "Використовувати суфікс ISDN"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "Використовувати суфікс пейджера"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "Домашній суфікс"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "Робочий суфікс"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "Суфікс автовідповідачів"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "Суфікс факсів"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "Суфікс мобільних"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "Суфікс відео"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "Суфікс поштових скриньок"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "Модемний суфікс"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "Автомобільний суфікс"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "Суфікс ISDN"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "Суфікс пейджерів"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Відкривати вікно терміналу при запуску"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Відкривати вікно мобільного при старті"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Показати"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Мобільний пристрій"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Інформація про модель"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Модель:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Серійний номер:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Виробник:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "Версія GSM:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Адресні книги"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Зчитування"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Запис"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Зберегти у файл..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Синхронізація"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Стан"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Заряд батарей:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Якість сигналу:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Поновити"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Встановити час"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "Не вдається відкрити файл блокування \"%1\"."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "Не вдається прочитати з файла блокування \"%1\"."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "Не вдається отримати номер процесу з файла \"%1\"."
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "Процес з номером %1, який заблокував пристрій, все ще виконується."
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr ""
+#~ "Не вдається надіслати сигнал до процесу з номером взятим з файла "
+#~ "блокування."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "Не вдається створити файл блокування \"%1\". Будь ласка, перевірте права "
+#~ "доступу."
diff --git a/tde-i18n-uz/messages/tdepim/kandy.po b/tde-i18n-uz/messages/tdepim/kandy.po
index 1e27beed115..e9232d342fd 100644
--- a/tde-i18n-uz/messages/tdepim/kandy.po
+++ b/tde-i18n-uz/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-12-17 13:25+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -15,705 +15,658 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Nurali Abdurahmonov"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "mavnur@gmail.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Yangi buyruq"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr ""
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Parametr nomini kiriting:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Modem xatosi"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Aloqa uzilgan "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 faylini yuklab boʻlmadi."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "%1 faylini saqlab boʻlmadi."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 #, fuzzy
 msgid "Mobile GUI"
 msgstr "Mobil GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Ulanish"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Uzish"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Yangi profil"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Oʻzgarishlarni %1 profilida saqlashni istaysizmi?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr " %1 modem uskunasini ochib boʻlmadi."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Modem xatosi"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Ulangan "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Ketma-ket interfeys "
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Manzillar daftari"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Oynalar"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Nomi"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Buyruq"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 #, fuzzy
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Qoʻshish..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Tahrirlash..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Ishga tushirish"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Kirish:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Chiqish:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Natija:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr " %1 uchun qiymatni kiriting:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Uyali telefon bilan bogʻlanish."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Terminal oynani koʻrsatish"
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Mobil GUI'ni koʻrsatish"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "Grafik interfeysni bekitish"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Buyruq profayl faylining nomi"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Modem oʻchirilgan."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Modem band."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Uyali telefon manzillar daftari oʻqilmoqda..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Uyali telefon manzillar daftariga yozilmoqda..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Uyali telefon manzillar daftariga yozildi."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE manzillar daftari oʻqilmoqda..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE manzillar daftari oʻqildi."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE manzillar daftariga yozildi."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Uyali telefon manzillar daftari oʻqildi."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Tenglashtirilgan uyali telefon manzillar daftari."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE manzillar daftari"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE manzillar daftari (oʻzgargan)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE manzillar daftarida saqlanmagan oʻzgarishlar mavjud."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Saqlanmagan oʻzgarishlar"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Uyali telefon manzillar daftari"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Uyali telefon manzillar daftari (oʻzgargan)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Uyali telefon manzillar daftarida saqlanmagan oʻzgarishlar mavjud."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Terminal"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
 "'%1 uskunasiga murojaat qilib boʻlmadi. Sizda yetarli huquq borligini "
 "tekshiring."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Bogʻlanishni oʻrnatib boʻlmadi (tcgetattr kodi: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() muvaffaqiyatsiz tugadi."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "'%1' uskunasini qulflab boʻlmadi."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "'%1' qulflash faylini ochib boʻlmadi."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "'%1' qulflash faylini oʻqib boʻlmadi."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "'%1' faylidan PID olib boʻlmadi."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"'%1' qulflash faylini yaratib boʻlmadi. Iltimos sizda bunga ruxsat borligini "
-"tekshirib koʻring."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Koʻrsatish"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Buyruqning xossalari"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Nomi:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex natijasi"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Joylashishi"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Parametr"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Qiymati"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Uyali aloqa uskunasi"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Rusum maʼlumoti"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Modeli:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Seriya raqami:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Ishlab chiqaruvchi:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM versiyasi:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Manzillar daftarlari"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Telefon"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Oʻqish"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Yozish"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Faylga saqlash..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Tenglashtirish"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Holati"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Batareyaning kuchi:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Signal sifati:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Yangilash"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Soatni moslash"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Ketma-ket uskuna"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Qulflash jildi"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Dastur ishga tushganda modemni ochish"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Ulanganda telefonning soatini avtomatik moslash"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Dastur ishga tushganda terminal oynasini ochish"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Dastur ishga tushganda uyali aloqa uskunasi oynasini ochish"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Koʻrsatish"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Uyali aloqa uskunasi"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Rusum maʼlumoti"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Modeli:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Seriya raqami:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Ishlab chiqaruvchi:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM versiyasi:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Manzillar daftarlari"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Oʻqish"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Yozish"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Faylga saqlash..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Tenglashtirish"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Holati"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Batareyaning kuchi:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Signal sifati:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Yangilash"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Soatni moslash"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "'%1' qulflash faylini ochib boʻlmadi."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "'%1' qulflash faylini oʻqib boʻlmadi."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "'%1' faylidan PID olib boʻlmadi."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "'%1' qulflash faylini yaratib boʻlmadi. Iltimos sizda bunga ruxsat "
+#~ "borligini tekshirib koʻring."
diff --git a/tde-i18n-uz@cyrillic/messages/tdepim/kandy.po b/tde-i18n-uz@cyrillic/messages/tdepim/kandy.po
index 0165aa6178d..b72639f94b1 100644
--- a/tde-i18n-uz@cyrillic/messages/tdepim/kandy.po
+++ b/tde-i18n-uz@cyrillic/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-12-17 13:25+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -15,704 +15,658 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Нурали Абдураҳмонов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "mavnur@gmail.com"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "Янги буйруқ"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr ""
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "Параметр номини киритинг:"
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "Модем хатоси"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " Алоқа узилган "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "%1 файлини юклаб бўлмади."
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "%1 файлини сақлаб бўлмади."
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 #, fuzzy
 msgid "Mobile GUI"
 msgstr "Мобиль GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "Уланиш"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "Узиш"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "Янги профил"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "Ўзгаришларни %1 профилида сақлашни истайсизми?"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr " %1 модем ускунасини очиб бўлмади."
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "Модем хатоси"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " Уланган "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "Кетма-кет интерфейс "
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "Манзиллар дафтари"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "Ойналар"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "Номи"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "Буйруқ"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 #, fuzzy
 msgid "Hex"
 msgstr "Hex"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "Қўшиш..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "Таҳрирлаш..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "Ишга тушириш"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "Кириш:"
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "Чиқиш:"
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "Натижа:"
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr " %1 учун қийматни киритинг:"
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "Уяли телефон билан боғланиш."
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "Терминал ойнани кўрсатиш"
 
-#: main.cpp:50
+#: src/main.cpp:50
 #, fuzzy
 msgid "Show mobile GUI"
 msgstr "Мобиль GUI'ни кўрсатиш"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "График интерфейсни бекитиш"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "Буйруқ профайл файлининг номи"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "Модем ўчирилган."
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "Модем банд."
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "Уяли телефон манзиллар дафтари ўқилмоқда..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "Уяли телефон манзиллар дафтарига ёзилмоқда..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "Уяли телефон манзиллар дафтарига ёзилди."
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "TDE манзиллар дафтари ўқилмоқда..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "TDE манзиллар дафтари ўқилди."
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "TDE манзиллар дафтарига ёзилди."
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "Уяли телефон манзиллар дафтари ўқилди."
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr ""
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr ""
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr ""
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr ""
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "Тенглаштирилган уяли телефон манзиллар дафтари."
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE манзиллар дафтари"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE манзиллар дафтари (ўзгарган)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE манзиллар дафтарида сақланмаган ўзгаришлар мавжуд."
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "Сақланмаган ўзгаришлар"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "Уяли телефон манзиллар дафтари"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "Уяли телефон манзиллар дафтари (ўзгарган)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "Уяли телефон манзиллар дафтарида сақланмаган ўзгаришлар мавжуд."
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "Терминал"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr ""
-"'%1 ускунасига мурожаат қилиб бўлмади. Сизда етарли ҳуқуқ борлигини текширинг."
+"'%1 ускунасига мурожаат қилиб бўлмади. Сизда етарли ҳуқуқ борлигини "
+"текширинг."
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "Боғланишни ўрнатиб бўлмади (tcgetattr коди: %1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() муваффақиятсиз тугади."
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "'%1' ускунасини қулфлаб бўлмади."
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "'%1' қулфлаш файлини очиб бўлмади."
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "'%1' қулфлаш файлини ўқиб бўлмади."
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "'%1' файлидан PID олиб бўлмади."
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr ""
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr ""
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr ""
-"'%1' қулфлаш файлини яратиб бўлмади. Илтимос сизда бунга рухсат борлигини "
-"текшириб кўринг."
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "&Кўрсатиш"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "Буйруқнинг хоссалари"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "Номи:"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr ""
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "Hex натижаси"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "Жойлашиши"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "Параметр"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "Қиймати"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "Уяли алоқа ускунаси"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "Русум маълумоти"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "Модели:"
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "Серия рақами:"
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "Ишлаб чиқарувчи:"
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM версияси:"
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "Манзиллар дафтарлари"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "Телефон"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "Ўқиш"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "Ёзиш"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "Файлга сақлаш..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "Тенглаштириш"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "Ҳолати"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "Батареянинг кучи:"
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "Сигнал сифати:"
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "Янгилаш"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "Соатни мослаш"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "Кетма-кет ускуна"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "Қулфлаш жилди"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "Дастур ишга тушганда модемни очиш"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "Уланганда телефоннинг соатини автоматик мослаш"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr ""
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "Дастур ишга тушганда терминал ойнасини очиш"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "Дастур ишга тушганда уяли алоқа ускунаси ойнасини очиш"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "&Кўрсатиш"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "Уяли алоқа ускунаси"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "Русум маълумоти"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "Модели:"
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "Серия рақами:"
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "Ишлаб чиқарувчи:"
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM версияси:"
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "Манзиллар дафтарлари"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "Ўқиш"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "Ёзиш"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "Файлга сақлаш..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "Тенглаштириш"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "Ҳолати"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "Батареянинг кучи:"
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "Сигнал сифати:"
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "Янгилаш"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "Соатни мослаш"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "'%1' қулфлаш файлини очиб бўлмади."
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "'%1' қулфлаш файлини ўқиб бўлмади."
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "'%1' файлидан PID олиб бўлмади."
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr ""
+#~ "'%1' қулфлаш файлини яратиб бўлмади. Илтимос сизда бунга рухсат борлигини "
+#~ "текшириб кўринг."
diff --git a/tde-i18n-zh_CN/messages/tdepim/kandy.po b/tde-i18n-zh_CN/messages/tdepim/kandy.po
index 989120bb067..175f9171707 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kandy.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kandy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2005-08-03 21:28+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -16,701 +16,660 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "TDE 简体中文翻译组"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "新建命令"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "参数 %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "输入参数名称："
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "调制解调器错误"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr " 已断开 "
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "无法装入文件 %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "无法保存文件 %1。"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "移动电话 GUI"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "连接"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "断开连接"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "新建配置文件"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "将更改保存到配置文件 %1 吗？"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "无法打开调制解调器设备 %1。"
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "调制解调器错误"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr " 已连接 "
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "串行接口"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "地址簿"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "窗口"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "名称"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "命令"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "十六进制"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "添加..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "编辑..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "执行"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "输入："
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "输出："
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "结果："
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "输入 %1 的值："
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "与您的移动电话通讯。"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "显示终端窗口"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "显示移动电话 GUI"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "不显示 GUI"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "命令配置文件的文件名"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "调制解调器关着。"
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "调制解调器正忙。"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "正在读取移动电话的电话簿..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "正在写入移动电话的电话簿..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "已写入移动电话的电话簿。"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "正在读取 TDE 地址簿..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "已读取 TDE 地址簿"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "已写入 TDE 地址簿。"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "已读取移动电话的电话簿。"
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab 条目："
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "移动电话条目："
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "冲突的条目"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "使用 Kab 条目"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "使用移动电话条目"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "已同步电话簿。"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE 地址簿"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE 地址簿(已修改)"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE 地址簿包含未保存的更改。"
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "未保存的更改"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "移动电话电话簿"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "移动电话电话簿(已修改)"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "移动电话电话簿包含未保存的更改。"
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "终端"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "无法打开设备“%1”。请检查您是否有足够的权限。"
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "通讯设置失败(tcgetattr 代码：%1)"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() 失败。"
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "无法锁定设备“%1”。"
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "无法打开加锁文件“%1”。"
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "无法读取加锁文件“%1”。"
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "无法从文件“%1”读取 PID。"
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "锁定设备的进程 PID %1 还在运行。"
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "无法发送信号给当前加锁文件的 PID。"
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "无法创建加锁文件“%1”。请检查您是否有足够的权限。"
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "显示(&S)"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "命令属性"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "名称："
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "字符串："
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "十六进制结果"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "位置"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "参数"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "值"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "移动电话设备"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "型号信息"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "型号："
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "序列号："
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "制造商："
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM 版本："
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "地址簿"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "电话"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "读取"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "写入"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "保存到文件..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "同步"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "状态"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "电池容量："
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "信号质量："
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "刷新"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "设定时钟"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "串行设备"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "波特率"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "锁定目录"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "启动时打开调制解调器"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "连接时自动设置移动电话的时钟"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "排除宅电号码"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "排除工作电话号码"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "排除信使号码"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "排除传真号码"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "排除移动电话号码"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "排除视频电话号码"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "排除邮箱号码"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "排除调制解调器号码"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "排除车载电话号码"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "排除 ISDN 号码"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "排除寻呼机号码"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "使用宅电后缀"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "使用工作电话后缀"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "使用信使后缀"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "使用传真后缀"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "使用移动电话后缀"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "使用视频电话后缀"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "使用邮箱后缀"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "使用调制解调器后缀"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "使用车载电话后缀"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "使用 ISDN 后缀"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "使用寻呼机后缀"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "宅电后缀"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "工作电话后缀"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "信使后缀"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "传真后缀"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "移动电话后缀"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "视频电话后缀"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "邮箱后缀"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "调制解调器后缀"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "车载电话后缀"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN 后缀"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "寻呼机后缀"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "启动时打开终端窗口"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "启动时打开移动电话窗口"
 
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "显示(&S)"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "移动电话设备"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "型号信息"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "型号："
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "序列号："
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "制造商："
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM 版本："
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "地址簿"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "电话"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "读取"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "写入"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "保存到文件..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "同步"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "状态"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "电池容量："
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "信号质量："
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "刷新"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "设定时钟"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "无法打开加锁文件“%1”。"
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "无法读取加锁文件“%1”。"
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "无法从文件“%1”读取 PID。"
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "锁定设备的进程 PID %1 还在运行。"
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "无法发送信号给当前加锁文件的 PID。"
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr "无法创建加锁文件“%1”。请检查您是否有足够的权限。"
+
 #~ msgid "tcgetattr() failed."
 #~ msgstr "tcgetattr() 失败。"
diff --git a/tde-i18n-zh_TW/messages/tdepim/kandy.po b/tde-i18n-zh_TW/messages/tdepim/kandy.po
index 4314e32daa3..3ddb09b733d 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kandy.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kandy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:07+0100\n"
 "PO-Revision-Date: 2006-03-02 08:49+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -16,698 +16,657 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "林偉智，Frank Weng (a.k.a. Franklin)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "wlin5@pop3.utoledo.edu, franklin at goodhorse dot idv dot tw"
 
-#: atcommand.cpp:53
+#: src/atcommand.cpp:53
 msgid "New Command"
 msgstr "新命令"
 
-#: atcommand.cpp:309
+#: src/atcommand.cpp:309
 #, c-format
 msgid "Arg %1"
 msgstr "參數 %1"
 
-#: cmdpropertiesdialog.cpp:109
+#: src/cmdpropertiesdialog.cpp:109
 msgid "Enter parameter name:"
 msgstr "輸入參數名稱："
 
-#: kandy.cpp:79 kandy.cpp:335 mobilegui.cpp:1513 mobilemain.cpp:57
+#: src/commandscheduler.cpp:102 src/kandyview.cpp:197
+#, fuzzy
+msgid "Error"
+msgstr "數據機錯誤"
+
+#: src/kandy.cpp:79 src/kandy.cpp:335 src/mobilegui.cpp:1513
+#: src/mobilemain.cpp:57
 msgid " Disconnected "
 msgstr "已中斷連線"
 
-#: kandy.cpp:105
+#: src/kandy.cpp:105
 #, c-format
 msgid "Could not load file %1"
 msgstr "無法載入檔案 %1"
 
-#: kandy.cpp:116
+#: src/kandy.cpp:116
 #, c-format
 msgid "Could not save file %1."
 msgstr "無法儲存檔案 %1"
 
-#: kandy.cpp:139
+#: src/kandy.cpp:139
 msgid "Mobile GUI"
 msgstr "行動電話使用者介面"
 
-#. i18n: file mobilegui_base.ui line 453
-#: kandy.cpp:142 mobilegui.cpp:1452 mobilegui.cpp:1491 rc.cpp:126
+#: src/kandy.cpp:142 src/mobilegui.cpp:1452 src/mobilegui.cpp:1491
+#: src/mobilegui_base.ui:453
 #, no-c-format
 msgid "Connect"
 msgstr "連線"
 
-#: kandy.cpp:144 mobilegui.cpp:1458
+#: src/kandy.cpp:144 src/mobilegui.cpp:1458
 msgid "Disconnect"
 msgstr "斷線"
 
-#: kandy.cpp:293
+#: src/kandy.cpp:293
 msgid "New Profile"
 msgstr "新設定檔"
 
-#: kandy.cpp:303 mobilemain.cpp:172
+#: src/kandy.cpp:303 src/mobilemain.cpp:172
 msgid "Save changes to profile %1?"
 msgstr "將變更儲存到設定檔 %1 嗎？"
 
-#: kandy.cpp:321
+#: src/kandy.cpp:321
 #, c-format
 msgid "Cannot open modem device %1."
 msgstr "無法開啟數據機裝置 %1。"
 
-#: kandy.cpp:322 main.cpp:69 main.cpp:74
+#: src/kandy.cpp:322 src/main.cpp:69 src/main.cpp:74
 msgid "Modem Error"
 msgstr "數據機錯誤"
 
-#: kandy.cpp:326 mobilegui.cpp:1466
+#: src/kandy.cpp:326 src/mobilegui.cpp:1466
 msgid " Connected "
 msgstr "已連接"
 
-#: kandyprefsdialog.cpp:77
+#: src/kandyprefsdialog.cpp:77
 msgid "Serial Interface"
 msgstr "序列介面"
 
-#: kandyprefsdialog.cpp:116
+#: src/kandyprefsdialog.cpp:116
 msgid "Address Book"
 msgstr "位址簿"
 
-#: kandyprefsdialog.cpp:353
+#: src/kandyprefsdialog.cpp:353
 msgid "Windows"
 msgstr "視窗"
 
-#. i18n: file mobilegui_base.ui line 165
-#: kandyview.cpp:78 rc.cpp:72 rc.cpp:99
+#: src/kandyview.cpp:78 src/mobilegui_base.ui:165 src/mobilegui_base.ui:290
 #, no-c-format
 msgid "Name"
 msgstr "姓名"
 
-#: kandyview.cpp:79
+#: src/kandyview.cpp:79
 msgid "Command"
 msgstr "命令"
 
-#: kandyview.cpp:80
+#: src/kandyview.cpp:80
 msgid "Hex"
 msgstr "十六進位數值"
 
-#: kandyview.cpp:86
+#: src/kandyview.cpp:86
 msgid "Add..."
 msgstr "新增..."
 
-#: kandyview.cpp:90
+#: src/kandyview.cpp:90
 msgid "Edit..."
 msgstr "編輯..."
 
-#: kandyview.cpp:98
+#: src/kandyview.cpp:94 src/mobilegui_base.ui:284
+#, no-c-format
+msgid "Delete"
+msgstr ""
+
+#: src/kandyview.cpp:98
 msgid "Execute"
 msgstr "執行"
 
-#: kandyview.cpp:108
+#: src/kandyview.cpp:108
 msgid "Input:"
 msgstr "輸入："
 
-#: kandyview.cpp:119
+#: src/kandyview.cpp:119
 msgid "Output:"
 msgstr "輸出："
 
-#: kandyview.cpp:129
+#: src/kandyview.cpp:129
 msgid "Result:"
 msgstr "結果："
 
-#: kandyview.cpp:253
+#: src/kandyview.cpp:253
 msgid "Enter value for %1:"
 msgstr "請輸入 %1 的數值："
 
-#: main.cpp:43
+#: src/main.cpp:43
 msgid "Communicating with your mobile phone."
 msgstr "正在跟您的行動電話溝通中。"
 
-#: main.cpp:49
+#: src/main.cpp:49
 msgid "Show terminal window"
 msgstr "顯示終端機視窗"
 
-#: main.cpp:50
+#: src/main.cpp:50
 msgid "Show mobile GUI"
 msgstr "顯示行動電話使用者介面"
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "Do not show GUI"
 msgstr "不顯示使用者介面"
 
-#: main.cpp:52
+#: src/main.cpp:52
 msgid "Filename of command profile file"
 msgstr "命令設定檔檔名"
 
-#: main.cpp:69
+#: src/main.cpp:69
 msgid "Modem is off."
 msgstr "數據機已關機。"
 
-#: main.cpp:74
+#: src/main.cpp:74
 msgid "Modem is busy."
 msgstr "數據機忙線中。"
 
-#: main.cpp:90
+#: src/main.cpp:90
 msgid "Kandy"
 msgstr "Kandy"
 
-#: mobilegui.cpp:295 mobilegui.cpp:454
+#: src/mobilegui.cpp:295 src/mobilegui.cpp:454
 msgid "Reading mobile phonebook..."
 msgstr "讀取行動電話的電話簿..."
 
-#: mobilegui.cpp:424
+#: src/mobilegui.cpp:424
 msgid "Writing mobile phonebook..."
 msgstr "寫入行動電話的電話簿..."
 
-#: mobilegui.cpp:433
+#: src/mobilegui.cpp:433
 msgid "Wrote mobile phonebook."
 msgstr "已寫入行動電話之電話簿。"
 
-#: mobilegui.cpp:493
+#: src/mobilegui.cpp:493
 msgid "Reading TDE address book..."
 msgstr "讀取 TDE 通訊錄..."
 
-#: mobilegui.cpp:643
+#: src/mobilegui.cpp:643
 msgid "Read TDE address book."
 msgstr "已讀取 TDE 通訊錄。"
 
-#: mobilegui.cpp:951
+#: src/mobilegui.cpp:951
 msgid "Wrote TDE address book."
 msgstr "已寫入 TDE 通訊錄。"
 
-#: mobilegui.cpp:1162
+#: src/mobilegui.cpp:1162
 msgid "Read mobile phonebook."
 msgstr "已讀取行動電話簿。"
 
-#: mobilegui.cpp:1313
+#: src/mobilegui.cpp:1313
 msgid "Kab Entry:"
 msgstr "Kab 項目："
 
-#: mobilegui.cpp:1316
+#: src/mobilegui.cpp:1316
 msgid "Mobile Entry:"
 msgstr "行動電話項目："
 
-#: mobilegui.cpp:1321
+#: src/mobilegui.cpp:1321
 msgid "Conflicting Entries"
 msgstr "衝突的項目"
 
-#: mobilegui.cpp:1323
+#: src/mobilegui.cpp:1323
 msgid "Use Kab Entry"
 msgstr "使用 Kab 項目"
 
-#: mobilegui.cpp:1324
+#: src/mobilegui.cpp:1324
 msgid "Use Mobile Entry"
 msgstr "使用行動電話項目"
 
-#: mobilegui.cpp:1401
+#: src/mobilegui.cpp:1401
 msgid "Synced phonebooks."
 msgstr "電話簿已同步。"
 
-#. i18n: file mobilegui_base.ui line 156
-#: mobilegui.cpp:1529 mobilegui.cpp:1541 mobilegui.cpp:1549 rc.cpp:69
+#: src/mobilegui.cpp:1529 src/mobilegui.cpp:1541 src/mobilegui.cpp:1549
+#: src/mobilegui_base.ui:156
 #, no-c-format
 msgid "TDE Address Book"
 msgstr "TDE 通訊錄"
 
-#: mobilegui.cpp:1536
+#: src/mobilegui.cpp:1536
 msgid "TDE Address Book (modified)"
 msgstr "TDE 通訊錄（已變更）"
 
-#: mobilegui.cpp:1564
+#: src/mobilegui.cpp:1563 src/mobilegui.cpp:1648
+msgid "Warning"
+msgstr ""
+
+#: src/mobilegui.cpp:1564
 msgid "The TDE address book contains unsaved changes."
 msgstr "TDE 通訊錄中含有未儲存的變更。"
 
-#: mobilegui.cpp:1567 mobilegui.cpp:1652
+#: src/mobilegui.cpp:1567 src/mobilegui.cpp:1652
 msgid "Unsaved Changes"
 msgstr "變更未儲存"
 
-#. i18n: file mobilegui_base.ui line 232
-#: mobilegui.cpp:1590 mobilegui.cpp:1597 mobilegui.cpp:1614 mobilegui.cpp:1624
-#: mobilegui.cpp:1631 rc.cpp:84
+#: src/mobilegui.cpp:1569 src/mobilegui.cpp:1654
+msgid "Save"
+msgstr ""
+
+#: src/mobilegui.cpp:1570 src/mobilegui.cpp:1655
+msgid "Discard"
+msgstr ""
+
+#: src/mobilegui.cpp:1590 src/mobilegui.cpp:1597 src/mobilegui.cpp:1614
+#: src/mobilegui.cpp:1624 src/mobilegui.cpp:1631 src/mobilegui_base.ui:232
 #, no-c-format
 msgid "Mobile Phone Book"
 msgstr "行動電話簿"
 
-#: mobilegui.cpp:1607
+#: src/mobilegui.cpp:1607
 msgid "Mobile Phone Book (modified)"
 msgstr "行動電話簿（已變更）"
 
-#: mobilegui.cpp:1649
+#: src/mobilegui.cpp:1649
 msgid "The mobile phone book contains unsaved changes."
 msgstr "行動電話簿中含有未儲存的變更。"
 
-#. i18n: file mobilegui_base.ui line 361
-#: mobilemain.cpp:76 rc.cpp:108
+#: src/mobilegui_base.ui:361 src/mobilemain.cpp:76
 #, no-c-format
 msgid "Terminal"
 msgstr "終端機"
 
-#: modem.cpp:197
+#: src/modem.cpp:196
 msgid ""
-"Unable to open device '%1'. Please check that you have sufficient permissions."
+"Unable to open device '%1'. Please check that you have sufficient "
+"permissions."
 msgstr "無法開啟裝置 %1。請確定您的權限沒有問題。"
 
-#: modem.cpp:206
+#: src/modem.cpp:209
 msgid "Communication setup failed (tcgetattr code: %1)"
 msgstr "通訊設定失敗（tcgetattr 傳回值：%1）。"
 
-#: modem.cpp:223
+#: src/modem.cpp:227
 msgid "tcsetattr() failed."
 msgstr "tcsetattr() 函式呼叫失敗。"
 
-#: modem.cpp:282
+#: src/modem.cpp:284
 msgid "Unable to lock device '%1'."
 msgstr "無法鎖定裝置 %1。"
 
-#: modem.cpp:301
-msgid "Unable to open lock file '%1'."
-msgstr "無法開啟鎖定檔 %1。"
-
-#: modem.cpp:309
-msgid "Unable to read lock file '%1'."
-msgstr "無法讀取鎖定檔 %1。"
-
-#: modem.cpp:319
-msgid "Unable to get PID from file '%1'."
-msgstr "無法從檔案 %1 取得行程代碼。"
-
-#: modem.cpp:325
-msgid "Process with PID %1, which is locking the device, is still running."
-msgstr "代碼 %1 的行程已將此裝置鎖定，並且正在執行中。"
-
-#: modem.cpp:331
-msgid "Unable to emit signal to PID of existing lock file."
-msgstr "無法對鎖定裝置的行程發出信號。"
-
-#: modem.cpp:337
-msgid ""
-"Unable to create lock file '%1'. Please check that you have sufficient "
-"permissions."
-msgstr "無法產生鎖定檔 %1。請檢查您的權限。"
-
-#. i18n: file kandymobileui.rc line 4
-#: rc.cpp:3 rc.cpp:6
-#, no-c-format
-msgid "&Show"
-msgstr "顯示 (&S)"
-
-#. i18n: file cmdpropertiesdialog_base.ui line 16
-#: rc.cpp:9
+#: src/cmdpropertiesdialog_base.ui:16
 #, no-c-format
 msgid "Command Properties"
 msgstr "命令內容"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 46
-#: rc.cpp:12
+#: src/cmdpropertiesdialog_base.ui:46
 #, no-c-format
 msgid "Name:"
 msgstr "姓名："
 
-#. i18n: file cmdpropertiesdialog_base.ui line 54
-#: rc.cpp:15
+#: src/cmdpropertiesdialog_base.ui:54
 #, no-c-format
 msgid "String:"
 msgstr "字串："
 
-#. i18n: file cmdpropertiesdialog_base.ui line 62
-#: rc.cpp:18
+#: src/cmdpropertiesdialog_base.ui:62
 #, no-c-format
 msgid "Hex result"
 msgstr "十六進位數值結果"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 68
-#: rc.cpp:21
+#: src/cmdpropertiesdialog_base.ui:68
 #, no-c-format
 msgid "Position"
 msgstr "所在位置"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 79
-#: rc.cpp:24
+#: src/cmdpropertiesdialog_base.ui:79
 #, no-c-format
 msgid "Parameter"
 msgstr "參數"
 
-#. i18n: file cmdpropertiesdialog_base.ui line 90
-#: rc.cpp:27
+#: src/cmdpropertiesdialog_base.ui:90
 #, no-c-format
 msgid "Value"
 msgstr "數值"
 
-#. i18n: file mobilegui_base.ui line 16
-#: rc.cpp:36
-#, no-c-format
-msgid "Mobile Device"
-msgstr "行動電話裝置"
-
-#. i18n: file mobilegui_base.ui line 41
-#: rc.cpp:39
-#, no-c-format
-msgid "Model Information"
-msgstr "手機型號資訊"
-
-#. i18n: file mobilegui_base.ui line 50
-#: rc.cpp:42
-#, no-c-format
-msgid "Model:"
-msgstr "型號："
-
-#. i18n: file mobilegui_base.ui line 59
-#: rc.cpp:45
-#, no-c-format
-msgid "Serial number:"
-msgstr "序號："
-
-#. i18n: file mobilegui_base.ui line 68
-#: rc.cpp:48 rc.cpp:51 rc.cpp:54 rc.cpp:57 rc.cpp:120
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file mobilegui_base.ui line 104
-#: rc.cpp:60
-#, no-c-format
-msgid "Manufacturer:"
-msgstr "製造商："
-
-#. i18n: file mobilegui_base.ui line 113
-#: rc.cpp:63
-#, no-c-format
-msgid "GSM version:"
-msgstr "GSM 版本："
-
-#. i18n: file mobilegui_base.ui line 145
-#: rc.cpp:66
-#, no-c-format
-msgid "Address Books"
-msgstr "通訊錄"
-
-#. i18n: file mobilegui_base.ui line 176
-#: rc.cpp:75 rc.cpp:102
-#, no-c-format
-msgid "Phone"
-msgstr "電話"
-
-#. i18n: file mobilegui_base.ui line 197
-#: rc.cpp:78 rc.cpp:87
-#, no-c-format
-msgid "Read"
-msgstr "讀取"
-
-#. i18n: file mobilegui_base.ui line 222
-#: rc.cpp:81 rc.cpp:90
-#, no-c-format
-msgid "Write"
-msgstr "寫入"
-
-#. i18n: file mobilegui_base.ui line 276
-#: rc.cpp:93
-#, no-c-format
-msgid "Save to File..."
-msgstr "儲存到檔案..."
-
-#. i18n: file mobilegui_base.ui line 332
-#: rc.cpp:105
-#, no-c-format
-msgid "Sync"
-msgstr "同步更新"
-
-#. i18n: file mobilegui_base.ui line 388
-#: rc.cpp:111
-#, no-c-format
-msgid "Status"
-msgstr "狀態"
-
-#. i18n: file mobilegui_base.ui line 405
-#: rc.cpp:114
-#, no-c-format
-msgid "Battery charge:"
-msgstr "電池狀態："
-
-#. i18n: file mobilegui_base.ui line 413
-#: rc.cpp:117
-#, no-c-format
-msgid "Signal quality:"
-msgstr "信號品質："
-
-#. i18n: file mobilegui_base.ui line 429
-#: rc.cpp:123
-#, no-c-format
-msgid "xx %"
-msgstr "xx %"
-
-#. i18n: file mobilegui_base.ui line 472
-#: rc.cpp:129
+#: src/cmdpropertiesdialog_base.ui:125
 #, no-c-format
-msgid "Refresh"
-msgstr "重新整理"
+msgid "&OK"
+msgstr ""
 
-#. i18n: file mobilegui_base.ui line 483
-#: rc.cpp:132
+#: src/cmdpropertiesdialog_base.ui:139
 #, no-c-format
-msgid "Set Clock"
-msgstr "設定時鐘"
+msgid "&Cancel"
+msgstr ""
 
-#. i18n: file kandy.kcfg line 10
-#: rc.cpp:135
+#: src/kandy.kcfg:10
 #, no-c-format
 msgid "Serial device"
 msgstr "序列裝置"
 
-#. i18n: file kandy.kcfg line 14
-#: rc.cpp:138
+#: src/kandy.kcfg:14
 #, no-c-format
 msgid "Baud rate"
 msgstr "連線速率"
 
-#. i18n: file kandy.kcfg line 18
-#: rc.cpp:141
+#: src/kandy.kcfg:18
 #, no-c-format
 msgid "Lock directory"
 msgstr "鎖定目錄"
 
-#. i18n: file kandy.kcfg line 22
-#: rc.cpp:144
+#: src/kandy.kcfg:22
 #, no-c-format
 msgid "Open modem on startup"
 msgstr "在開啟時打開數據機"
 
-#. i18n: file kandy.kcfg line 26
-#: rc.cpp:147
+#: src/kandy.kcfg:26
 #, no-c-format
 msgid "Auto-set clock of mobile on connection"
 msgstr "連線時自動設定手機的時鐘"
 
-#. i18n: file kandy.kcfg line 33
-#: rc.cpp:150
+#: src/kandy.kcfg:33
 #, no-c-format
 msgid "Exclude home numbers"
 msgstr "排除家庭號碼"
 
-#. i18n: file kandy.kcfg line 37
-#: rc.cpp:153
+#: src/kandy.kcfg:37
 #, no-c-format
 msgid "Exclude work numbers"
 msgstr "排除工作號碼"
 
-#. i18n: file kandy.kcfg line 41
-#: rc.cpp:156
+#: src/kandy.kcfg:41
 #, no-c-format
 msgid "Exclude messaging numbers"
 msgstr "排除訊息號碼"
 
-#. i18n: file kandy.kcfg line 45
-#: rc.cpp:159
+#: src/kandy.kcfg:45
 #, no-c-format
 msgid "Exclude fax numbers"
 msgstr "排除傳真號碼"
 
-#. i18n: file kandy.kcfg line 49
-#: rc.cpp:162
+#: src/kandy.kcfg:49
 #, no-c-format
 msgid "Exclude cell numbers"
 msgstr "排除手機號碼"
 
-#. i18n: file kandy.kcfg line 53
-#: rc.cpp:165
+#: src/kandy.kcfg:53
 #, no-c-format
 msgid "Exclude video phone numbers"
 msgstr "排除影像電話號碼"
 
-#. i18n: file kandy.kcfg line 57
-#: rc.cpp:168
+#: src/kandy.kcfg:57
 #, no-c-format
 msgid "Exclude mailbox numbers"
 msgstr "排除信箱號碼"
 
-#. i18n: file kandy.kcfg line 61
-#: rc.cpp:171
+#: src/kandy.kcfg:61
 #, no-c-format
 msgid "Exclude modem numbers"
 msgstr "排除數據機號碼"
 
-#. i18n: file kandy.kcfg line 65
-#: rc.cpp:174
+#: src/kandy.kcfg:65
 #, no-c-format
 msgid "Exclude car phone numbers"
 msgstr "排除車用電話號碼"
 
-#. i18n: file kandy.kcfg line 69
-#: rc.cpp:177
+#: src/kandy.kcfg:69
 #, no-c-format
 msgid "Exclude ISDN numbers"
 msgstr "排除 ISDN 號碼"
 
-#. i18n: file kandy.kcfg line 73
-#: rc.cpp:180
+#: src/kandy.kcfg:73
 #, no-c-format
 msgid "Exclude pager numbers"
 msgstr "排除呼叫器號碼"
 
-#. i18n: file kandy.kcfg line 78
-#: rc.cpp:183
+#: src/kandy.kcfg:78
 #, no-c-format
 msgid "Use home suffix"
 msgstr "使用家庭字尾"
 
-#. i18n: file kandy.kcfg line 82
-#: rc.cpp:186
+#: src/kandy.kcfg:82
 #, no-c-format
 msgid "Use work suffix"
 msgstr "使用工作字尾"
 
-#. i18n: file kandy.kcfg line 86
-#: rc.cpp:189
+#: src/kandy.kcfg:86
 #, no-c-format
 msgid "Use messaging suffix"
 msgstr "使用訊息字尾"
 
-#. i18n: file kandy.kcfg line 90
-#: rc.cpp:192
+#: src/kandy.kcfg:90
 #, no-c-format
 msgid "Use fax suffix"
 msgstr "使用傳真字尾"
 
-#. i18n: file kandy.kcfg line 94
-#: rc.cpp:195
+#: src/kandy.kcfg:94
 #, no-c-format
 msgid "Use mobile suffix"
 msgstr "使用行動電話字尾"
 
-#. i18n: file kandy.kcfg line 98
-#: rc.cpp:198
+#: src/kandy.kcfg:98
 #, no-c-format
 msgid "Use video suffix"
 msgstr "使用影像字尾"
 
-#. i18n: file kandy.kcfg line 102
-#: rc.cpp:201
+#: src/kandy.kcfg:102
 #, no-c-format
 msgid "Use mailbox suffix"
 msgstr "使用信箱字尾"
 
-#. i18n: file kandy.kcfg line 106
-#: rc.cpp:204
+#: src/kandy.kcfg:106
 #, no-c-format
 msgid "Use modem suffix"
 msgstr "使用數據機字尾"
 
-#. i18n: file kandy.kcfg line 110
-#: rc.cpp:207
+#: src/kandy.kcfg:110
 #, no-c-format
 msgid "Use car suffix"
 msgstr "使用車用字尾"
 
-#. i18n: file kandy.kcfg line 114
-#: rc.cpp:210
+#: src/kandy.kcfg:114
 #, no-c-format
 msgid "Use ISDN suffix"
 msgstr "使用 ISDN 字尾"
 
-#. i18n: file kandy.kcfg line 118
-#: rc.cpp:213
+#: src/kandy.kcfg:118
 #, no-c-format
 msgid "Use pager suffix"
 msgstr "使用呼叫器字尾"
 
-#. i18n: file kandy.kcfg line 123
-#: rc.cpp:216
+#: src/kandy.kcfg:123
 #, no-c-format
 msgid "Home suffix"
 msgstr "家庭字尾"
 
-#. i18n: file kandy.kcfg line 127
-#: rc.cpp:219
+#: src/kandy.kcfg:127
 #, no-c-format
 msgid "Work suffix"
 msgstr "工作字尾"
 
-#. i18n: file kandy.kcfg line 131
-#: rc.cpp:222
+#: src/kandy.kcfg:131
 #, no-c-format
 msgid "Messaging suffix"
 msgstr "訊息字尾"
 
-#. i18n: file kandy.kcfg line 135
-#: rc.cpp:225
+#: src/kandy.kcfg:135
 #, no-c-format
 msgid "Fax suffix"
 msgstr "傳真字尾"
 
-#. i18n: file kandy.kcfg line 139
-#: rc.cpp:228
+#: src/kandy.kcfg:139
 #, no-c-format
 msgid "Cell suffix"
 msgstr "行動電話字尾"
 
-#. i18n: file kandy.kcfg line 143
-#: rc.cpp:231
+#: src/kandy.kcfg:143
 #, no-c-format
 msgid "Video suffix"
 msgstr "影像字尾"
 
-#. i18n: file kandy.kcfg line 147
-#: rc.cpp:234
+#: src/kandy.kcfg:147
 #, no-c-format
 msgid "Mailbox suffix"
 msgstr "信箱字尾"
 
-#. i18n: file kandy.kcfg line 151
-#: rc.cpp:237
+#: src/kandy.kcfg:151
 #, no-c-format
 msgid "Modem suffix"
 msgstr "數據機字尾"
 
-#. i18n: file kandy.kcfg line 155
-#: rc.cpp:240
+#: src/kandy.kcfg:155
 #, no-c-format
 msgid "Car suffix"
 msgstr "車用字尾"
 
-#. i18n: file kandy.kcfg line 159
-#: rc.cpp:243
+#: src/kandy.kcfg:159
 #, no-c-format
 msgid "ISDN suffix"
 msgstr "ISDN 字尾"
 
-#. i18n: file kandy.kcfg line 163
-#: rc.cpp:246
+#: src/kandy.kcfg:163
 #, no-c-format
 msgid "Pager suffix"
 msgstr "呼叫器字尾"
 
-#. i18n: file kandy.kcfg line 171
-#: rc.cpp:249
+#: src/kandy.kcfg:171
 #, no-c-format
 msgid "Open terminal window on startup"
 msgstr "啟動時打開終端機視窗"
 
-#. i18n: file kandy.kcfg line 175
-#: rc.cpp:252
+#: src/kandy.kcfg:175
 #, no-c-format
 msgid "Open mobile window on startup"
 msgstr "啟動時打開行動電話視窗"
+
+#: src/kandymobileui.rc:4 src/kandyui.rc:4
+#, no-c-format
+msgid "&Show"
+msgstr "顯示 (&S)"
+
+#: src/mobilegui_base.ui:16
+#, no-c-format
+msgid "Mobile Device"
+msgstr "行動電話裝置"
+
+#: src/mobilegui_base.ui:41
+#, no-c-format
+msgid "Model Information"
+msgstr "手機型號資訊"
+
+#: src/mobilegui_base.ui:50
+#, no-c-format
+msgid "Model:"
+msgstr "型號："
+
+#: src/mobilegui_base.ui:59
+#, no-c-format
+msgid "Serial number:"
+msgstr "序號："
+
+#: src/mobilegui_base.ui:68 src/mobilegui_base.ui:77 src/mobilegui_base.ui:86
+#: src/mobilegui_base.ui:95 src/mobilegui_base.ui:421
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#: src/mobilegui_base.ui:104
+#, no-c-format
+msgid "Manufacturer:"
+msgstr "製造商："
+
+#: src/mobilegui_base.ui:113
+#, no-c-format
+msgid "GSM version:"
+msgstr "GSM 版本："
+
+#: src/mobilegui_base.ui:145
+#, no-c-format
+msgid "Address Books"
+msgstr "通訊錄"
+
+#: src/mobilegui_base.ui:176 src/mobilegui_base.ui:301
+#, no-c-format
+msgid "Phone"
+msgstr "電話"
+
+#: src/mobilegui_base.ui:197 src/mobilegui_base.ui:243
+#, no-c-format
+msgid "Read"
+msgstr "讀取"
+
+#: src/mobilegui_base.ui:222 src/mobilegui_base.ui:251
+#, no-c-format
+msgid "Write"
+msgstr "寫入"
+
+#: src/mobilegui_base.ui:276
+#, no-c-format
+msgid "Save to File..."
+msgstr "儲存到檔案..."
+
+#: src/mobilegui_base.ui:332
+#, no-c-format
+msgid "Sync"
+msgstr "同步更新"
+
+#: src/mobilegui_base.ui:388
+#, no-c-format
+msgid "Status"
+msgstr "狀態"
+
+#: src/mobilegui_base.ui:405
+#, no-c-format
+msgid "Battery charge:"
+msgstr "電池狀態："
+
+#: src/mobilegui_base.ui:413
+#, no-c-format
+msgid "Signal quality:"
+msgstr "信號品質："
+
+#: src/mobilegui_base.ui:429
+#, no-c-format
+msgid "xx %"
+msgstr "xx %"
+
+#: src/mobilegui_base.ui:472
+#, no-c-format
+msgid "Refresh"
+msgstr "重新整理"
+
+#: src/mobilegui_base.ui:483
+#, no-c-format
+msgid "Set Clock"
+msgstr "設定時鐘"
+
+#~ msgid "Unable to open lock file '%1'."
+#~ msgstr "無法開啟鎖定檔 %1。"
+
+#~ msgid "Unable to read lock file '%1'."
+#~ msgstr "無法讀取鎖定檔 %1。"
+
+#~ msgid "Unable to get PID from file '%1'."
+#~ msgstr "無法從檔案 %1 取得行程代碼。"
+
+#~ msgid "Process with PID %1, which is locking the device, is still running."
+#~ msgstr "代碼 %1 的行程已將此裝置鎖定，並且正在執行中。"
+
+#~ msgid "Unable to emit signal to PID of existing lock file."
+#~ msgstr "無法對鎖定裝置的行程發出信號。"
+
+#~ msgid ""
+#~ "Unable to create lock file '%1'. Please check that you have sufficient "
+#~ "permissions."
+#~ msgstr "無法產生鎖定檔 %1。請檢查您的權限。"