Automated l10n update (.po files)

31 files changed, 2828 insertions, 2748 deletions

diff --git a/tde-i18n-en_GB/messages/tdeutils/ark.po b/tde-i18n-en_GB/messages/tdeutils/ark.po
index cd68e09baf5..a6ce20f7d77 100644
--- a/tde-i18n-en_GB/messages/tdeutils/ark.po
+++ b/tde-i18n-en_GB/messages/tdeutils/ark.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ark\n"
-"POT-Creation-Date: 2007-11-07 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2006-01-15 21:03+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,35 +29,50 @@ msgid ""
 msgstr "[email protected]"
 
 #: ace.cpp:104 ace.cpp:170 ar.cpp:102 ar.cpp:121 ar.cpp:165 ar.cpp:222
-#: ar.cpp:255 compressedfile.cpp:202 compressedfile.cpp:313 lha.cpp:156
-#: lha.cpp:226 lha.cpp:267 lha.cpp:297 rar.cpp:133 rar.cpp:208 rar.cpp:265
-#: rar.cpp:301 sevenzip.cpp:112 sevenzip.cpp:151 sevenzip.cpp:191
-#: sevenzip.cpp:239 tar.cpp:272 tar.cpp:560 tar.cpp:639 tar.cpp:683
-#: zip.cpp:105 zip.cpp:177 zip.cpp:236 zip.cpp:272 zoo.cpp:122 zoo.cpp:189
-#: zoo.cpp:248 zoo.cpp:279
+#: ar.cpp:255 arj.cpp:134 arj.cpp:202 arj.cpp:258 arj.cpp:294 arj.cpp:322
+#: compressedfile.cpp:214 compressedfile.cpp:325 lha.cpp:158 lha.cpp:228
+#: lha.cpp:269 lha.cpp:299 rar.cpp:162 rar.cpp:246 rar.cpp:303 rar.cpp:339
+#: rar.cpp:367 sevenzip.cpp:114 sevenzip.cpp:162 sevenzip.cpp:207
+#: sevenzip.cpp:261 sevenzip.cpp:417 tar.cpp:284 tar.cpp:575 tar.cpp:654
+#: tar.cpp:698 tar.cpp:820 zip.cpp:106 zip.cpp:184 zip.cpp:243 zip.cpp:280
+#: zip.cpp:308 zoo.cpp:122 zoo.cpp:189 zoo.cpp:248 zoo.cpp:279
 msgid "Could not start a subprocess."
 msgstr "Could not start a subprocess."
 
-#: arch.cpp:132
-msgid "The deletion operation failed."
-msgstr "The deletion operation failed."
-
-#: arch.cpp:161
+#: arch.cpp:113 arch.cpp:188 arch.cpp:413
 msgid "The password was incorrect. "
 msgstr "The password was incorrect. "
 
-#: arch.cpp:162
+#: arch.cpp:114
+#, fuzzy
+msgid "You must enter a password to open the file:"
+msgstr "You must enter a password to extract the file:"
+
+#: arch.cpp:159
+msgid "The deletion operation failed."
+msgstr "The deletion operation failed."
+
+#: arch.cpp:189 arch.cpp:414
 msgid "You must enter a password to extract the file:"
 msgstr "You must enter a password to extract the file:"
 
-#: arch.cpp:180
+#: arch.cpp:207
 msgid "The extraction operation failed."
 msgstr "The extraction operation failed."
 
-#: arch.cpp:218
+#: arch.cpp:245
 msgid "The addition operation failed."
 msgstr "The addition operation failed."
 
+#: arch.cpp:400
+msgid "Not implemented."
+msgstr ""
+
+#: arch.cpp:432
+#, fuzzy
+msgid "The test operation failed."
+msgstr "The deletion operation failed."
+
 #: archiveformatdlg.cpp:33
 msgid "Choose Archive Format"
 msgstr "Choose Archive Format"
@@ -83,20 +99,27 @@ msgstr ""
 "Ark has detected the format: %1\n"
 "If this is not correct, please choose the appropriate format."
 
-#: archiveformatinfo.cpp:70
+#: archiveformatinfo.cpp:75
 msgid "Compressed File"
 msgstr "Compressed File"
 
-#: archiveformatinfo.cpp:114
+#: archiveformatinfo.cpp:121
 msgid ""
 "All Valid Archives\n"
 msgstr ""
 "All Valid Archives\n"
 
-#: archiveformatinfo.cpp:115
+#: archiveformatinfo.cpp:122
 msgid "All Files"
 msgstr "All Files"
 
+#: arj.cpp:82 rar.cpp:192 sevenzip.cpp:128 zip.cpp:121
+msgid ""
+"Warning!\n"
+"Using KGpg for encryption is more secure.\n"
+"Cancel this dialog or enter password for %1 archiver:"
+msgstr ""
+
 #: ark_part.cpp:47
 msgid "ark"
 msgstr "ark"
@@ -139,27 +162,31 @@ msgstr "&Open With..."
 msgid "Edit &With..."
 msgstr "Edit &With..."
 
-#: ark_part.cpp:144
+#: ark_part.cpp:142
+msgid "&Test integrity"
+msgstr ""
+
+#: ark_part.cpp:147
 msgid "&Unselect All"
 msgstr "&Unselect All"
 
-#: ark_part.cpp:146
+#: ark_part.cpp:149
 msgid "&Invert Selection"
 msgstr "&Invert Selection"
 
-#: ark_part.cpp:152
+#: ark_part.cpp:155
 msgid "Configure &Ark..."
 msgstr "Configure &Ark..."
 
-#: ark_part.cpp:156
+#: ark_part.cpp:159
 msgid "Show Search Bar"
 msgstr "Show Search Bar"
 
-#: ark_part.cpp:157
+#: ark_part.cpp:160
 msgid "Hide Search Bar"
 msgstr "Hide Search Bar"
 
-#: ark_part.cpp:296
+#: ark_part.cpp:302
 msgid ""
 "The archive \"%1\" has been modified.\n"
 "Do you want to save it?"
@@ -167,19 +194,19 @@ msgstr ""
 "The archive \"%1\" has been modified.\n"
 "Do you want to save it?"
 
-#: ark_part.cpp:298
+#: ark_part.cpp:304
 msgid "Save Archive?"
 msgstr "Save Archive?"
 
-#: ark_part.cpp:323
+#: ark_part.cpp:329
 msgid "Downloading %1..."
 msgstr "Downloading %1..."
 
-#: ark_part.cpp:415
+#: ark_part.cpp:421
 msgid "Total: 0 files"
 msgstr "Total: 0 files"
 
-#: ark_part.cpp:420 arkwidget.cpp:1808
+#: ark_part.cpp:426 arkwidget.cpp:1839
 msgid "0 files selected"
 msgstr "0 files selected"
 
@@ -209,11 +236,11 @@ msgstr ""
 msgid "Run Nevertheless"
 msgstr "Run Nevertheless"
 
-#: arkwidget.cpp:132
+#: arkwidget.cpp:133
 msgid "&Search:"
 msgstr "&Search:"
 
-#: arkwidget.cpp:198
+#: arkwidget.cpp:201
 msgid ""
 "_n: %n file  %1\n"
 "%n files  %1"
@@ -221,11 +248,11 @@ msgstr ""
 "%n file  %1\n"
 "%n files  %1"
 
-#: arkwidget.cpp:273
+#: arkwidget.cpp:276
 msgid "Save Archive As"
 msgstr "Save Archive As"
 
-#: arkwidget.cpp:278
+#: arkwidget.cpp:281
 msgid ""
 "Please save your archive in the same format as the original.\n"
 "Hint: Use one of the suggested extensions."
@@ -233,21 +260,21 @@ msgstr ""
 "Please save your archive in the same format as the original.\n"
 "Hint: Use one of the suggested extensions."
 
-#: arkwidget.cpp:296
+#: arkwidget.cpp:299
 msgid "Saving..."
 msgstr "Saving..."
 
-#: arkwidget.cpp:431
+#: arkwidget.cpp:434
 #, c-format
 msgid "Could not create the folder %1"
 msgstr "Could not create the folder %1"
 
-#: arkwidget.cpp:467
+#: arkwidget.cpp:470
 #, c-format
 msgid "An error occurred while opening the archive %1."
 msgstr "An error occurred while opening the archive %1."
 
-#: arkwidget.cpp:498 arkwidget.cpp:1378
+#: arkwidget.cpp:501 arkwidget.cpp:1390
 msgid ""
 "The following files will not be extracted\n"
 "because they already exist:"
@@ -255,52 +282,52 @@ msgstr ""
 "The following files will not be extracted\n"
 "because they already exist:"
 
-#: arkwidget.cpp:513
+#: arkwidget.cpp:516
 msgid "Not enough free disc space to extract the archive."
 msgstr "Not enough free disc space to extract the archive."
 
-#: arkwidget.cpp:529
+#: arkwidget.cpp:532
 msgid "An error occurred while extracting the archive."
 msgstr "An error occurred while extracting the archive."
 
-#: arkwidget.cpp:669
+#: arkwidget.cpp:676
 msgid "An error occurred while adding the files to the archive."
 msgstr "An error occurred while adding the files to the archive."
 
-#: arkwidget.cpp:708
+#: arkwidget.cpp:715
 msgid "The archive %1 does not exist."
 msgstr "The archive %1 does not exist."
 
-#: arkwidget.cpp:714
+#: arkwidget.cpp:721
 msgid "You do not have permission to access that archive."
 msgstr "You do not have permission to access that archive."
 
-#: arkwidget.cpp:795
+#: arkwidget.cpp:805
 msgid "Archive already exists. Do you wish to overwrite it?"
 msgstr "Archive already exists. Do you wish to overwrite it?"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Archive Already Exists"
 msgstr "Archive Already Exists"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Do Not Overwrite"
 msgstr "Do Not Overwrite"
 
-#: arkwidget.cpp:816
+#: arkwidget.cpp:826
 #, c-format
 msgid "You do not have permission to write to the directory %1"
 msgstr "You do not have permission to write to the directory %1"
 
-#: arkwidget.cpp:829 arkwidget.cpp:979
+#: arkwidget.cpp:839 arkwidget.cpp:989
 msgid "Create New Archive"
 msgstr "Create New Archive"
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid ""
 "You are currently working with a simple compressed file.\n"
 "Would you like to make it into an archive so that it can contain multiple "
@@ -312,71 +339,80 @@ msgstr ""
 "files?\n"
 "If so, you must choose a name for your new archive."
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid "Make Into Archive"
 msgstr "Make Into Archive"
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid "Do Not Make"
 msgstr "Do Not Make"
 
-#: arkwidget.cpp:991 arkwidget.cpp:2064
+#: arkwidget.cpp:1001 arkwidget.cpp:2095
 msgid "Creating archive..."
 msgstr "Creating archive..."
 
-#: arkwidget.cpp:1094
+#: arkwidget.cpp:1104
 msgid "Select Files to Add"
 msgstr "Select Files to Add"
 
-#: arkwidget.cpp:1133
+#: arkwidget.cpp:1143
 msgid "Adding files..."
 msgstr "Adding files..."
 
-#: arkwidget.cpp:1152
+#: arkwidget.cpp:1162
 msgid "Select Folder to Add"
 msgstr "Select Folder to Add"
 
-#: arkwidget.cpp:1157
+#: arkwidget.cpp:1167
 msgid "Adding folder..."
 msgstr "Adding folder..."
 
-#: arkwidget.cpp:1249
+#: arkwidget.cpp:1261
 msgid "Do you really want to delete the selected items?"
 msgstr "Do you really want to delete the selected items?"
 
-#: arkwidget.cpp:1270
+#: arkwidget.cpp:1282
 msgid "Removing..."
 msgstr "Removing..."
 
-#: arkwidget.cpp:1317
+#: arkwidget.cpp:1329
 msgid "Open with:"
 msgstr "Open with:"
 
-#: arkwidget.cpp:1432
+#: arkwidget.cpp:1444
 msgid "The archive to extract from no longer exists."
 msgstr "The archive to extract from no longer exists."
 
-#: arkwidget.cpp:1514 arkwidget.cpp:1541 arkwidget.cpp:1575 mainwindow.cpp:399
+#: arkwidget.cpp:1526 arkwidget.cpp:1553 arkwidget.cpp:1587 mainwindow.cpp:399
 msgid "Extracting..."
 msgstr "Extracting..."
 
-#: arkwidget.cpp:1603
+#: arkwidget.cpp:1615
 msgid "Edit with:"
 msgstr "Edit with:"
 
-#: arkwidget.cpp:1614
+#: arkwidget.cpp:1626
 msgid "Trouble editing the file..."
 msgstr "Trouble editing the file..."
 
-#: arkwidget.cpp:1654
+#: arkwidget.cpp:1666
 msgid "Readding edited file..."
 msgstr "Readding edited file..."
 
-#: arkwidget.cpp:1673
+#: arkwidget.cpp:1685
 msgid "Extracting file to view"
 msgstr "Extracting file to view"
 
-#: arkwidget.cpp:1691
+#: arkwidget.cpp:1694
+#, fuzzy
+msgid "Testing..."
+msgstr "Removing..."
+
+#: arkwidget.cpp:1705
+msgid "Test successful."
+msgstr ""
+
+#: arkwidget.cpp:1722
 msgid ""
 "The internal viewer is not able to display this file. Would you like to view it "
 "using an external program?"
@@ -384,38 +420,38 @@ msgstr ""
 "The internal viewer is not able to display this file. Would you like to view it "
 "using an external program?"
 
-#: arkwidget.cpp:1692
+#: arkwidget.cpp:1723
 msgid "View Externally"
 msgstr "View Externally"
 
-#: arkwidget.cpp:1692
+#: arkwidget.cpp:1723
 msgid "Do Not View"
 msgstr "Do Not View"
 
-#: arkwidget.cpp:1812
+#: arkwidget.cpp:1843
 msgid "%1 files selected  %2"
 msgstr "%1 files selected  %2"
 
-#: arkwidget.cpp:1818
+#: arkwidget.cpp:1849
 #, c-format
 msgid "1 file selected  %2"
 msgstr "1 file selected  %2"
 
-#: arkwidget.cpp:1891
+#: arkwidget.cpp:1922
 msgid ""
 "Do you wish to add this to the current archive or open it as a new archive?"
 msgstr ""
 "Do you wish to add this to the current archive or open it as a new archive?"
 
-#: arkwidget.cpp:1893
+#: arkwidget.cpp:1924
 msgid "&Add"
 msgstr "&Add"
 
-#: arkwidget.cpp:1893
+#: arkwidget.cpp:1924
 msgid "&Open"
 msgstr "&Open"
 
-#: arkwidget.cpp:1948
+#: arkwidget.cpp:1979
 msgid ""
 "There is no archive currently open. Do you wish to create one now for these "
 "files?"
@@ -423,7 +459,7 @@ msgstr ""
 "There is no archive currently open. Do you wish to create one now for these "
 "files?"
 
-#: arkwidget.cpp:1949
+#: arkwidget.cpp:1980
 msgid ""
 "There is no archive currently open. Do you wish to create one now for this "
 "file?"
@@ -431,19 +467,19 @@ msgstr ""
 "There is no archive currently open. Do you wish to create one now for this "
 "file?"
 
-#: arkwidget.cpp:1950
+#: arkwidget.cpp:1981
 msgid "Create Archive"
 msgstr "Create Archive"
 
-#: arkwidget.cpp:1950 extractiondialog.cpp:149
+#: arkwidget.cpp:1981 extractiondialog.cpp:149
 msgid "Do Not Create"
 msgstr "Do Not Create"
 
-#: arkwidget.cpp:2033 arkwidget.cpp:2146
+#: arkwidget.cpp:2064 arkwidget.cpp:2178
 msgid "Unknown archive format or corrupted archive"
 msgstr "Unknown archive format or corrupted archive"
 
-#: arkwidget.cpp:2040 arkwidget.cpp:2152
+#: arkwidget.cpp:2071 arkwidget.cpp:2184
 msgid ""
 "The utility %1 is not in your PATH.\n"
 "Please install it or contact your system administrator."
@@ -451,15 +487,15 @@ msgstr ""
 "The utility %1 is not in your PATH.\n"
 "Please install it or contact your system administrator."
 
-#: arkwidget.cpp:2101
+#: arkwidget.cpp:2133
 msgid "An error occurred while trying to create the archive."
 msgstr "An error occurred while trying to create the archive."
 
-#: arkwidget.cpp:2165
+#: arkwidget.cpp:2197
 msgid "Opening the archive..."
 msgstr "Opening the archive..."
 
-#: arkwidget.cpp:2189
+#: arkwidget.cpp:2222
 msgid ""
 "This archive is read-only. If you want to save it under a new name, go to the "
 "File menu and select Save As."
@@ -467,34 +503,34 @@ msgstr ""
 "This archive is read-only. If you want to save it under a new name, go to the "
 "File menu and select Save As."
 
-#: arkwidget.cpp:2207
+#: arkwidget.cpp:2240
 #, c-format
 msgid "An error occurred while trying to open the archive %1"
 msgstr "An error occurred while trying to open the archive %1"
 
 #. i18n: file general.ui line 16
-#: arkwidget.cpp:2242 rc.cpp:60
+#: arkwidget.cpp:2275 rc.cpp:63
 #, no-c-format
 msgid "General"
 msgstr "General"
 
-#: arkwidget.cpp:2242
+#: arkwidget.cpp:2275
 msgid "General Settings"
 msgstr "General Settings"
 
-#: arkwidget.cpp:2243
+#: arkwidget.cpp:2276
 msgid "Addition"
 msgstr "Addition"
 
-#: arkwidget.cpp:2243
+#: arkwidget.cpp:2276
 msgid "File Addition Settings"
 msgstr "File Addition Settings"
 
-#: arkwidget.cpp:2244
+#: arkwidget.cpp:2277
 msgid "Extraction"
 msgstr "Extraction"
 
-#: arkwidget.cpp:2244
+#: arkwidget.cpp:2277
 msgid "Extraction Settings"
 msgstr "Extraction Settings"
 
@@ -608,8 +644,8 @@ msgstr "Replace &old files only with newer files"
 msgid "Keep entries &generic (Lha)"
 msgstr "Keep entries &generic (Lha)"
 
-#. i18n: file addition.ui line 32
-#: common_texts.cpp:27 rc.cpp:33
+#. i18n: file addition.ui line 41
+#: common_texts.cpp:27 rc.cpp:36
 #, no-c-format
 msgid "Force &MS-DOS short filenames (Zip)"
 msgstr "Force &MS-DOS short filenames (Zip)"
@@ -618,32 +654,32 @@ msgstr "Force &MS-DOS short filenames (Zip)"
 msgid "Translate LF to DOS &CRLF (Zip)"
 msgstr "Translate LF to DOS &CRLF (Zip)"
 
-#. i18n: file addition.ui line 56
-#: common_texts.cpp:29 rc.cpp:42
+#. i18n: file addition.ui line 65
+#: common_texts.cpp:29 rc.cpp:45
 #, no-c-format
 msgid "&Recursively add subfolders (Zip, Rar)"
 msgstr "&Recursively add subfolders (Zip, Rar)"
 
-#. i18n: file addition.ui line 48
-#: common_texts.cpp:30 rc.cpp:39
+#. i18n: file addition.ui line 57
+#: common_texts.cpp:30 rc.cpp:42
 #, no-c-format
 msgid "&Store symlinks as links (Zip, Rar)"
 msgstr "&Store symlinks as links (Zip, Rar)"
 
 #. i18n: file extraction.ui line 24
-#: common_texts.cpp:31 rc.cpp:45
+#: common_texts.cpp:31 rc.cpp:48
 #, no-c-format
 msgid "O&verwrite files (Zip, Tar, Zoo, Rar)"
 msgstr "O&verwrite files (Zip, Tar, Zoo, Rar)"
 
 #. i18n: file extraction.ui line 32
-#: common_texts.cpp:32 rc.cpp:48
+#: common_texts.cpp:32 rc.cpp:51
 #, no-c-format
 msgid "&Preserve permissions (Tar)"
 msgstr "&Preserve permissions (Tar)"
 
 #. i18n: file extraction.ui line 40
-#: common_texts.cpp:33 rc.cpp:51
+#: common_texts.cpp:33 rc.cpp:54
 #, no-c-format
 msgid "&Ignore folder names (Zip)"
 msgstr "&Ignore folder names (Zip)"
@@ -674,7 +710,7 @@ msgstr ""
 msgid "Simple Compressed Archive"
 msgstr "Simple Compressed Archive"
 
-#: compressedfile.cpp:328 tar.cpp:176 tar.cpp:192
+#: compressedfile.cpp:340 tar.cpp:176 tar.cpp:192
 msgid "Trouble writing to the archive..."
 msgstr "Trouble writing to the archive..."
 
@@ -707,8 +743,8 @@ msgstr "Extract all files"
 msgid "Destination folder: "
 msgstr "Destination folder: "
 
-#. i18n: file ark.kcfg line 82
-#: extractiondialog.cpp:122 rc.cpp:135
+#. i18n: file ark.kcfg line 87
+#: extractiondialog.cpp:122 rc.cpp:144
 #, no-c-format
 msgid "Open destination folder after extraction"
 msgstr "Open destination folder after extraction"
@@ -861,50 +897,56 @@ msgstr "Compressing..."
 msgid "Please Wait"
 msgstr "Please Wait"
 
-#. i18n: file ark_part.rc line 16
+#. i18n: file ark_part.rc line 18
 #: rc.cpp:9 rc.cpp:21
 #, no-c-format
 msgid "&Action"
 msgstr "&Action"
 
-#. i18n: file addition.ui line 24
+#. i18n: file addition.ui line 25
 #: rc.cpp:30
 #, no-c-format
+msgid "Ask for &password when create archive if possible"
+msgstr ""
+
+#. i18n: file addition.ui line 33
+#: rc.cpp:33
+#, no-c-format
 msgid "Replace old files only &with newer files"
 msgstr "Replace old files only &with newer files"
 
-#. i18n: file addition.ui line 40
-#: rc.cpp:36
+#. i18n: file addition.ui line 49
+#: rc.cpp:39
 #, no-c-format
 msgid "Translate &LF to DOS CRLF (Zip)"
 msgstr "Translate &LF to DOS CRLF (Zip)"
 
 #. i18n: file extraction.ui line 48
-#: rc.cpp:54
+#: rc.cpp:57
 #, no-c-format
 msgid "Convert file names to &lowercase (Zip, Rar)"
 msgstr "Convert file names to &lowercase (Zip, Rar)"
 
 #. i18n: file extraction.ui line 56
-#: rc.cpp:57
+#: rc.cpp:60
 #, no-c-format
 msgid "Convert file names to &uppercase (Rar)"
 msgstr "Convert file names to &uppercase (Rar)"
 
 #. i18n: file general.ui line 27
-#: rc.cpp:63
+#: rc.cpp:66
 #, no-c-format
 msgid "&Use integrated viewer"
 msgstr "&Use integrated viewer"
 
 #. i18n: file general.ui line 35
-#: rc.cpp:66
+#: rc.cpp:69
 #, no-c-format
 msgid "&Enable Konqueror integration"
 msgstr "&Enable Konqueror integration"
 
 #. i18n: file general.ui line 68
-#: rc.cpp:69
+#: rc.cpp:72
 #, no-c-format
 msgid ""
 "<font size=\"-1\"><i>Konqueror integration is only available if you install the "
@@ -914,19 +956,19 @@ msgstr ""
 "Konqueror integration plugin from the tdeaddons package.</i></font>"
 
 #. i18n: file ark.kcfg line 9
-#: rc.cpp:72
+#: rc.cpp:75
 #, no-c-format
 msgid "Last folders used for extraction"
 msgstr "Last folders used for extraction"
 
 #. i18n: file ark.kcfg line 12
-#: rc.cpp:75
+#: rc.cpp:78
 #, no-c-format
 msgid "Replace old files only with newer files"
 msgstr "Replace old files only with newer files"
 
 #. i18n: file ark.kcfg line 13
-#: rc.cpp:78
+#: rc.cpp:81
 #, no-c-format
 msgid ""
 "If this option is enabled and you add filenames that already exist in an "
@@ -936,13 +978,13 @@ msgstr ""
 "archive, only replace the old files if the added files are newer than them"
 
 #. i18n: file ark.kcfg line 17
-#: rc.cpp:81
+#: rc.cpp:84
 #, no-c-format
 msgid "Overwrite files (Zip, Tar, Zoo, Rar)"
 msgstr "Overwrite files (Zip, Tar, Zoo, Rar)"
 
 #. i18n: file ark.kcfg line 18
-#: rc.cpp:84
+#: rc.cpp:87
 #, no-c-format
 msgid ""
 "Overwrite any files that have matching names on disk with the one from the "
@@ -951,14 +993,20 @@ msgstr ""
 "Overwrite any files that have matching names on disk with the one from the "
 "archive"
 
-#. i18n: file ark.kcfg line 24
-#: rc.cpp:87
+#. i18n: file ark.kcfg line 22
+#: rc.cpp:90 rc.cpp:93
+#, no-c-format
+msgid "Ask for password when create archive if possible"
+msgstr ""
+
+#. i18n: file ark.kcfg line 29
+#: rc.cpp:96
 #, no-c-format
 msgid "Preserve permissions"
 msgstr "Preserve permissions"
 
-#. i18n: file ark.kcfg line 25
-#: rc.cpp:90
+#. i18n: file ark.kcfg line 30
+#: rc.cpp:99
 #, no-c-format
 msgid ""
 "Save the user, group, and permission settings on files. Use with care, as this "
@@ -969,32 +1017,32 @@ msgstr ""
 "may result in files being extracted that do not belong to any valid user on "
 "your computer"
 
-#. i18n: file ark.kcfg line 31
-#: rc.cpp:93
+#. i18n: file ark.kcfg line 36
+#: rc.cpp:102
 #, no-c-format
 msgid "Force MS-DOS short filenames (Zip)"
 msgstr "Force MS-DOS short filenames (Zip)"
 
-#. i18n: file ark.kcfg line 32
-#: rc.cpp:96
+#. i18n: file ark.kcfg line 37
+#: rc.cpp:105
 #, no-c-format
 msgid "Force names of files in Zip archives to the DOS 8.3 format"
 msgstr "Force names of files in Zip archives to the DOS 8.3 format"
 
-#. i18n: file ark.kcfg line 36
-#: rc.cpp:99
+#. i18n: file ark.kcfg line 41
+#: rc.cpp:108
 #, no-c-format
 msgid "Translate LF to DOS CRLF"
 msgstr "Translate LF to DOS CRLF"
 
-#. i18n: file ark.kcfg line 40
-#: rc.cpp:102
+#. i18n: file ark.kcfg line 45
+#: rc.cpp:111
 #, no-c-format
 msgid "Ignore folder names (Zip)"
 msgstr "Ignore folder names (Zip)"
 
-#. i18n: file ark.kcfg line 41
-#: rc.cpp:105
+#. i18n: file ark.kcfg line 46
+#: rc.cpp:114
 #, no-c-format
 msgid ""
 "Extract all the files into the extraction folder, ignoring any folder structure "
@@ -1003,44 +1051,44 @@ msgstr ""
 "Extract all the files into the extraction folder, ignoring any folder structure "
 "in the archive."
 
-#. i18n: file ark.kcfg line 47
-#: rc.cpp:108
+#. i18n: file ark.kcfg line 52
+#: rc.cpp:117
 #, no-c-format
 msgid "Store symlinks as links (Zip, Rar)"
 msgstr "Store symlinks as links (Zip, Rar)"
 
-#. i18n: file ark.kcfg line 51
-#: rc.cpp:111
+#. i18n: file ark.kcfg line 56
+#: rc.cpp:120
 #, no-c-format
 msgid "Recursively add subfolders (Zip, Rar)"
 msgstr "Recursively add subfolders (Zip, Rar)"
 
-#. i18n: file ark.kcfg line 55
-#: rc.cpp:114
+#. i18n: file ark.kcfg line 60
+#: rc.cpp:123
 #, no-c-format
 msgid "Convert filenames to lowercase (Zip, Rar)"
 msgstr "Convert filenames to lowercase (Zip, Rar)"
 
-#. i18n: file ark.kcfg line 59
-#: rc.cpp:117
+#. i18n: file ark.kcfg line 64
+#: rc.cpp:126
 #, no-c-format
 msgid "Convert filenames to uppercase"
 msgstr "Convert filenames to uppercase"
 
-#. i18n: file ark.kcfg line 65
-#: rc.cpp:120
+#. i18n: file ark.kcfg line 70
+#: rc.cpp:129
 #, no-c-format
 msgid "Show search bar"
 msgstr "Show search bar"
 
-#. i18n: file ark.kcfg line 69
-#: rc.cpp:123
+#. i18n: file ark.kcfg line 74
+#: rc.cpp:132
 #, no-c-format
 msgid "Enable Konqueror integration"
 msgstr "Enable Konqueror integration"
 
-#. i18n: file ark.kcfg line 70
-#: rc.cpp:126
+#. i18n: file ark.kcfg line 75
+#: rc.cpp:135
 #, no-c-format
 msgid ""
 "Enables integration with Konqueror's context menus, letting you easily archive "
@@ -1051,20 +1099,20 @@ msgstr ""
 "or unarchive files. This option will only work if you have the tdeaddons "
 "package installed."
 
-#. i18n: file ark.kcfg line 74
-#: rc.cpp:129
+#. i18n: file ark.kcfg line 79
+#: rc.cpp:138
 #, no-c-format
 msgid "Use integrated viewer"
 msgstr "Use integrated viewer"
 
-#. i18n: file ark.kcfg line 78
-#: rc.cpp:132
+#. i18n: file ark.kcfg line 83
+#: rc.cpp:141
 #, no-c-format
 msgid "Tar Command"
 msgstr "Tar Command"
 
-#. i18n: file ark.kcfg line 86
-#: rc.cpp:138
+#. i18n: file ark.kcfg line 91
+#: rc.cpp:147
 #, no-c-format
 msgid "Enable experimental support for loading ACE files"
 msgstr "Enable experimental support for loading ACE files"
@@ -1081,11 +1129,11 @@ msgstr ""
 "Reset Search\n"
 "Resets the search bar, so that all archive entries are shown again."
 
-#: tar.cpp:405
+#: tar.cpp:420
 msgid "Unable to fork a decompressor"
 msgstr "Unable to fork a decompressor"
 
-#: tar.cpp:432
+#: tar.cpp:447
 msgid "Trouble writing to the tempfile..."
 msgstr "Trouble writing to the tempfile..."
 
diff --git a/tde-i18n-en_GB/messages/tdeutils/irkick.po b/tde-i18n-en_GB/messages/tdeutils/irkick.po
index 2aeae8ecf13..458d79ec24b 100644
--- a/tde-i18n-en_GB/messages/tdeutils/irkick.po
+++ b/tde-i18n-en_GB/messages/tdeutils/irkick.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: irkick\n"
-"POT-Creation-Date: 2005-07-24 01:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:13+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcalc.po b/tde-i18n-en_GB/messages/tdeutils/kcalc.po
index 328d748711c..4f42e498bbc 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcalc.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcalc.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcalc\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2006-12-08 13:58+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -367,51 +368,52 @@ msgstr "Clear data store"
 msgid "&Constants"
 msgstr "&Constants"
 
-#: kcalc.cpp:1768
+#: kcalc.cpp:1767
 msgid "Last stat item erased"
 msgstr "Last stat item erased"
 
-#: kcalc.cpp:1779
+#: kcalc.cpp:1778
 msgid "Stat mem cleared"
 msgstr "Stat mem cleared"
 
 #. i18n: file general.ui line 16
-#: kcalc.cpp:1825 rc.cpp:78
+#: kcalc.cpp:1824 rc.cpp:78
 #, no-c-format
 msgid "General"
 msgstr "General"
 
-#: kcalc.cpp:1825
+#: kcalc.cpp:1824
 msgid "General Settings"
 msgstr "General Settings"
 
-#: kcalc.cpp:1833
+#: kcalc.cpp:1832
 msgid "Select Display Font"
 msgstr "Select Display Font"
 
-#: kcalc.cpp:1839
+#: kcalc.cpp:1838
 msgid "Colors"
 msgstr "Colours"
 
-#: kcalc.cpp:1839
+#: kcalc.cpp:1838
 msgid "Button & Display Colors"
 msgstr "Button & Display Colours"
 
 #. i18n: file constants.ui line 16
-#: kcalc.cpp:1876 rc.cpp:36
+#: kcalc.cpp:1875 rc.cpp:36
 #, no-c-format
 msgid "Constants"
 msgstr "Constants"
 
-#: kcalc.cpp:2273
+#: kcalc.cpp:2272
 msgid "KCalc"
 msgstr "KCalc"
 
-#: kcalc.cpp:2275
+#: kcalc.cpp:2274
+#, fuzzy
 msgid ""
 "(c) 2003-2005, Klaus Niederkrüger\n"
 "(c) 1996-2000, Bernd Johannes Wuebben\n"
-"(c) 2000-2005, The TDE Team"
+"(c) 2000-2005, The KDE Team"
 msgstr ""
 "(c) 2003-2005, Klaus Niederkrüger\n"
 "(c) 1996-2000, Bernd Johannes Wuebben\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcharselect.po b/tde-i18n-en_GB/messages/tdeutils/kcharselect.po
index 4e6f210f587..867a74af477 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcharselect.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcharselect.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcharselect\n"
-"POT-Creation-Date: 2004-12-21 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-01-19 16:32+0000\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcharselectapplet.po b/tde-i18n-en_GB/messages/tdeutils/kcharselectapplet.po
index d7226887b1f..e52ba51a4d3 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcharselectapplet.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcharselectapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2001-07-13 22:53GMT\n"
 "Last-Translator: John Knight <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcmkvaio.po b/tde-i18n-en_GB/messages/tdeutils/kcmkvaio.po
index 1e766f4166b..61de4133f94 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcmkvaio.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcmkvaio.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkvaio\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-06-08 15:08+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po b/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po
index 3132311747a..c3f0f331520 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlaptop\n"
-"POT-Creation-Date: 2006-10-14 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2006-12-08 13:58+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -654,26 +655,7 @@ msgstr "Setup Helper Application"
 msgid "This button can be used to enable the ACPI helper application"
 msgstr "This button can be used to enable the ACPI helper application"
 
-#: acpi.cpp:169 apm.cpp:191
-msgid ""
-"The %1 application does not seem to have the same size or checksum as when it "
-"was compiled we do NOT recommend you proceed with making it setuid-root without "
-"further investigation"
-msgstr ""
-"The %1 application does not seem to have the same size or checksum as when it "
-"was compiled we do NOT recommend you proceed with making it setuid-root without "
-"further investigation"
-
-#: acpi.cpp:172 acpi.cpp:182 acpi.cpp:194 apm.cpp:174 apm.cpp:194 apm.cpp:204
-#: apm.cpp:216 sony.cpp:115 sony.cpp:127
-msgid "KLaptopDaemon"
-msgstr "KLaptopDaemon"
-
 #: acpi.cpp:172 apm.cpp:194
-msgid "Run Nevertheless"
-msgstr "Run Nevertheless"
-
-#: acpi.cpp:180 apm.cpp:202
 msgid ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
@@ -681,7 +663,12 @@ msgstr ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
 
-#: acpi.cpp:193
+#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
+#: sony.cpp:127
+msgid "KLaptopDaemon"
+msgstr "KLaptopDaemon"
+
+#: acpi.cpp:185
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please make "
 "sure that it is installed correctly."
@@ -689,7 +676,7 @@ msgstr ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please make "
 "sure that it is installed correctly."
 
-#: acpi.cpp:276
+#: acpi.cpp:268
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr ""
@@ -1023,7 +1010,7 @@ msgstr ""
 "%1 cannot be enabled because tdesu cannot be found.  Please make sure that it "
 "is installed correctly."
 
-#: apm.cpp:215
+#: apm.cpp:207
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be found.  "
 "Please make sure that it is installed correctly."
@@ -1031,7 +1018,7 @@ msgstr ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be found.  "
 "Please make sure that it is installed correctly."
 
-#: apm.cpp:279
+#: apm.cpp:271
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr ""
@@ -1048,3 +1035,9 @@ msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "[email protected]"
+
+#~ msgid "The %1 application does not seem to have the same size or checksum as when it was compiled we do NOT recommend you proceed with making it setuid-root without further investigation"
+#~ msgstr "The %1 application does not seem to have the same size or checksum as when it was compiled we do NOT recommend you proceed with making it setuid-root without further investigation"
+
+#~ msgid "Run Nevertheless"
+#~ msgstr "Run Nevertheless"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcmlirc.po b/tde-i18n-en_GB/messages/tdeutils/kcmlirc.po
index 68e921bdc7c..52f95a177e5 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcmlirc.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcmlirc.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlirc\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:16+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -125,77 +126,77 @@ msgstr "Automatically Start?"
 msgid "Start Automatically"
 msgstr "Start Automatically"
 
-#: kcmlirc.cpp:335
+#: kcmlirc.cpp:336
 msgid "Are you sure you want to remove %1 and all its actions?"
 msgstr "Are you sure you want to remove %1 and all its actions?"
 
-#: kcmlirc.cpp:335
+#: kcmlirc.cpp:336
 msgid "Erase Actions?"
 msgstr "Erase Actions?"
 
-#: kcmlirc.cpp:357
+#: kcmlirc.cpp:358
 msgid ""
 "You may only drag the selected items onto a mode of the same remote control"
 msgstr ""
 "You may only drag the selected items onto a mode of the same remote control"
 
-#: kcmlirc.cpp:357
+#: kcmlirc.cpp:358
 msgid "You May Not Drag Here"
 msgstr "You May Not Drag Here"
 
-#: kcmlirc.cpp:379
+#: kcmlirc.cpp:380
 msgid "Actions <i>always</i> available"
 msgstr "Actions <i>always</i> available"
 
-#: kcmlirc.cpp:379
+#: kcmlirc.cpp:380
 msgid "Actions available only in mode <b>%1</b>"
 msgstr "Actions available only in mode <b>%1</b>"
 
 #. i18n: file addactionbase.ui line 94
-#: kcmlirc.cpp:440 kcmlirc.cpp:470 kcmlirc.cpp:475 rc.cpp:12
+#: kcmlirc.cpp:441 kcmlirc.cpp:471 kcmlirc.cpp:476 rc.cpp:12
 #, no-c-format
 msgid "Applications"
 msgstr "Applications"
 
 #. i18n: file newmode.ui line 25
-#: kcmlirc.cpp:449 kcmlirc.cpp:472 kcmlirc.cpp:485 rc.cpp:336
+#: kcmlirc.cpp:450 kcmlirc.cpp:473 kcmlirc.cpp:486 rc.cpp:336
 #, no-c-format
 msgid "Remote Controls"
 msgstr "Remote Controls"
 
-#: kcmlirc.cpp:469 kcmlirc.cpp:483 kcmlirc.cpp:493
+#: kcmlirc.cpp:470 kcmlirc.cpp:484 kcmlirc.cpp:494
 msgid "Information on <b>%1</b>:"
 msgstr "Information on <b>%1</b>:"
 
-#: kcmlirc.cpp:471
+#: kcmlirc.cpp:472
 msgid "Number of Applications"
 msgstr "Number of Applications"
 
-#: kcmlirc.cpp:473
+#: kcmlirc.cpp:474
 msgid "Number of Remote Controls"
 msgstr "Number of Remote Controls"
 
-#: kcmlirc.cpp:479 kcmlirc.cpp:489
+#: kcmlirc.cpp:480 kcmlirc.cpp:490
 msgid "Extension Name"
 msgstr "Extension Name"
 
-#: kcmlirc.cpp:480 kcmlirc.cpp:490
+#: kcmlirc.cpp:481 kcmlirc.cpp:491
 msgid "Extension Author"
 msgstr "Extension Author"
 
-#: kcmlirc.cpp:481
+#: kcmlirc.cpp:482
 msgid "Application Identifier"
 msgstr "Application Identifier"
 
-#: kcmlirc.cpp:482
+#: kcmlirc.cpp:483
 msgid "Number of Actions"
 msgstr "Number of Actions"
 
-#: kcmlirc.cpp:491
+#: kcmlirc.cpp:492
 msgid "Remote Control Identifier"
 msgstr "Remote Control Identifier"
 
-#: kcmlirc.cpp:492
+#: kcmlirc.cpp:493
 msgid "Number of Buttons"
 msgstr "Number of Buttons"
 
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcmtdewallet.po b/tde-i18n-en_GB/messages/tdeutils/kcmtdewallet.po
index 7fa99d4296c..e5cd4ff92d5 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcmtdewallet.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcmtdewallet.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtdewallet\n"
-"POT-Creation-Date: 2006-08-23 02:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-11-26 17:35+0000\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,8 +57,9 @@ msgid "Always Deny"
 msgstr "Always Deny"
 
 #: konfigurator.cpp:299
+#, fuzzy
 msgid ""
-"This configuration module allows you to configure the TDE wallet system."
+"This configuration module allows you to configure the KDE wallet system."
 msgstr ""
 "This configuration module allows you to configure the TDE wallet system."
 
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcmthinkpad.po b/tde-i18n-en_GB/messages/tdeutils/kcmthinkpad.po
index 04d9b7570f5..0d3382b4b8f 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcmthinkpad.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcmthinkpad.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmthinkpad\n"
-"POT-Creation-Date: 2005-09-30 02:48+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-06-15 13:46+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kdf.po b/tde-i18n-en_GB/messages/tdeutils/kdf.po
index 814c41f8c20..52f59229e87 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kdf.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kdf.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdf\n"
-"POT-Creation-Date: 2004-12-29 14:54+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-10-11 12:36+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: disklist.cpp:267
+#: disklist.cpp:268
 #, c-format
 msgid "could not execute [%s]"
 msgstr "could not execute [%s]"
@@ -57,10 +58,6 @@ msgstr ""
 "your computer hardware or your operating system. Not all modules are available "
 "on all hardware architectures and/or operating systems."
 
-#: tdeconftest.cpp:44
-msgid "A test application"
-msgstr "A test application"
-
 #: kdf.cpp:33
 msgid "TDE free disk space utility"
 msgstr "TDE free disk space utility"
@@ -239,3 +236,7 @@ msgstr "General Settings"
 #: optiondialog.cpp:38
 msgid "Mount Commands"
 msgstr "Mount Commands"
+
+#: tdeconftest.cpp:44
+msgid "A test application"
+msgstr "A test application"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kedit.po b/tde-i18n-en_GB/messages/tdeutils/kedit.po
index 36ec82e9ddc..25ec4005aef 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kedit.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kedit.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kedit\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-01 14:43+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kfloppy.po b/tde-i18n-en_GB/messages/tdeutils/kfloppy.po
index e8dcb3e989e..3864f50aad3 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kfloppy.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kfloppy.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfloppy\n"
-"POT-Creation-Date: 2007-06-02 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-06-08 12:09+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,8 @@ msgid "Add BSD support"
 msgstr "Add BSD support"
 
 #: main.cpp:57
-msgid "Make KFloppy work again for TDE 3.4"
+#, fuzzy
+msgid "Make KFloppy work again for KDE 3.4"
 msgstr "Make KFloppy work again for TDE 3.4"
 
 #: format.cpp:269
diff --git a/tde-i18n-en_GB/messages/tdeutils/kgpg.po b/tde-i18n-en_GB/messages/tdeutils/kgpg.po
index 8c21860c98e..fa9725b13e4 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kgpg.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kgpg.po
@@ -6,15 +6,197 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgpg\n"
-"POT-Creation-Date: 2008-07-11 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-12-30 13:42+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#: kgpgeditor.cpp:143
+msgid "&Encrypt File..."
+msgstr "&Encrypt File..."
+
+#: kgpgeditor.cpp:144
+msgid "&Decrypt File..."
+msgstr "&Decrypt File..."
+
+#: kgpg.cpp:787 kgpgeditor.cpp:145
+msgid "&Open Key Manager"
+msgstr "&Open Key Manager"
+
+#: kgpgeditor.cpp:149
+msgid "&Generate Signature..."
+msgstr "&Generate Signature..."
+
+#: kgpgeditor.cpp:150
+msgid "&Verify Signature..."
+msgstr "&Verify Signature..."
+
+#: kgpgeditor.cpp:151
+msgid "&Check MD5 Sum..."
+msgstr "&Check MD5 Sum..."
+
+#: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
+#: kgpgeditor.cpp:513
+msgid "*|All Files"
+msgstr "*|All Files"
+
+#: kgpgeditor.cpp:220
+msgid "Open File to Encode"
+msgstr "Open File to Encode"
+
+#: kgpgeditor.cpp:230
+msgid "Open File to Decode"
+msgstr "Open File to Decode"
+
+#: kgpgeditor.cpp:244
+msgid "Decrypt File To"
+msgstr "Decrypt File To"
+
+#: kgpgeditor.cpp:250 listkeys.cpp:1519
+msgid "Save File"
+msgstr "Save File"
+
+#. i18n: file conf_misc.ui line 198
+#: kgpgeditor.cpp:252 rc.cpp:203
+#, no-c-format
+msgid "Editor"
+msgstr "Editor"
+
+#: kgpg.cpp:197 kgpg.cpp:409 kgpgeditor.cpp:268 kgpglibrary.cpp:95
+msgid "File Already Exists"
+msgstr "File Already Exists"
+
+#: kgpgeditor.cpp:317
+msgid ""
+"The document could not been saved, as the selected encoding cannot encode every "
+"unicode character in it."
+msgstr ""
+"The document could not been saved, as the selected encoding cannot encode every "
+"unicode character in it."
+
+#: kgpgeditor.cpp:325 kgpgeditor.cpp:352
+msgid ""
+"The document could not be saved, please check your permissions and disk space."
+msgstr ""
+"The document could not be saved, please check your permissions and disk space."
+
+#: kgpgeditor.cpp:379 kgpgeditor.cpp:388
+msgid "Overwrite existing file %1?"
+msgstr "Overwrite existing file %1?"
+
+#: kgpgeditor.cpp:380 kgpgeditor.cpp:389
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: kgpgeditor.cpp:467 kgpgeditor.cpp:513
+msgid "Open File to Verify"
+msgstr "Open File to Verify"
+
+#: kgpgeditor.cpp:481
+msgid "Open File to Sign"
+msgstr "Open File to Sign"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Malcolm Hunter"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: tips.txt:3
+msgid ""
+"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
+"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
+"<p>Drag a public key into the editor window and kgpg will automatically import "
+"it if you want.</p>\n"
+msgstr ""
+"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
+"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
+"<p>Drag a public key into the editor window and kgpg will automatically import "
+"it if you want.</p>\n"
+
+#: tips.txt:9
+msgid ""
+"<p>The easiest way to encrypt a file: simply right click on the file, and you "
+"have an encrypt option in the contextual menu.\n"
+"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+msgstr ""
+"<p>The easiest way to encrypt a file: simply right click on the file, and you "
+"have an encrypt option in the contextual menu.\n"
+"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+
+#: tips.txt:15
+msgid ""
+"<p>If you want to encrypt a message for several persons, just select several "
+"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+msgstr ""
+"<p>If you want to encrypt a message for several persons, just select several "
+"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+
+#: tips.txt:20
+msgid ""
+"<p><strong>You don't know anything about encryption?</strong>"
+"<br>\n"
+"No problem, simply create yourself a key pair in the key management window. "
+"Then, export your public key & mail it to your friends."
+"<br>\n"
+"Ask them to do the same & import their public keys. Finally, to send an "
+"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
+"your friend key and click \"encrypt\" again. The message will be encrypted, "
+"ready to be sent by email.</p>\n"
+msgstr ""
+"<p><strong>You don't know anything about encryption?</strong>"
+"<br>\n"
+"No problem, simply create yourself a key pair in the key management window. "
+"Then, export your public key & mail it to your friends."
+"<br>\n"
+"Ask them to do the same & import their public keys. Finally, to send an "
+"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
+"your friend key and click \"encrypt\" again. The message will be encrypted, "
+"ready to be sent by email.</p>\n"
+
+#: tips.txt:28
+msgid ""
+"<p>To perform an operation on a key, open the key management window & right "
+"click on the key. A popup menu with all available options will appear.</p>\n"
+msgstr ""
+"<p>To perform an operation on a key, open the key management window & right "
+"click on the key. A popup menu with all available options will appear.</p>\n"
+
+#: tips.txt:33
+msgid ""
+"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
+"for password & that's all!</p>\n"
+msgstr ""
+"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
+"for password & that's all!</p>\n"
+
+#: tips.txt:38
+msgid ""
+"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
+"line prompt.</p>\n"
+msgstr ""
+"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
+"line prompt.</p>\n"
+
+#: tips.txt:43
+msgid ""
+"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
+"Kgpg's editor.</p>\n"
+msgstr ""
+"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
+"Kgpg's editor.</p>\n"
+
 #: kgpg.cpp:83
 msgid "&Decrypt && Save File"
 msgstr "&Decrypt && Save File"
@@ -69,10 +251,6 @@ msgstr "Gzip"
 msgid "Bzip2"
 msgstr "Bzip2"
 
-#: kgpg.cpp:197 kgpg.cpp:409 kgpgeditor.cpp:268 kgpglibrary.cpp:95
-msgid "File Already Exists"
-msgstr "File Already Exists"
-
 #: kgpg.cpp:209
 msgid "Processing folder compression and encryption"
 msgstr "Processing folder compression and encryption"
@@ -203,10 +381,6 @@ msgstr "&Sign/Verify Clipboard"
 msgid "&Open Editor"
 msgstr "&Open Editor"
 
-#: kgpg.cpp:787 kgpgeditor.cpp:145
-msgid "&Open Key Manager"
-msgstr "&Open Key Manager"
-
 #: kgpg.cpp:789 listkeys.cpp:575
 msgid "&Key Server Dialog"
 msgstr "&Key Server Dialogue"
@@ -255,6 +429,300 @@ msgstr "Cannot verify folder."
 msgid "Encrypted following text:"
 msgstr "Encrypted following text:"
 
+#: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
+#: kgpgoptions.cpp:584 kgpgoptions.cpp:590
+msgid "(Default)"
+msgstr "(Default)"
+
+#. i18n: file conf_encryption.ui line 17
+#: kgpgoptions.cpp:101 rc.cpp:41
+#, no-c-format
+msgid "Encryption"
+msgstr "Encryption"
+
+#: kgpgoptions.cpp:102
+msgid "Decryption"
+msgstr "Decryption"
+
+#: kgpgoptions.cpp:104
+msgid "GnuPG Settings"
+msgstr "GnuPG Settings"
+
+#: kgpgoptions.cpp:105
+msgid "Key Servers"
+msgstr "Key Servers"
+
+#: kgpgoptions.cpp:106
+msgid "Misc"
+msgstr "Misc"
+
+#: kgpgoptions.cpp:188
+msgid "New GnuPG Home Location"
+msgstr "New GnuPG Home Location"
+
+#: kgpgoptions.cpp:196
+msgid ""
+"No configuration file was found in the selected location.\n"
+"Do you want to create it now ?\n"
+"\n"
+"Without configuration file, neither KGpg nor Gnupg will work properly."
+msgstr ""
+"No configuration file was found in the selected location.\n"
+"Do you want to create it now ?\n"
+"\n"
+"Without configuration file, neither KGpg nor Gnupg will work properly."
+
+#: kgpgoptions.cpp:196
+msgid "No Configuration File Found"
+msgstr "No Configuration File Found"
+
+#: kgpgoptions.cpp:196
+msgid "Create"
+msgstr "Create"
+
+#: kgpgoptions.cpp:196
+msgid "Ignore"
+msgstr "Ignore"
+
+#: kgpgoptions.cpp:204
+msgid ""
+"Cannot create configuration file. Please check if destination media is mounted "
+"and if you have write access"
+msgstr ""
+"Cannot create configuration file. Please check if destination media is mounted "
+"and if you have write access"
+
+#: kgpgoptions.cpp:456
+msgid "Sign File"
+msgstr "Sign File"
+
+#: kgpgoptions.cpp:473
+msgid "Decrypt File"
+msgstr "Decrypt File"
+
+#: kgpgoptions.cpp:572
+msgid "Add New Key Server"
+msgstr "Add New Key Server"
+
+#: kgpgoptions.cpp:572
+msgid "Server URL:"
+msgstr "Server URL:"
+
+#: keyservers.cpp:55
+msgid "Key Server"
+msgstr "Key Server"
+
+#: keyservers.cpp:163 keyservers.cpp:409
+msgid "You must enter a search string."
+msgstr "You must enter a search string."
+
+#: keyservers.cpp:169 listkeys.cpp:544
+msgid "Import Key From Keyserver"
+msgstr "Import Key From Keyserver"
+
+#. i18n: file keyserver.ui line 97
+#: keyservers.cpp:171 rc.cpp:446
+#, no-c-format
+msgid "&Import"
+msgstr "&Import"
+
+#: keyservers.cpp:178
+msgid "Connecting to the server..."
+msgstr "Connecting to the server..."
+
+#: keyservers.cpp:233
+msgid "You must choose a key."
+msgstr "You must choose a key."
+
+#: keyservers.cpp:265
+msgid "Found %1 matching keys"
+msgstr "Found %1 matching keys"
+
+#: keyservers.cpp:374 keyservers.cpp:442
+msgid "<b>Connecting to the server...</b>"
+msgstr "<b>Connecting to the server...</b>"
+
+#: keyservers.cpp:375 keyservers.cpp:443
+msgid "&Abort"
+msgstr "&Abort"
+
+#: keyservers.cpp:496 kgpginterface.cpp:1408
+#, c-format
+msgid ""
+"_n: <qt>%n key processed."
+"<br></qt>\n"
+"<qt>%n keys processed."
+"<br></qt>"
+msgstr ""
+"<qt>%n key processed."
+"<br></qt>\n"
+"<qt>%n keys processed."
+"<br></qt>"
+
+#: keyservers.cpp:498 kgpginterface.cpp:1410
+#, c-format
+msgid ""
+"_n: <qt>One key unchanged."
+"<br></qt>\n"
+"<qt>%n keys unchanged."
+"<br></qt>"
+msgstr ""
+"<qt>One key unchanged."
+"<br></qt>\n"
+"<qt>%n keys unchanged."
+"<br></qt>"
+
+#: keyservers.cpp:500 kgpginterface.cpp:1412
+#, c-format
+msgid ""
+"_n: <qt>One signature imported."
+"<br></qt>\n"
+"<qt>%n signatures imported."
+"<br></qt>"
+msgstr ""
+"<qt>One signature imported."
+"<br></qt>\n"
+"<qt>%n signatures imported."
+"<br></qt>"
+
+#: keyservers.cpp:502 kgpginterface.cpp:1414
+#, c-format
+msgid ""
+"_n: <qt>One key without ID."
+"<br></qt>\n"
+"<qt>%n keys without ID."
+"<br></qt>"
+msgstr ""
+"<qt>One key without ID."
+"<br></qt>\n"
+"<qt>%n keys without ID."
+"<br></qt>"
+
+#: keyservers.cpp:504 kgpginterface.cpp:1416
+#, c-format
+msgid ""
+"_n: <qt>One RSA key imported."
+"<br></qt>\n"
+"<qt>%n RSA keys imported."
+"<br></qt>"
+msgstr ""
+"<qt>One RSA key imported."
+"<br></qt>\n"
+"<qt>%n RSA keys imported."
+"<br></qt>"
+
+#: keyservers.cpp:506 kgpginterface.cpp:1418
+#, c-format
+msgid ""
+"_n: <qt>One user ID imported."
+"<br></qt>\n"
+"<qt>%n user IDs imported."
+"<br></qt>"
+msgstr ""
+"<qt>One user ID imported."
+"<br></qt>\n"
+"<qt>%n user IDs imported."
+"<br></qt>"
+
+#: keyservers.cpp:508 kgpginterface.cpp:1420
+#, c-format
+msgid ""
+"_n: <qt>One subkey imported."
+"<br></qt>\n"
+"<qt>%n subkeys imported."
+"<br></qt>"
+msgstr ""
+"<qt>One subkey imported."
+"<br></qt>\n"
+"<qt>%n subkeys imported."
+"<br></qt>"
+
+#: keyservers.cpp:510 kgpginterface.cpp:1422
+#, c-format
+msgid ""
+"_n: <qt>One revocation certificate imported."
+"<br></qt>\n"
+"<qt>%n revocation certificates imported."
+"<br></qt>"
+msgstr ""
+"<qt>One revocation certificate imported."
+"<br></qt>\n"
+"<qt>%n revocation certificates imported."
+"<br></qt>"
+
+#: keyservers.cpp:512 kgpginterface.cpp:1425
+#, c-format
+msgid ""
+"_n: <qt>One secret key processed."
+"<br></qt>\n"
+"<qt>%n secret keys processed."
+"<br></qt>"
+msgstr ""
+"<qt>One secret key processed."
+"<br></qt>\n"
+"<qt>%n secret keys processed."
+"<br></qt>"
+
+#: keyservers.cpp:514 kgpginterface.cpp:1429
+#, c-format
+msgid ""
+"_n: <qt><b>One secret key imported.</b>"
+"<br></qt>\n"
+"<qt><b>%n secret keys imported.</b>"
+"<br></qt>"
+msgstr ""
+"<qt><b>One secret key imported.</b>"
+"<br></qt>\n"
+"<qt><b>%n secret keys imported.</b>"
+"<br></qt>"
+
+#: keyservers.cpp:516 kgpginterface.cpp:1431
+#, c-format
+msgid ""
+"_n: <qt>One secret key unchanged."
+"<br></qt>\n"
+"<qt>%n secret keys unchanged."
+"<br></qt>"
+msgstr ""
+"<qt>One secret key unchanged."
+"<br></qt>\n"
+"<qt>%n secret keys unchanged."
+"<br></qt>"
+
+#: keyservers.cpp:518 kgpginterface.cpp:1433
+#, c-format
+msgid ""
+"_n: <qt>One secret key not imported."
+"<br></qt>\n"
+"<qt>%n secret keys not imported."
+"<br></qt>"
+msgstr ""
+"<qt>One secret key not imported."
+"<br></qt>\n"
+"<qt>%n secret keys not imported."
+"<br></qt>"
+
+#: keyservers.cpp:520 kgpginterface.cpp:1435
+#, c-format
+msgid ""
+"_n: <qt><b>One key imported:</b>"
+"<br></qt>\n"
+"<qt><b>%n keys imported:</b>"
+"<br></qt>"
+msgstr ""
+"<qt><b>One key imported:</b>"
+"<br></qt>\n"
+"<qt><b>%n keys imported:</b>"
+"<br></qt>"
+
+#: keyservers.cpp:522 kgpginterface.cpp:1441
+msgid ""
+"No key imported... \n"
+"Check detailed log for more infos"
+msgstr ""
+"No key imported... \n"
+"Check detailed log for more infos"
+
 #: listkeys.cpp:217
 msgid "Private Key List"
 msgstr "Private Key List"
@@ -343,10 +811,6 @@ msgstr "&Import Key..."
 msgid "Set as De&fault Key"
 msgstr "Set as De&fault Key"
 
-#: keyservers.cpp:169 listkeys.cpp:544
-msgid "Import Key From Keyserver"
-msgstr "Import Key From Keyserver"
-
 #: listkeys.cpp:545
 msgid "Import &Missing Signatures From Keyserver"
 msgstr "Import &Missing Signatures From Keyserver"
@@ -646,10 +1110,6 @@ msgstr ""
 msgid "Public Key Export"
 msgstr "Public Key Export"
 
-#: kgpgeditor.cpp:250 listkeys.cpp:1519
-msgid "Save File"
-msgstr "Save File"
-
 #: listkeys.cpp:1556
 msgid ""
 "Your public key \"%1\" was successfully exported\n"
@@ -1009,141 +1469,111 @@ msgstr "Ultimate"
 msgid "?"
 msgstr "?"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Malcolm Hunter"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
+#: detailedconsole.cpp:43
+msgid "Details"
+msgstr "Details"
 
-#: main.cpp:30
-msgid ""
-"Kgpg - simple gui for gpg\n"
-"\n"
-"Kgpg was designed to make gpg very easy to use.\n"
-"I tried to make it as secure as possible.\n"
-"Hope you enjoy it."
-msgstr ""
-"Kgpg - simple gui for gpg\n"
-"\n"
-"Kgpg was designed to make gpg very easy to use.\n"
-"I tried to make it as secure as possible.\n"
-"Hope you enjoy it."
+#: detailedconsole.cpp:55
+msgid "Info"
+msgstr "Info"
 
-#: main.cpp:36
-msgid "Encrypt file"
-msgstr "Encrypt file"
+#: keygener.cpp:37
+msgid "Key Generation"
+msgstr "Key Generation"
 
-#: main.cpp:37
-msgid "Open key manager"
-msgstr "Open key manager"
+#: keygener.cpp:40
+msgid "Expert Mode"
+msgstr "Expert Mode"
 
-#: main.cpp:38
-msgid "Show encrypted file"
-msgstr "Show encrypted file"
+#: keygener.cpp:45
+msgid "Generate Key Pair"
+msgstr "Generate Key Pair"
 
-#: main.cpp:39
-msgid "Sign file"
-msgstr "Sign file"
+#. i18n: file keyproperties.ui line 297
+#: keygener.cpp:47 rc.cpp:401 rc.cpp:582
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
 
-#: main.cpp:40
-msgid "Verify signature"
-msgstr "Verify signature"
+#. i18n: file adduid.ui line 50
+#: keygener.cpp:50 rc.cpp:27 rc.cpp:386 rc.cpp:585
+#, no-c-format
+msgid "Email:"
+msgstr "Email:"
 
-#: main.cpp:41
-msgid "Shred file"
-msgstr "Shred file"
+#. i18n: file adduid.ui line 58
+#: keygener.cpp:53 rc.cpp:30
+#, no-c-format
+msgid "Comment (optional):"
+msgstr "Comment (optional):"
 
-#: main.cpp:42
-msgid "File to open"
-msgstr "File to open"
+#: keygener.cpp:62
+msgid "Never"
+msgstr "Never"
 
-#: main.cpp:50
-msgid "KGpg"
-msgstr "KGpg"
+#: keygener.cpp:63
+msgid "Days"
+msgstr "Days"
 
-#: kgpgview.cpp:97
-msgid ""
-"<qt><b>Remote file dropped</b>."
-"<br>The remote file will now be copied to a temporary file to process requested "
-"operation. This temporary file will be deleted after operation.</qt>"
-msgstr ""
-"<qt><b>Remote file dropped</b>."
-"<br>The remote file will now be copied to a temporary file to process requested "
-"operation. This temporary file will be deleted after operation.</qt>"
+#: keygener.cpp:64
+msgid "Weeks"
+msgstr "Weeks"
 
-#: kgpgview.cpp:100
-msgid "Could not download file."
-msgstr "Could not download file."
+#: keygener.cpp:65
+msgid "Months"
+msgstr "Months"
 
-#: kgpglibrary.cpp:225 kgpgview.cpp:130
-msgid ""
-"<p>The file <b>%1</b> is a public key."
-"<br>Do you want to import it ?</p>"
-msgstr ""
-"<p>The file <b>%1</b> is a public key."
-"<br>Do you want to import it ?</p>"
+#: keygener.cpp:66
+msgid "Years"
+msgstr "Years"
 
-#: kgpgview.cpp:143
-msgid ""
-"This file is a private key.\n"
-"Please use kgpg key management to import it."
-msgstr ""
-"This file is a private key.\n"
-"Please use kgpg key management to import it."
+#: keygener.cpp:70
+msgid "Key size:"
+msgstr "Key size:"
 
-#: kgpglibrary.cpp:240 kgpgview.cpp:165 kgpgview.cpp:361
-msgid "Decryption failed."
-msgstr "Decryption failed."
+#. i18n: file keyproperties.ui line 245
+#: keygener.cpp:79 rc.cpp:389
+#, no-c-format
+msgid "Algorithm:"
+msgstr "Algorithm:"
 
-#: kgpgview.cpp:179
-msgid "Unable to read file."
-msgstr "Unable to read file."
+#: keygener.cpp:94
+msgid "You must give a name."
+msgstr "You must give a name."
 
-#: kgpgview.cpp:211
-msgid "S&ign/Verify"
-msgstr "S&ign/Verify"
+#: keygener.cpp:100
+msgid "You are about to create a key with no email address"
+msgstr "You are about to create a key with no email address"
 
-#: kgpgview.cpp:212
-msgid "En&crypt"
-msgstr "En&crypt"
+#: keygener.cpp:103
+msgid "Email address not valid"
+msgstr "Email address not valid"
 
-#: kgpgview.cpp:213
-msgid "&Decrypt"
-msgstr "&Decrypt"
+#. i18n: file keyproperties.ui line 24
+#: keyinfowidget.cpp:46 rc.cpp:351
+#, no-c-format
+msgid "Key Properties"
+msgstr "Key Properties"
 
-#: kgpgview.cpp:231
-msgid "untitled"
-msgstr "untitled"
+#: keyinfowidget.cpp:257 keyinfowidget.cpp:266
+msgid "none"
+msgstr "none"
 
-#: kgpginterface.cpp:829 kgpgview.cpp:241
-msgid ""
-"<qt><b>Missing signature:</b>"
-"<br>Key id: %1"
-"<br>"
-"<br>Do you want to import this key from a keyserver?</qt>"
-msgstr ""
-"<qt><b>Missing signature:</b>"
-"<br>Key id: %1"
-"<br>"
-"<br>Do you want to import this key from a keyserver?</qt>"
+#: keyinfowidget.cpp:355
+msgid "Choose New Expiration"
+msgstr "Choose New Expiration"
 
-#: kgpgview.cpp:242
-msgid "Missing Key"
-msgstr "Missing Key"
+#: keyinfowidget.cpp:433
+msgid "Passphrase for the key was changed"
+msgstr "Passphrase for the key was changed"
 
-#: kgpgview.cpp:295
-msgid "Signing not possible: bad passphrase or missing key"
-msgstr "Signing not possible: bad passphrase or missing key"
+#: keyinfowidget.cpp:453
+msgid "Could not change expiration"
+msgstr "Could not change expiration"
 
-#: kgpgview.cpp:388
-msgid "Encryption failed."
-msgstr "Encryption failed."
+#: keyinfowidget.cpp:453
+msgid "Bad passphrase"
+msgstr "Bad passphrase"
 
 #: popuppublic.cpp:91
 msgid "Select Public Key"
@@ -1272,527 +1702,6 @@ msgstr ""
 "<b>Custom option</b>: for experienced users only, allows you to enter a gpg "
 "command line option, like: '--armor'"
 
-#: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
-#: kgpgoptions.cpp:584 kgpgoptions.cpp:590
-msgid "(Default)"
-msgstr "(Default)"
-
-#. i18n: file conf_encryption.ui line 17
-#: kgpgoptions.cpp:101 rc.cpp:41
-#, no-c-format
-msgid "Encryption"
-msgstr "Encryption"
-
-#: kgpgoptions.cpp:102
-msgid "Decryption"
-msgstr "Decryption"
-
-#: kgpgoptions.cpp:104
-msgid "GnuPG Settings"
-msgstr "GnuPG Settings"
-
-#: kgpgoptions.cpp:105
-msgid "Key Servers"
-msgstr "Key Servers"
-
-#: kgpgoptions.cpp:106
-msgid "Misc"
-msgstr "Misc"
-
-#: kgpgoptions.cpp:188
-msgid "New GnuPG Home Location"
-msgstr "New GnuPG Home Location"
-
-#: kgpgoptions.cpp:196
-msgid ""
-"No configuration file was found in the selected location.\n"
-"Do you want to create it now ?\n"
-"\n"
-"Without configuration file, neither KGpg nor Gnupg will work properly."
-msgstr ""
-"No configuration file was found in the selected location.\n"
-"Do you want to create it now ?\n"
-"\n"
-"Without configuration file, neither KGpg nor Gnupg will work properly."
-
-#: kgpgoptions.cpp:196
-msgid "No Configuration File Found"
-msgstr "No Configuration File Found"
-
-#: kgpgoptions.cpp:196
-msgid "Create"
-msgstr "Create"
-
-#: kgpgoptions.cpp:196
-msgid "Ignore"
-msgstr "Ignore"
-
-#: kgpgoptions.cpp:204
-msgid ""
-"Cannot create configuration file. Please check if destination media is mounted "
-"and if you have write access"
-msgstr ""
-"Cannot create configuration file. Please check if destination media is mounted "
-"and if you have write access"
-
-#: kgpgoptions.cpp:456
-msgid "Sign File"
-msgstr "Sign File"
-
-#: kgpgoptions.cpp:473
-msgid "Decrypt File"
-msgstr "Decrypt File"
-
-#: kgpgoptions.cpp:572
-msgid "Add New Key Server"
-msgstr "Add New Key Server"
-
-#: kgpgoptions.cpp:572
-msgid "Server URL:"
-msgstr "Server URL:"
-
-#: kgpglibrary.cpp:82
-msgid "You have not chosen an encryption key."
-msgstr "You have not chosen an encryption key."
-
-#: kgpglibrary.cpp:107
-msgid ""
-"<b>%1 Files left.</b>\n"
-"Encrypting </b>%2"
-msgstr ""
-"<b>%1 Files left.</b>\n"
-"Encrypting </b>%2"
-
-#: kgpglibrary.cpp:108
-#, c-format
-msgid "<b>Encrypting </b>%2"
-msgstr "<b>Encrypting </b>%2"
-
-#: kgpglibrary.cpp:125
-msgid "Processing encryption (%1)"
-msgstr "Processing encryption (%1)"
-
-#: kgpglibrary.cpp:143
-#, c-format
-msgid ""
-"_n: Shredding %n file\n"
-"Shredding %n files"
-msgstr ""
-"Shredding %n file\n"
-"Shredding %n files"
-
-#: kgpglibrary.cpp:157
-msgid "KGpg Error"
-msgstr "KGpg Error"
-
-#: kgpglibrary.cpp:157
-msgid "Process halted, not all files were shredded."
-msgstr "Process halted, not all files were shredded."
-
-#: kgpglibrary.cpp:175
-msgid "<b>Process halted</b>.<br>Not all files were encrypted."
-msgstr "<b>Process halted</b>.<br>Not all files were encrypted."
-
-#: kgpglibrary.cpp:195
-#, c-format
-msgid "Decrypting %1"
-msgstr "Decrypting %1"
-
-#: kgpglibrary.cpp:197
-msgid "Processing decryption"
-msgstr "Processing decryption"
-
-#: kgpglibrary.cpp:236
-msgid ""
-"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
-"import it.</p>"
-msgstr ""
-"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
-"import it.</p>"
-
-#: kgpginterface.cpp:87
-msgid " or "
-msgstr " or "
-
-#: kgpginterface.cpp:144
-msgid "Enter passphrase for your file (symmetrical encryption):"
-msgstr "Enter passphrase for your file (symmetrical encryption):"
-
-#: kgpginterface.cpp:215 kgpginterface.cpp:392 kgpginterface.cpp:500
-#: kgpginterface.cpp:739 kgpginterface.cpp:1273
-msgid "[No user id found]"
-msgstr "[No user id found]"
-
-#: kgpginterface.cpp:220 kgpginterface.cpp:396
-msgid "<b>No user id found</b>. Trying all secret keys.<br>"
-msgstr "<b>No user id found</b>. Trying all secret keys.<br>"
-
-#: kgpginterface.cpp:222 kgpginterface.cpp:398 kgpginterface.cpp:504
-msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
-msgstr "<b>Bad passphrase</b>. You have %1 tries left.<br>"
-
-#: kgpginterface.cpp:224 kgpginterface.cpp:399 kgpginterface.cpp:505
-#: kgpginterface.cpp:744
-msgid "Enter passphrase for <b>%1</b>"
-msgstr "Enter passphrase for <b>%1</b>"
-
-#: kgpginterface.cpp:302
-msgid "Enter passphrase (symmetrical encryption)"
-msgstr "Enter passphrase (symmetrical encryption)"
-
-#: kgpginterface.cpp:353
-msgid "Bad MDC detected. The encrypted text has been manipulated."
-msgstr "Bad MDC detected. The encrypted text has been manipulated."
-
-#: kgpginterface.cpp:574 kgpginterface.cpp:603 kgpginterface.cpp:799
-#: kgpginterface.cpp:825
-msgid "No signature found."
-msgstr "No signature found."
-
-#: kgpginterface.cpp:591 kgpginterface.cpp:802
-msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
-msgstr "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
-
-#: kgpginterface.cpp:595
-msgid ""
-"<qt><b>Bad signature</b> from:"
-"<br>%1"
-"<br>Key ID: %2"
-"<br>"
-"<br><b>Text is corrupted.</b></qt>"
-msgstr ""
-"<qt><b>Bad signature</b> from:"
-"<br>%1"
-"<br>Key ID: %2"
-"<br>"
-"<br><b>Text is corrupted.</b></qt>"
-
-#: kgpginterface.cpp:605 kgpginterface.cpp:815
-msgid "The signature is valid, but the key is untrusted"
-msgstr "The signature is valid, but the key is untrusted"
-
-#: kgpginterface.cpp:607 kgpginterface.cpp:817
-msgid "The signature is valid, and the key is ultimately trusted"
-msgstr "The signature is valid and the key is ultimately trusted"
-
-#: kgpginterface.cpp:614
-msgid "MD5 Checksum"
-msgstr "MD5 Checksum"
-
-#: kgpginterface.cpp:616
-msgid "Compare MD5 with Clipboard"
-msgstr "Compare MD5 with Clipboard"
-
-#: kgpginterface.cpp:631
-msgid "MD5 sum for <b>%1</b> is:"
-msgstr "MD5 sum for <b>%1</b> is:"
-
-#: kgpginterface.cpp:648
-msgid "<b>Unknown status</b>"
-msgstr "<b>Unknown status</b>"
-
-#: kgpginterface.cpp:676
-msgid "<b>Correct checksum</b>, file is ok."
-msgstr "<b>Correct checksum</b>, file is ok."
-
-#: kgpginterface.cpp:681
-msgid "Clipboard content is not a MD5 sum."
-msgstr "Clipboard content is not a MD5 sum."
-
-#: kgpginterface.cpp:683
-msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
-msgstr "<b>Wrong checksum, FILE CORRUPTED</b>"
-
-#: kgpginterface.cpp:718
-msgid "The signature file %1 was successfully created."
-msgstr "The signature file %1 was successfully created."
-
-#: kgpginterface.cpp:720
-msgid "Bad passphrase, signature was not created."
-msgstr "Bad passphrase, signature was not created."
-
-#: kgpginterface.cpp:743
-msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
-msgstr "<b>Bad passphrase</b>. you have %1 tries left.<br>"
-
-#: kgpginterface.cpp:806
-msgid ""
-"<qt><b>BAD signature</b> from:"
-"<br> %1"
-"<br>Key id: %2"
-"<br>"
-"<br><b>The file is corrupted!</b></qt>"
-msgstr ""
-"<qt><b>BAD signature</b> from:"
-"<br> %1"
-"<br>Key id: %2"
-"<br>"
-"<br><b>The file is corrupted!</b></qt>"
-
-#: kgpginterface.cpp:910
-msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
-msgstr "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
-
-#: kgpginterface.cpp:928
-msgid "<b>Bad passphrase</b>. Try again.</br>"
-msgstr "<b>Bad passphrase</b>. Try again.</br>"
-
-#: kgpginterface.cpp:949
-msgid ""
-"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
-"<br>Do you want to try signing the key in console mode?</qt>"
-msgstr ""
-"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
-"<br>Do you want to try signing the key in console mode?</qt>"
-
-#: kgpginterface.cpp:981
-msgid ""
-"This key has more than one user ID.\n"
-"Edit the key manually to delete signature."
-msgstr ""
-"This key has more than one user ID.\n"
-"Edit the key manually to delete signature."
-
-#: kgpginterface.cpp:1115 kgpginterface.cpp:1519 kgpginterface.cpp:1642
-#: kgpginterface.cpp:1717 kgpginterface.cpp:1803
-msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
-msgstr "<qt>Enter passphrase for <b>%1</b>:</qt>"
-
-#: kgpginterface.cpp:1158
-msgid ""
-"<qt><b>Changing expiration failed.</b>"
-"<br>Do you want to try changing the key expiration in console mode?</qt>"
-msgstr ""
-"<qt><b>Changing expiration failed.</b>"
-"<br>Do you want to try changing the key expiration in console mode?</qt>"
-
-#: kgpginterface.cpp:1268
-msgid "<b>Bad passphrase</b>. Try again<br>"
-msgstr "<b>Bad passphrase</b>. Try again<br>"
-
-#: kgpginterface.cpp:1278
-msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
-msgstr "<qt>%1 Enter passphrase for <b>%2</b></qt>"
-
-#: kgpginterface.cpp:1293
-msgid ""
-"<qt>Enter new passphrase for <b>%1</b>"
-"<br>If you forget this passphrase, all your encrypted files and messages will "
-"be lost !"
-"<br></qt>"
-msgstr ""
-"<qt>Enter new passphrase for <b>%1</b>"
-"<br>If you forget this passphrase, all your encrypted files and messages will "
-"be lost !"
-"<br></qt>"
-
-#: keyservers.cpp:496 kgpginterface.cpp:1408
-#, c-format
-msgid ""
-"_n: <qt>%n key processed."
-"<br></qt>\n"
-"<qt>%n keys processed."
-"<br></qt>"
-msgstr ""
-"<qt>%n key processed."
-"<br></qt>\n"
-"<qt>%n keys processed."
-"<br></qt>"
-
-#: keyservers.cpp:498 kgpginterface.cpp:1410
-#, c-format
-msgid ""
-"_n: <qt>One key unchanged."
-"<br></qt>\n"
-"<qt>%n keys unchanged."
-"<br></qt>"
-msgstr ""
-"<qt>One key unchanged."
-"<br></qt>\n"
-"<qt>%n keys unchanged."
-"<br></qt>"
-
-#: keyservers.cpp:500 kgpginterface.cpp:1412
-#, c-format
-msgid ""
-"_n: <qt>One signature imported."
-"<br></qt>\n"
-"<qt>%n signatures imported."
-"<br></qt>"
-msgstr ""
-"<qt>One signature imported."
-"<br></qt>\n"
-"<qt>%n signatures imported."
-"<br></qt>"
-
-#: keyservers.cpp:502 kgpginterface.cpp:1414
-#, c-format
-msgid ""
-"_n: <qt>One key without ID."
-"<br></qt>\n"
-"<qt>%n keys without ID."
-"<br></qt>"
-msgstr ""
-"<qt>One key without ID."
-"<br></qt>\n"
-"<qt>%n keys without ID."
-"<br></qt>"
-
-#: keyservers.cpp:504 kgpginterface.cpp:1416
-#, c-format
-msgid ""
-"_n: <qt>One RSA key imported."
-"<br></qt>\n"
-"<qt>%n RSA keys imported."
-"<br></qt>"
-msgstr ""
-"<qt>One RSA key imported."
-"<br></qt>\n"
-"<qt>%n RSA keys imported."
-"<br></qt>"
-
-#: keyservers.cpp:506 kgpginterface.cpp:1418
-#, c-format
-msgid ""
-"_n: <qt>One user ID imported."
-"<br></qt>\n"
-"<qt>%n user IDs imported."
-"<br></qt>"
-msgstr ""
-"<qt>One user ID imported."
-"<br></qt>\n"
-"<qt>%n user IDs imported."
-"<br></qt>"
-
-#: keyservers.cpp:508 kgpginterface.cpp:1420
-#, c-format
-msgid ""
-"_n: <qt>One subkey imported."
-"<br></qt>\n"
-"<qt>%n subkeys imported."
-"<br></qt>"
-msgstr ""
-"<qt>One subkey imported."
-"<br></qt>\n"
-"<qt>%n subkeys imported."
-"<br></qt>"
-
-#: keyservers.cpp:510 kgpginterface.cpp:1422
-#, c-format
-msgid ""
-"_n: <qt>One revocation certificate imported."
-"<br></qt>\n"
-"<qt>%n revocation certificates imported."
-"<br></qt>"
-msgstr ""
-"<qt>One revocation certificate imported."
-"<br></qt>\n"
-"<qt>%n revocation certificates imported."
-"<br></qt>"
-
-#: keyservers.cpp:512 kgpginterface.cpp:1425
-#, c-format
-msgid ""
-"_n: <qt>One secret key processed."
-"<br></qt>\n"
-"<qt>%n secret keys processed."
-"<br></qt>"
-msgstr ""
-"<qt>One secret key processed."
-"<br></qt>\n"
-"<qt>%n secret keys processed."
-"<br></qt>"
-
-#: keyservers.cpp:514 kgpginterface.cpp:1429
-#, c-format
-msgid ""
-"_n: <qt><b>One secret key imported.</b>"
-"<br></qt>\n"
-"<qt><b>%n secret keys imported.</b>"
-"<br></qt>"
-msgstr ""
-"<qt><b>One secret key imported.</b>"
-"<br></qt>\n"
-"<qt><b>%n secret keys imported.</b>"
-"<br></qt>"
-
-#: keyservers.cpp:516 kgpginterface.cpp:1431
-#, c-format
-msgid ""
-"_n: <qt>One secret key unchanged."
-"<br></qt>\n"
-"<qt>%n secret keys unchanged."
-"<br></qt>"
-msgstr ""
-"<qt>One secret key unchanged."
-"<br></qt>\n"
-"<qt>%n secret keys unchanged."
-"<br></qt>"
-
-#: keyservers.cpp:518 kgpginterface.cpp:1433
-#, c-format
-msgid ""
-"_n: <qt>One secret key not imported."
-"<br></qt>\n"
-"<qt>%n secret keys not imported."
-"<br></qt>"
-msgstr ""
-"<qt>One secret key not imported."
-"<br></qt>\n"
-"<qt>%n secret keys not imported."
-"<br></qt>"
-
-#: keyservers.cpp:520 kgpginterface.cpp:1435
-#, c-format
-msgid ""
-"_n: <qt><b>One key imported:</b>"
-"<br></qt>\n"
-"<qt><b>%n keys imported:</b>"
-"<br></qt>"
-msgstr ""
-"<qt><b>One key imported:</b>"
-"<br></qt>\n"
-"<qt><b>%n keys imported:</b>"
-"<br></qt>"
-
-#: kgpginterface.cpp:1437
-msgid ""
-"<qt>"
-"<br><b>You have imported a secret key.</b> "
-"<br>Please note that imported secret keys are not trusted by default."
-"<br>To fully use this secret key for signing and encryption, you must edit the "
-"key (double click on it) and set its trust to Full or Ultimate.</qt>"
-msgstr ""
-"<qt>"
-"<br><b>You have imported a secret key.</b> "
-"<br>Please note that imported secret keys are not trusted by default."
-"<br>To fully use this secret key for signing and encryption, you must edit the "
-"key (double click on it) and set its trust to Full or Ultimate.</qt>"
-
-#: keyservers.cpp:522 kgpginterface.cpp:1441
-msgid ""
-"No key imported... \n"
-"Check detailed log for more infos"
-msgstr ""
-"No key imported... \n"
-"Check detailed log for more infos"
-
-#: kgpginterface.cpp:1704
-msgid "This image is very large. Use it anyway?"
-msgstr "This image is very large. Use it anyway?"
-
-#: kgpginterface.cpp:1704
-msgid "Use Anyway"
-msgstr "Use Anyway"
-
-#: kgpginterface.cpp:1704
-msgid "Do Not Use"
-msgstr "Do Not Use"
-
-#: kgpginterface.cpp:1768
-msgid "Creation of the revocation certificate failed..."
-msgstr "Creation of the revocation certificate failed..."
-
 #. i18n: file kgpg.rc line 16
 #: rc.cpp:6
 #, no-c-format
@@ -1823,18 +1732,6 @@ msgstr "&Groups"
 msgid "Name (minimum 5 characters):"
 msgstr "Name (minimum 5 characters):"
 
-#. i18n: file adduid.ui line 50
-#: keygener.cpp:50 rc.cpp:27 rc.cpp:386 rc.cpp:585
-#, no-c-format
-msgid "Email:"
-msgstr "Email:"
-
-#. i18n: file adduid.ui line 58
-#: keygener.cpp:53 rc.cpp:30
-#, no-c-format
-msgid "Comment (optional):"
-msgstr "Comment (optional):"
-
 #. i18n: file conf_decryption.ui line 55
 #: rc.cpp:33
 #, no-c-format
@@ -2235,12 +2132,6 @@ msgstr "Left mouse click opens (restart KGpg to apply):"
 msgid "Key Manager"
 msgstr "Key Manager"
 
-#. i18n: file conf_misc.ui line 198
-#: kgpgeditor.cpp:252 rc.cpp:203
-#, no-c-format
-msgid "Editor"
-msgstr "Editor"
-
 #. i18n: file conf_misc.ui line 235
 #: rc.cpp:206
 #, no-c-format
@@ -2477,12 +2368,6 @@ msgstr "Clipboard"
 msgid "File:"
 msgstr "File:"
 
-#. i18n: file keyproperties.ui line 24
-#: keyinfowidget.cpp:46 rc.cpp:351
-#, no-c-format
-msgid "Key Properties"
-msgstr "Key Properties"
-
 #. i18n: file keyproperties.ui line 79
 #: rc.cpp:354
 #, no-c-format
@@ -2555,12 +2440,6 @@ msgstr "Key ID:"
 msgid "Owner trust:"
 msgstr "Owner trust:"
 
-#. i18n: file keyproperties.ui line 245
-#: keygener.cpp:79 rc.cpp:389
-#, no-c-format
-msgid "Algorithm:"
-msgstr "Algorithm:"
-
 #. i18n: file keyproperties.ui line 275
 #: rc.cpp:395
 #, no-c-format
@@ -2573,12 +2452,6 @@ msgstr "Trust:"
 msgid "Comment:"
 msgstr "Comment:"
 
-#. i18n: file keyproperties.ui line 297
-#: keygener.cpp:47 rc.cpp:401 rc.cpp:582
-#, no-c-format
-msgid "Name:"
-msgstr "Name:"
-
 #. i18n: file keyproperties.ui line 316
 #: rc.cpp:404 rc.cpp:579
 #, no-c-format
@@ -2689,12 +2562,6 @@ msgstr ""
 msgid "&Search"
 msgstr "&Search"
 
-#. i18n: file keyserver.ui line 97
-#: keyservers.cpp:171 rc.cpp:446
-#, no-c-format
-msgid "&Import"
-msgstr "&Import"
-
 #. i18n: file keyserver.ui line 159
 #: rc.cpp:449 rc.cpp:474
 #, no-c-format
@@ -2914,7 +2781,7 @@ msgid "Step Three: Ready to Create your Key Pair"
 msgstr "Step Three: Ready to Create your Key Pair"
 
 #. i18n: file kgpgwizard.ui line 291
-#: rc.cpp:553 rc.cpp:705
+#: rc.cpp:553
 #, no-c-format
 msgid "Start KGpg automatically at TDE startup."
 msgstr "Start KGpg automatically at TDE startup."
@@ -3159,6 +3026,12 @@ msgstr "Show the creation value in key manager."
 msgid "Use the mouse selection instead of the clipboard."
 msgstr "Use the mouse selection instead of the clipboard."
 
+#. i18n: file kgpg.kcfg line 118
+#: rc.cpp:705
+#, fuzzy, no-c-format
+msgid "Start KGpg automatically at KDE startup."
+msgstr "Start KGpg automatically at TDE startup."
+
 #. i18n: file kgpg.kcfg line 122
 #: rc.cpp:708
 #, no-c-format
@@ -3235,260 +3108,394 @@ msgstr "Colour used for untrusted keys."
 msgid "Use HTTP proxy when available."
 msgstr "Use HTTP proxy when available."
 
-#: keygener.cpp:37
-msgid "Key Generation"
-msgstr "Key Generation"
+#: kgpginterface.cpp:87
+msgid " or "
+msgstr " or "
 
-#: keygener.cpp:40
-msgid "Expert Mode"
-msgstr "Expert Mode"
+#: kgpginterface.cpp:144
+msgid "Enter passphrase for your file (symmetrical encryption):"
+msgstr "Enter passphrase for your file (symmetrical encryption):"
 
-#: keygener.cpp:45
-msgid "Generate Key Pair"
-msgstr "Generate Key Pair"
+#: kgpginterface.cpp:215 kgpginterface.cpp:392 kgpginterface.cpp:500
+#: kgpginterface.cpp:739 kgpginterface.cpp:1273
+msgid "[No user id found]"
+msgstr "[No user id found]"
 
-#: keygener.cpp:62
-msgid "Never"
-msgstr "Never"
+#: kgpginterface.cpp:220 kgpginterface.cpp:396
+msgid "<b>No user id found</b>. Trying all secret keys.<br>"
+msgstr "<b>No user id found</b>. Trying all secret keys.<br>"
 
-#: keygener.cpp:63
-msgid "Days"
-msgstr "Days"
+#: kgpginterface.cpp:222 kgpginterface.cpp:398 kgpginterface.cpp:504
+msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
+msgstr "<b>Bad passphrase</b>. You have %1 tries left.<br>"
 
-#: keygener.cpp:64
-msgid "Weeks"
-msgstr "Weeks"
+#: kgpginterface.cpp:224 kgpginterface.cpp:399 kgpginterface.cpp:505
+#: kgpginterface.cpp:744
+msgid "Enter passphrase for <b>%1</b>"
+msgstr "Enter passphrase for <b>%1</b>"
 
-#: keygener.cpp:65
-msgid "Months"
-msgstr "Months"
+#: kgpginterface.cpp:302
+msgid "Enter passphrase (symmetrical encryption)"
+msgstr "Enter passphrase (symmetrical encryption)"
 
-#: keygener.cpp:66
-msgid "Years"
-msgstr "Years"
+#: kgpginterface.cpp:353
+msgid "Bad MDC detected. The encrypted text has been manipulated."
+msgstr "Bad MDC detected. The encrypted text has been manipulated."
 
-#: keygener.cpp:70
-msgid "Key size:"
-msgstr "Key size:"
+#: kgpginterface.cpp:574 kgpginterface.cpp:603 kgpginterface.cpp:799
+#: kgpginterface.cpp:825
+msgid "No signature found."
+msgstr "No signature found."
 
-#: keygener.cpp:94
-msgid "You must give a name."
-msgstr "You must give a name."
+#: kgpginterface.cpp:591 kgpginterface.cpp:802
+msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
+msgstr "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
 
-#: keygener.cpp:100
-msgid "You are about to create a key with no email address"
-msgstr "You are about to create a key with no email address"
+#: kgpginterface.cpp:595
+msgid ""
+"<qt><b>Bad signature</b> from:"
+"<br>%1"
+"<br>Key ID: %2"
+"<br>"
+"<br><b>Text is corrupted.</b></qt>"
+msgstr ""
+"<qt><b>Bad signature</b> from:"
+"<br>%1"
+"<br>Key ID: %2"
+"<br>"
+"<br><b>Text is corrupted.</b></qt>"
 
-#: keygener.cpp:103
-msgid "Email address not valid"
-msgstr "Email address not valid"
+#: kgpginterface.cpp:605 kgpginterface.cpp:815
+msgid "The signature is valid, but the key is untrusted"
+msgstr "The signature is valid, but the key is untrusted"
 
-#: detailedconsole.cpp:43
-msgid "Details"
-msgstr "Details"
+#: kgpginterface.cpp:607 kgpginterface.cpp:817
+msgid "The signature is valid, and the key is ultimately trusted"
+msgstr "The signature is valid and the key is ultimately trusted"
 
-#: detailedconsole.cpp:55
-msgid "Info"
-msgstr "Info"
+#: kgpginterface.cpp:614
+msgid "MD5 Checksum"
+msgstr "MD5 Checksum"
 
-#: keyinfowidget.cpp:257 keyinfowidget.cpp:266
-msgid "none"
-msgstr "none"
+#: kgpginterface.cpp:616
+msgid "Compare MD5 with Clipboard"
+msgstr "Compare MD5 with Clipboard"
 
-#: keyinfowidget.cpp:355
-msgid "Choose New Expiration"
-msgstr "Choose New Expiration"
+#: kgpginterface.cpp:631
+msgid "MD5 sum for <b>%1</b> is:"
+msgstr "MD5 sum for <b>%1</b> is:"
 
-#: keyinfowidget.cpp:433
-msgid "Passphrase for the key was changed"
-msgstr "Passphrase for the key was changed"
+#: kgpginterface.cpp:648
+msgid "<b>Unknown status</b>"
+msgstr "<b>Unknown status</b>"
 
-#: keyinfowidget.cpp:453
-msgid "Could not change expiration"
-msgstr "Could not change expiration"
+#: kgpginterface.cpp:676
+msgid "<b>Correct checksum</b>, file is ok."
+msgstr "<b>Correct checksum</b>, file is ok."
 
-#: keyinfowidget.cpp:453
-msgid "Bad passphrase"
-msgstr "Bad passphrase"
+#: kgpginterface.cpp:681
+msgid "Clipboard content is not a MD5 sum."
+msgstr "Clipboard content is not a MD5 sum."
 
-#: tips.cpp:3
+#: kgpginterface.cpp:683
+msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
+msgstr "<b>Wrong checksum, FILE CORRUPTED</b>"
+
+#: kgpginterface.cpp:718
+msgid "The signature file %1 was successfully created."
+msgstr "The signature file %1 was successfully created."
+
+#: kgpginterface.cpp:720
+msgid "Bad passphrase, signature was not created."
+msgstr "Bad passphrase, signature was not created."
+
+#: kgpginterface.cpp:743
+msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
+msgstr "<b>Bad passphrase</b>. you have %1 tries left.<br>"
+
+#: kgpginterface.cpp:806
 msgid ""
-"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
-"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
-"<p>Drag a public key into the editor window and kgpg will automatically import "
-"it if you want.</p>\n"
+"<qt><b>BAD signature</b> from:"
+"<br> %1"
+"<br>Key id: %2"
+"<br>"
+"<br><b>The file is corrupted!</b></qt>"
 msgstr ""
-"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
-"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
-"<p>Drag a public key into the editor window and kgpg will automatically import "
-"it if you want.</p>\n"
+"<qt><b>BAD signature</b> from:"
+"<br> %1"
+"<br>Key id: %2"
+"<br>"
+"<br><b>The file is corrupted!</b></qt>"
 
-#: tips.cpp:9
+#: kgpginterface.cpp:829 kgpgview.cpp:241
 msgid ""
-"<p>The easiest way to encrypt a file: simply right click on the file, and you "
-"have an encrypt option in the contextual menu.\n"
-"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+"<qt><b>Missing signature:</b>"
+"<br>Key id: %1"
+"<br>"
+"<br>Do you want to import this key from a keyserver?</qt>"
 msgstr ""
-"<p>The easiest way to encrypt a file: simply right click on the file, and you "
-"have an encrypt option in the contextual menu.\n"
-"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+"<qt><b>Missing signature:</b>"
+"<br>Key id: %1"
+"<br>"
+"<br>Do you want to import this key from a keyserver?</qt>"
+
+#: kgpginterface.cpp:910
+msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
+msgstr "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
 
-#: tips.cpp:15
+#: kgpginterface.cpp:928
+msgid "<b>Bad passphrase</b>. Try again.</br>"
+msgstr "<b>Bad passphrase</b>. Try again.</br>"
+
+#: kgpginterface.cpp:949
 msgid ""
-"<p>If you want to encrypt a message for several persons, just select several "
-"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
+"<br>Do you want to try signing the key in console mode?</qt>"
 msgstr ""
-"<p>If you want to encrypt a message for several persons, just select several "
-"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
+"<br>Do you want to try signing the key in console mode?</qt>"
 
-#: tips.cpp:20
+#: kgpginterface.cpp:981
 msgid ""
-"<p><strong>You don't know anything about encryption?</strong>"
-"<br>\n"
-"No problem, simply create yourself a key pair in the key management window. "
-"Then, export your public key & mail it to your friends."
-"<br>\n"
-"Ask them to do the same & import their public keys. Finally, to send an "
-"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
-"your friend key and click \"encrypt\" again. The message will be encrypted, "
-"ready to be sent by email.</p>\n"
+"This key has more than one user ID.\n"
+"Edit the key manually to delete signature."
 msgstr ""
-"<p><strong>You don't know anything about encryption?</strong>"
-"<br>\n"
-"No problem, simply create yourself a key pair in the key management window. "
-"Then, export your public key & mail it to your friends."
-"<br>\n"
-"Ask them to do the same & import their public keys. Finally, to send an "
-"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
-"your friend key and click \"encrypt\" again. The message will be encrypted, "
-"ready to be sent by email.</p>\n"
+"This key has more than one user ID.\n"
+"Edit the key manually to delete signature."
 
-#: tips.cpp:28
+#: kgpginterface.cpp:1115 kgpginterface.cpp:1519 kgpginterface.cpp:1642
+#: kgpginterface.cpp:1717 kgpginterface.cpp:1803
+msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
+msgstr "<qt>Enter passphrase for <b>%1</b>:</qt>"
+
+#: kgpginterface.cpp:1158
 msgid ""
-"<p>To perform an operation on a key, open the key management window & right "
-"click on the key. A popup menu with all available options will appear.</p>\n"
+"<qt><b>Changing expiration failed.</b>"
+"<br>Do you want to try changing the key expiration in console mode?</qt>"
 msgstr ""
-"<p>To perform an operation on a key, open the key management window & right "
-"click on the key. A popup menu with all available options will appear.</p>\n"
+"<qt><b>Changing expiration failed.</b>"
+"<br>Do you want to try changing the key expiration in console mode?</qt>"
+
+#: kgpginterface.cpp:1268
+msgid "<b>Bad passphrase</b>. Try again<br>"
+msgstr "<b>Bad passphrase</b>. Try again<br>"
 
-#: tips.cpp:33
+#: kgpginterface.cpp:1278
+msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
+msgstr "<qt>%1 Enter passphrase for <b>%2</b></qt>"
+
+#: kgpginterface.cpp:1293
 msgid ""
-"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
-"for password & that's all!</p>\n"
+"<qt>Enter new passphrase for <b>%1</b>"
+"<br>If you forget this passphrase, all your encrypted files and messages will "
+"be lost !"
+"<br></qt>"
 msgstr ""
-"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
-"for password & that's all!</p>\n"
+"<qt>Enter new passphrase for <b>%1</b>"
+"<br>If you forget this passphrase, all your encrypted files and messages will "
+"be lost !"
+"<br></qt>"
 
-#: tips.cpp:38
+#: kgpginterface.cpp:1437
 msgid ""
-"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
-"line prompt.</p>\n"
+"<qt>"
+"<br><b>You have imported a secret key.</b> "
+"<br>Please note that imported secret keys are not trusted by default."
+"<br>To fully use this secret key for signing and encryption, you must edit the "
+"key (double click on it) and set its trust to Full or Ultimate.</qt>"
 msgstr ""
-"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
-"line prompt.</p>\n"
+"<qt>"
+"<br><b>You have imported a secret key.</b> "
+"<br>Please note that imported secret keys are not trusted by default."
+"<br>To fully use this secret key for signing and encryption, you must edit the "
+"key (double click on it) and set its trust to Full or Ultimate.</qt>"
 
-#: tips.cpp:43
+#: kgpginterface.cpp:1704
+msgid "This image is very large. Use it anyway?"
+msgstr "This image is very large. Use it anyway?"
+
+#: kgpginterface.cpp:1704
+msgid "Use Anyway"
+msgstr "Use Anyway"
+
+#: kgpginterface.cpp:1704
+msgid "Do Not Use"
+msgstr "Do Not Use"
+
+#: kgpginterface.cpp:1768
+msgid "Creation of the revocation certificate failed..."
+msgstr "Creation of the revocation certificate failed..."
+
+#: main.cpp:30
 msgid ""
-"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
-"Kgpg's editor.</p>\n"
+"Kgpg - simple gui for gpg\n"
+"\n"
+"Kgpg was designed to make gpg very easy to use.\n"
+"I tried to make it as secure as possible.\n"
+"Hope you enjoy it."
 msgstr ""
-"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
-"Kgpg's editor.</p>\n"
+"Kgpg - simple gui for gpg\n"
+"\n"
+"Kgpg was designed to make gpg very easy to use.\n"
+"I tried to make it as secure as possible.\n"
+"Hope you enjoy it."
 
-#: kgpgeditor.cpp:143
-msgid "&Encrypt File..."
-msgstr "&Encrypt File..."
+#: main.cpp:36
+msgid "Encrypt file"
+msgstr "Encrypt file"
 
-#: kgpgeditor.cpp:144
-msgid "&Decrypt File..."
-msgstr "&Decrypt File..."
+#: main.cpp:37
+msgid "Open key manager"
+msgstr "Open key manager"
 
-#: kgpgeditor.cpp:149
-msgid "&Generate Signature..."
-msgstr "&Generate Signature..."
+#: main.cpp:38
+msgid "Show encrypted file"
+msgstr "Show encrypted file"
 
-#: kgpgeditor.cpp:150
-msgid "&Verify Signature..."
-msgstr "&Verify Signature..."
+#: main.cpp:39
+msgid "Sign file"
+msgstr "Sign file"
 
-#: kgpgeditor.cpp:151
-msgid "&Check MD5 Sum..."
-msgstr "&Check MD5 Sum..."
+#: main.cpp:40
+msgid "Verify signature"
+msgstr "Verify signature"
 
-#: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
-#: kgpgeditor.cpp:513
-msgid "*|All Files"
-msgstr "*|All Files"
+#: main.cpp:41
+msgid "Shred file"
+msgstr "Shred file"
 
-#: kgpgeditor.cpp:220
-msgid "Open File to Encode"
-msgstr "Open File to Encode"
+#: main.cpp:42
+msgid "File to open"
+msgstr "File to open"
 
-#: kgpgeditor.cpp:230
-msgid "Open File to Decode"
-msgstr "Open File to Decode"
+#: main.cpp:50
+msgid "KGpg"
+msgstr "KGpg"
 
-#: kgpgeditor.cpp:244
-msgid "Decrypt File To"
-msgstr "Decrypt File To"
+#: kgpglibrary.cpp:82
+msgid "You have not chosen an encryption key."
+msgstr "You have not chosen an encryption key."
 
-#: kgpgeditor.cpp:317
+#: kgpglibrary.cpp:107
 msgid ""
-"The document could not been saved, as the selected encoding cannot encode every "
-"unicode character in it."
+"<b>%1 Files left.</b>\n"
+"Encrypting </b>%2"
 msgstr ""
-"The document could not been saved, as the selected encoding cannot encode every "
-"unicode character in it."
+"<b>%1 Files left.</b>\n"
+"Encrypting </b>%2"
 
-#: kgpgeditor.cpp:325 kgpgeditor.cpp:352
+#: kgpglibrary.cpp:108
+#, c-format
+msgid "<b>Encrypting </b>%2"
+msgstr "<b>Encrypting </b>%2"
+
+#: kgpglibrary.cpp:125
+msgid "Processing encryption (%1)"
+msgstr "Processing encryption (%1)"
+
+#: kgpglibrary.cpp:143
+#, c-format
 msgid ""
-"The document could not be saved, please check your permissions and disk space."
+"_n: Shredding %n file\n"
+"Shredding %n files"
 msgstr ""
-"The document could not be saved, please check your permissions and disk space."
+"Shredding %n file\n"
+"Shredding %n files"
 
-#: kgpgeditor.cpp:379 kgpgeditor.cpp:388
-msgid "Overwrite existing file %1?"
-msgstr "Overwrite existing file %1?"
+#: kgpglibrary.cpp:157
+msgid "KGpg Error"
+msgstr "KGpg Error"
 
-#: kgpgeditor.cpp:380 kgpgeditor.cpp:389
-msgid "Overwrite"
-msgstr "Overwrite"
+#: kgpglibrary.cpp:157
+msgid "Process halted, not all files were shredded."
+msgstr "Process halted, not all files were shredded."
 
-#: kgpgeditor.cpp:467 kgpgeditor.cpp:513
-msgid "Open File to Verify"
-msgstr "Open File to Verify"
+#: kgpglibrary.cpp:175
+msgid "<b>Process halted</b>.<br>Not all files were encrypted."
+msgstr "<b>Process halted</b>.<br>Not all files were encrypted."
 
-#: kgpgeditor.cpp:481
-msgid "Open File to Sign"
-msgstr "Open File to Sign"
+#: kgpglibrary.cpp:195
+#, c-format
+msgid "Decrypting %1"
+msgstr "Decrypting %1"
 
-#: keyservers.cpp:55
-msgid "Key Server"
-msgstr "Key Server"
+#: kgpglibrary.cpp:197
+msgid "Processing decryption"
+msgstr "Processing decryption"
 
-#: keyservers.cpp:163 keyservers.cpp:409
-msgid "You must enter a search string."
-msgstr "You must enter a search string."
+#: kgpglibrary.cpp:225 kgpgview.cpp:130
+msgid ""
+"<p>The file <b>%1</b> is a public key."
+"<br>Do you want to import it ?</p>"
+msgstr ""
+"<p>The file <b>%1</b> is a public key."
+"<br>Do you want to import it ?</p>"
 
-#: keyservers.cpp:178
-msgid "Connecting to the server..."
-msgstr "Connecting to the server..."
+#: kgpglibrary.cpp:236
+msgid ""
+"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
+"import it.</p>"
+msgstr ""
+"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
+"import it.</p>"
 
-#: keyservers.cpp:233
-msgid "You must choose a key."
-msgstr "You must choose a key."
+#: kgpglibrary.cpp:240 kgpgview.cpp:165 kgpgview.cpp:361
+msgid "Decryption failed."
+msgstr "Decryption failed."
 
-#: keyservers.cpp:265
-msgid "Found %1 matching keys"
-msgstr "Found %1 matching keys"
+#: kgpgview.cpp:97
+msgid ""
+"<qt><b>Remote file dropped</b>."
+"<br>The remote file will now be copied to a temporary file to process requested "
+"operation. This temporary file will be deleted after operation.</qt>"
+msgstr ""
+"<qt><b>Remote file dropped</b>."
+"<br>The remote file will now be copied to a temporary file to process requested "
+"operation. This temporary file will be deleted after operation.</qt>"
 
-#: keyservers.cpp:374 keyservers.cpp:442
-msgid "<b>Connecting to the server...</b>"
-msgstr "<b>Connecting to the server...</b>"
+#: kgpgview.cpp:100
+msgid "Could not download file."
+msgstr "Could not download file."
 
-#: keyservers.cpp:375 keyservers.cpp:443
-msgid "&Abort"
-msgstr "&Abort"
+#: kgpgview.cpp:143
+msgid ""
+"This file is a private key.\n"
+"Please use kgpg key management to import it."
+msgstr ""
+"This file is a private key.\n"
+"Please use kgpg key management to import it."
+
+#: kgpgview.cpp:179
+msgid "Unable to read file."
+msgstr "Unable to read file."
+
+#: kgpgview.cpp:211
+msgid "S&ign/Verify"
+msgstr "S&ign/Verify"
+
+#: kgpgview.cpp:212
+msgid "En&crypt"
+msgstr "En&crypt"
+
+#: kgpgview.cpp:213
+msgid "&Decrypt"
+msgstr "&Decrypt"
+
+#: kgpgview.cpp:231
+msgid "untitled"
+msgstr "untitled"
+
+#: kgpgview.cpp:242
+msgid "Missing Key"
+msgstr "Missing Key"
+
+#: kgpgview.cpp:295
+msgid "Signing not possible: bad passphrase or missing key"
+msgstr "Signing not possible: bad passphrase or missing key"
+
+#: kgpgview.cpp:388
+msgid "Encryption failed."
+msgstr "Encryption failed."
 
 #~ msgid "&Unicode (utf-8) Encoding"
 #~ msgstr "&Unicode (utf-8) Encoding"
diff --git a/tde-i18n-en_GB/messages/tdeutils/khexedit.po b/tde-i18n-en_GB/messages/tdeutils/khexedit.po
index 49c84548ac4..8db4df4945b 100644
--- a/tde-i18n-en_GB/messages/tdeutils/khexedit.po
+++ b/tde-i18n-en_GB/messages/tdeutils/khexedit.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khexedit\n"
-"POT-Creation-Date: 2006-04-17 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:16+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,18 +58,112 @@ msgstr "Conversion &Field"
 msgid "Searc&hbar"
 msgstr "Searc&hbar"
 
-#: chartabledialog.cc:37
-msgid "Character Table"
-msgstr "Character Table"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "John Knight"
 
-#: chartabledialog.cc:49 dialog.cc:1402 fileinfodialog.cc:106
-msgid "Decimal"
-msgstr "Decimal"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
+
+#: hexbuffer.cc:1925 hexbuffer.cc:4832
+msgid "Page %1 of %2"
+msgstr "Page %1 of %2"
+
+#: hexbuffer.cc:2852
+msgid "to"
+msgstr "to"
+
+#: hexbuffer.cc:4853 hexbuffer.cc:4858
+msgid "Next"
+msgstr "Next"
+
+#: hexbuffer.cc:4863 hexbuffer.cc:4868
+msgid "Previous"
+msgstr "Previous"
+
+#: hexbuffer.cc:4886
+msgid "Generated by khexedit"
+msgstr "Generated by khexedit"
+
+#: stringdialog.cc:38 stringdialog.cc:201
+msgid "Extract Strings"
+msgstr "Extract Strings"
+
+#: stringdialog.cc:57
+msgid "&Minimum length:"
+msgstr "&Minimum length:"
+
+#: stringdialog.cc:66
+msgid "&Filter:"
+msgstr "&Filter:"
+
+#: stringdialog.cc:71
+msgid "&Use"
+msgstr "&Use"
+
+#: stringdialog.cc:80
+msgid "&Ignore case"
+msgstr "&Ignore case"
+
+#: stringdialog.cc:84
+msgid "Show offset as &decimal"
+msgstr "Show offset as &decimal"
+
+#: hexviewwidget.cc:1102 stringdialog.cc:95
+msgid "Offset"
+msgstr "Offset"
+
+#: stringdialog.cc:96
+msgid "String"
+msgstr "String"
+
+#: stringdialog.cc:106
+msgid "Number of strings:"
+msgstr "Number of strings:"
+
+#: stringdialog.cc:114
+msgid "Displayed:"
+msgstr "Displayed:"
+
+#: stringdialog.cc:197
+msgid ""
+"The filter expression you have specified is illegal. You must specify a valid "
+"regular expression.\n"
+"Continue without filter?"
+msgstr ""
+"The filter expression you have specified is illegal. You must specify a valid "
+"regular expression.\n"
+"Continue without filter?"
+
+#: fileinfodialog.cc:160 stringdialog.cc:254
+msgid "Warning: Document has been modified since last update"
+msgstr "Warning: Document has been modified since last update"
+
+#: fileinfodialog.cc:73
+msgid "Statistics"
+msgstr "Statistics"
+
+#: fileinfodialog.cc:89
+msgid "File name: "
+msgstr "File name: "
+
+#: fileinfodialog.cc:93
+msgid "Size [bytes]: "
+msgstr "Size [bytes]: "
 
 #: chartabledialog.cc:50 dialog.cc:1401 fileinfodialog.cc:105
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
+#: chartabledialog.cc:49 dialog.cc:1402 fileinfodialog.cc:106
+msgid "Decimal"
+msgstr "Decimal"
+
 #: chartabledialog.cc:51 dialog.cc:1403 fileinfodialog.cc:107
 msgid "Octal"
 msgstr "Octal"
@@ -81,9 +176,13 @@ msgstr "Binary"
 msgid "Text"
 msgstr "Text"
 
-#: chartabledialog.cc:70
-msgid "Insert this number of characters:"
-msgstr "Insert this number of characters:"
+#: fileinfodialog.cc:110
+msgid "Occurrence"
+msgstr "Occurrence"
+
+#: fileinfodialog.cc:111
+msgid "Percent"
+msgstr "Percent"
 
 #: parts/kpart/khepartfactory.cpp:30
 msgid "KHexEdit2Part"
@@ -161,42 +260,532 @@ msgstr "&Chars Column"
 msgid "&Both Columns"
 msgstr "&Both Columns"
 
-#: searchbar.cc:63 toplevel.cc:862
-msgid "Hex"
-msgstr "Hex"
+#: hextoolwidget.cc:44
+msgid "Signed 8 bit:"
+msgstr "Signed 8 bit:"
 
-#: searchbar.cc:63 toplevel.cc:866
-msgid "Dec"
-msgstr "Dec"
+#: hextoolwidget.cc:44
+msgid "Unsigned 8 bit:"
+msgstr "Unsigned 8 bit:"
 
-#: searchbar.cc:63 toplevel.cc:870
-msgid "Oct"
-msgstr "Oct"
+#: hextoolwidget.cc:45
+msgid "Signed 16 bit:"
+msgstr "Signed 16 bit:"
 
-#: searchbar.cc:63 toplevel.cc:874
-msgid "Bin"
-msgstr "Bin"
+#: hextoolwidget.cc:45
+msgid "Unsigned 16 bit:"
+msgstr "Unsigned 16 bit:"
 
-#: searchbar.cc:64 toplevel.cc:878
-msgid "Txt"
-msgstr "Txt"
+#: hextoolwidget.cc:50
+msgid "Signed 32 bit:"
+msgstr "Signed 32 bit:"
 
-#: dialog.cc:178 hexeditorwidget.cc:1515 hexeditorwidget.cc:1529
-#: hexeditorwidget.cc:1597 searchbar.cc:73
-msgid "Find"
-msgstr "Find"
+#: hextoolwidget.cc:50
+msgid "Unsigned 32 bit:"
+msgstr "Unsigned 32 bit:"
 
-#: searchbar.cc:79
-msgid "Backwards"
-msgstr "Backwards"
+#: hextoolwidget.cc:51
+msgid "32 bit float:"
+msgstr "32 bit float:"
 
-#: searchbar.cc:80
-msgid "Ignore case"
-msgstr "Ignore case"
+#: hextoolwidget.cc:51
+msgid "64 bit float:"
+msgstr "64 bit float:"
 
-#: hexmanagerwidget.cc:136
-msgid "Conversion"
-msgstr "Conversion"
+#: converterdialog.cc:81 hextoolwidget.cc:56
+msgid "Hexadecimal:"
+msgstr "Hexadecimal:"
+
+#: converterdialog.cc:85 hextoolwidget.cc:56
+msgid "Octal:"
+msgstr "Octal:"
+
+#: converterdialog.cc:87 hextoolwidget.cc:57
+msgid "Binary:"
+msgstr "Binary:"
+
+#: converterdialog.cc:89 hextoolwidget.cc:57
+msgid "Text:"
+msgstr "Text:"
+
+#: hextoolwidget.cc:96
+msgid "Show little endian decoding"
+msgstr "Show little endian decoding"
+
+#: hextoolwidget.cc:110
+msgid "Show unsigned as hexadecimal"
+msgstr "Show unsigned as hexadecimal"
+
+#: hextoolwidget.cc:122
+msgid "Stream length:"
+msgstr "Stream length:"
+
+#: hextoolwidget.cc:127
+msgid "Fixed 8 Bit"
+msgstr "Fixed 8 Bit"
+
+#: hextoolwidget.cc:132
+msgid "Bit Window"
+msgstr "Bit Window"
+
+#: hextoolwidget.cc:132
+msgid "Bits Window"
+msgstr "Bits Window"
+
+#: optiondialog.cc:105
+msgid "Layout"
+msgstr "Layout"
+
+#: optiondialog.cc:105
+msgid "Data Layout in Editor"
+msgstr "Data Layout in Editor"
+
+#: optiondialog.cc:113
+msgid "Hexadecimal Mode"
+msgstr "Hexadecimal Mode"
+
+#: optiondialog.cc:114
+msgid "Decimal Mode"
+msgstr "Decimal Mode"
+
+#: optiondialog.cc:115
+msgid "Octal Mode"
+msgstr "Octal Mode"
+
+#: optiondialog.cc:116
+msgid "Binary Mode"
+msgstr "Binary Mode"
+
+#: optiondialog.cc:117
+msgid "Text Only Mode"
+msgstr "Text Only Mode"
+
+#: optiondialog.cc:146
+msgid "Default l&ine size [bytes]:"
+msgstr "Default l&ine size [bytes]:"
+
+#: optiondialog.cc:150
+msgid "Colu&mn size [bytes]:"
+msgstr "Colu&mn size [bytes]:"
+
+#: optiondialog.cc:158
+msgid "Line size is &fixed (use scrollbar when required)"
+msgstr "Line size is &fixed (use scrollbar when required)"
+
+#: optiondialog.cc:164
+msgid "Loc&k column at end of line (when column size>1)"
+msgstr "Loc&k column at end of line (when column size>1)"
+
+#: exportdialog.cc:330 optiondialog.cc:175 optiondialog.cc:438
+#: printdialogpage.cc:124 printdialogpage.cc:130
+msgid "None"
+msgstr "None"
+
+#: optiondialog.cc:176
+msgid "Vertical Only"
+msgstr "Vertical Only"
+
+#: optiondialog.cc:177
+msgid "Horizontal Only"
+msgstr "Horizontal Only"
+
+#: optiondialog.cc:178
+msgid "Both Directions"
+msgstr "Both Directions"
+
+#: optiondialog.cc:185
+msgid "&Gridlines between text:"
+msgstr "&Gridlines between text:"
+
+#: optiondialog.cc:203
+msgid "&Left separator width [pixels]:"
+msgstr "&Left separator width [pixels]:"
+
+#: optiondialog.cc:207
+msgid "&Right separator width [pixels]:"
+msgstr "&Right separator width [pixels]:"
+
+#: optiondialog.cc:223
+msgid "&Separator margin width [pixels]:"
+msgstr "&Separator margin width [pixels]:"
+
+#: optiondialog.cc:227
+msgid "&Edge margin width [pixels]:"
+msgstr "&Edge margin width [pixels]:"
+
+#: optiondialog.cc:231
+msgid "Column separation is e&qual to one character"
+msgstr "Column separation is e&qual to one character"
+
+#: optiondialog.cc:244
+msgid "Column separa&tion [pixels]:"
+msgstr "Column separa&tion [pixels]:"
+
+#: optiondialog.cc:257
+msgid "Cursor"
+msgstr "Cursor"
+
+#: optiondialog.cc:258
+msgid "Cursor Behavior (only valid for editor)"
+msgstr "Cursor Behaviour (only valid for editor)"
+
+#: optiondialog.cc:262
+msgid "Blinking"
+msgstr "Blinking"
+
+#: optiondialog.cc:266 optiondialog.cc:267
+msgid "Do not b&link"
+msgstr "Do not b&link"
+
+#: optiondialog.cc:274
+msgid "&Blink interval [ms]:"
+msgstr "&Blink interval [ms]:"
+
+#: optiondialog.cc:284
+msgid "Shape"
+msgstr "Shape"
+
+#: optiondialog.cc:288
+msgid "Always &use block (rectangular) cursor"
+msgstr "Always &use block (rectangular) cursor"
+
+#: optiondialog.cc:294
+msgid "Use &thick cursor in insert mode"
+msgstr "Use &thick cursor in insert mode"
+
+#: optiondialog.cc:299
+msgid "Cursor Behavior When Editor Loses Focus"
+msgstr "Cursor Behaviour When Editor Loses Focus"
+
+#: optiondialog.cc:304
+msgid "&Stop blinking (if blinking is enabled)"
+msgstr "&Stop blinking (if blinking is enabled)"
+
+#: optiondialog.cc:306
+msgid "H&ide"
+msgstr "H&ide"
+
+#: optiondialog.cc:307
+msgid "Do &nothing"
+msgstr "Do &nothing"
+
+#: optiondialog.cc:323
+msgid "Colors"
+msgstr "Colours"
+
+#: optiondialog.cc:324
+msgid "Editor Colors (system selection color is always used)"
+msgstr "Editor Colours (system selection colour is always used)"
+
+#: optiondialog.cc:329
+msgid "&Use system colors (as chosen in Control Center)"
+msgstr "&Use system colours (as chosen in Control Centre)"
+
+#: optiondialog.cc:342
+msgid "First, Third ... Line Background"
+msgstr "First, Third ... Line Background"
+
+#: optiondialog.cc:343
+msgid "Second, Fourth ... Line Background"
+msgstr "Second, Fourth ... Line Background"
+
+#: optiondialog.cc:344
+msgid "Offset Background"
+msgstr "Offset Background"
+
+#: optiondialog.cc:345
+msgid "Inactive Background"
+msgstr "Inactive Background"
+
+#: optiondialog.cc:346
+msgid "Even Column Text"
+msgstr "Even Column Text"
+
+#: optiondialog.cc:347
+msgid "Odd Column Text"
+msgstr "Odd Column Text"
+
+#: optiondialog.cc:348
+msgid "Non Printable Text"
+msgstr "Non Printable Text"
+
+#: optiondialog.cc:349
+msgid "Offset Text"
+msgstr "Offset Text"
+
+#: optiondialog.cc:350
+msgid "Secondary Text"
+msgstr "Secondary Text"
+
+#: optiondialog.cc:351
+msgid "Marked Background"
+msgstr "Marked Background"
+
+#: optiondialog.cc:352
+msgid "Marked Text"
+msgstr "Marked Text"
+
+#: optiondialog.cc:353
+msgid "Cursor Background"
+msgstr "Cursor Background"
+
+#: optiondialog.cc:354
+msgid "Cursor Text (block shape)"
+msgstr "Cursor Text (block shape)"
+
+#: optiondialog.cc:355
+msgid "Bookmark Background"
+msgstr "Bookmark Background"
+
+#: optiondialog.cc:356
+msgid "Bookmark Text"
+msgstr "Bookmark Text"
+
+#: optiondialog.cc:357
+msgid "Separator"
+msgstr "Separator"
+
+#: optiondialog.cc:358
+msgid "Grid Lines"
+msgstr "Grid Lines"
+
+#: optiondialog.cc:376
+msgid "Font Selection (editor can only use a fixed font)"
+msgstr "Font Selection (editor can only use a fixed font)"
+
+#: optiondialog.cc:381
+msgid "&Use system font (as chosen in Control Center)"
+msgstr "&Use system font (as chosen in Control Centre)"
+
+#: optiondialog.cc:398
+msgid "KHexEdit editor font"
+msgstr "KHexEdit editor font"
+
+#: optiondialog.cc:414
+msgid "&Map non printable characters to:"
+msgstr "&Map non printable characters to:"
+
+#: optiondialog.cc:428
+msgid "File Management"
+msgstr "File Management"
+
+#: optiondialog.cc:439
+msgid "Most Recent Document"
+msgstr "Most Recent Document"
+
+#: optiondialog.cc:440
+msgid "All Recent Documents"
+msgstr "All Recent Documents"
+
+#: optiondialog.cc:446
+msgid "Open doc&uments on startup:"
+msgstr "Open doc&uments on startup:"
+
+#: optiondialog.cc:452
+msgid "&Jump to previous cursor position on startup"
+msgstr "&Jump to previous cursor position on startup"
+
+#: optiondialog.cc:466
+msgid "Open document with &write protection enabled"
+msgstr "Open document with &write protection enabled"
+
+#: optiondialog.cc:472
+msgid "&Keep cursor position after reloading document"
+msgstr "&Keep cursor position after reloading document"
+
+#: optiondialog.cc:478
+msgid "&Make a backup when saving document"
+msgstr "&Make a backup when saving document"
+
+#: optiondialog.cc:488
+msgid "Don't &save \"Recent\" document list on exit"
+msgstr "Don't &save \"Recent\" document list on exit"
+
+#: optiondialog.cc:492
+msgid ""
+"Clicking this check box makes KHexEdit forget his recent document list when the "
+"program is closed.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
+msgstr ""
+"Clicking this check box makes KHexEdit forget his recent document list when the "
+"program is closed.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
+
+#: optiondialog.cc:499
+msgid "Cl&ear \"Recent\" Document List"
+msgstr "Cl&ear \"Recent\" Document List"
+
+#: optiondialog.cc:503
+msgid ""
+"Clicking this button makes KHexEdit forget his recent document list.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
+msgstr ""
+"Clicking this button makes KHexEdit forget his recent document list.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
+
+#: optiondialog.cc:520
+msgid "Various Properties"
+msgstr "Various Properties"
+
+#: optiondialog.cc:526
+msgid "Auto&matic copy to clipboard when selection is ready"
+msgstr "Auto&matic copy to clipboard when selection is ready"
+
+#: optiondialog.cc:532
+msgid "&Editor starts in \"insert\" mode"
+msgstr "&Editor starts in \"insert\" mode"
+
+#: optiondialog.cc:538
+msgid "Confirm &wrapping (to beginning or end) during search"
+msgstr "Confirm &wrapping (to beginning or end) during search"
+
+#: optiondialog.cc:544
+msgid "Cursor jumps to &nearest byte when moved"
+msgstr "Cursor jumps to &nearest byte when moved"
+
+#: optiondialog.cc:550
+msgid "Sounds"
+msgstr "Sounds"
+
+#: optiondialog.cc:553
+msgid "Make sound on data &input (eg. typing) failure"
+msgstr "Make sound on data &input (eg. typing) failure"
+
+#: optiondialog.cc:557
+msgid "Make sound on &fatal failure"
+msgstr "Make sound on &fatal failure"
+
+#: optiondialog.cc:562
+msgid "Bookmark Visibility"
+msgstr "Bookmark Visibility"
+
+#: optiondialog.cc:565
+msgid "Use visible bookmarks in the offset column"
+msgstr "Use visible bookmarks in the offset column"
+
+#: optiondialog.cc:569
+msgid "Use visible bookmarks in the editor fields"
+msgstr "Use visible bookmarks in the editor fields"
+
+#: optiondialog.cc:574
+msgid "Confirm when number of printed pages will e&xceed limit"
+msgstr "Confirm when number of printed pages will e&xceed limit"
+
+#: optiondialog.cc:594
+msgid "&Threshold [pages]:"
+msgstr "&Threshold [pages]:"
+
+#: optiondialog.cc:611
+msgid "&Undo limit:"
+msgstr "&Undo limit:"
+
+#: hexerror.cc:32
+msgid "No data"
+msgstr "No data"
+
+#: hexerror.cc:33
+msgid "Insufficient memory"
+msgstr "Insufficient memory"
+
+#: hexerror.cc:34
+msgid "List is full"
+msgstr "List is full"
+
+#: hexerror.cc:35
+msgid "Read operation failed"
+msgstr "Read operation failed"
+
+#: hexerror.cc:36
+msgid "Write operation failed"
+msgstr "Write operation failed"
+
+#: hexerror.cc:37
+msgid "Empty argument"
+msgstr "Empty argument"
+
+#: hexerror.cc:38
+msgid "Illegal argument"
+msgstr "Illegal argument"
+
+#: hexerror.cc:39
+msgid "Null pointer argument"
+msgstr "Null pointer argument"
+
+#: hexerror.cc:40
+msgid "Wrap buffer"
+msgstr "Wrap buffer"
+
+#: hexerror.cc:41
+msgid "No match"
+msgstr "No match"
+
+#: hexerror.cc:42
+msgid "No data is selected"
+msgstr "No data is selected"
+
+#: hexerror.cc:43
+msgid "Empty document"
+msgstr "Empty document"
+
+#: hexerror.cc:44
+msgid "No active document"
+msgstr "No active document"
+
+#: hexerror.cc:45
+msgid "No data is marked"
+msgstr "No data is marked"
+
+#: hexerror.cc:46
+msgid "Document is write protected"
+msgstr "Document is write protected"
+
+#: hexerror.cc:47
+msgid "Document is resize protected"
+msgstr "Document is resize protected"
+
+#: hexerror.cc:48
+msgid "Operation was stopped"
+msgstr "Operation was stopped"
+
+#: hexerror.cc:49
+msgid "Illegal mode"
+msgstr "Illegal mode"
+
+#: hexerror.cc:50
+msgid "Program is busy, try again later"
+msgstr "Program is busy, try again later"
+
+#: hexerror.cc:51
+msgid "Value is not within valid range"
+msgstr "Value is not within valid range"
+
+#: hexerror.cc:52
+msgid "Operation was aborted"
+msgstr "Operation was aborted"
+
+#: hexerror.cc:53
+msgid "File could not be opened for writing"
+msgstr "File could not be opened for writing"
+
+#: hexerror.cc:54
+msgid "File could not be opened for reading"
+msgstr "File could not be opened for reading"
+
+#: hexerror.cc:60
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: chartabledialog.cc:37
+msgid "Character Table"
+msgstr "Character Table"
+
+#: chartabledialog.cc:70
+msgid "Insert this number of characters:"
+msgstr "Insert this number of characters:"
 
 #: main.cc:34
 msgid "TDE hex editor"
@@ -250,395 +839,332 @@ msgstr ""
 "Edward Livingston-Blade, [email protected], has given me very good\n"
 "reports which removed some nasty bugs.\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "John Knight"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: stringdialog.cc:38 stringdialog.cc:201
-msgid "Extract Strings"
-msgstr "Extract Strings"
-
-#: stringdialog.cc:57
-msgid "&Minimum length:"
-msgstr "&Minimum length:"
-
-#: stringdialog.cc:66
-msgid "&Filter:"
-msgstr "&Filter:"
-
-#: stringdialog.cc:71
-msgid "&Use"
-msgstr "&Use"
-
-#: stringdialog.cc:80
-msgid "&Ignore case"
-msgstr "&Ignore case"
-
-#: stringdialog.cc:84
-msgid "Show offset as &decimal"
-msgstr "Show offset as &decimal"
-
-#: hexviewwidget.cc:1102 stringdialog.cc:95
-msgid "Offset"
-msgstr "Offset"
-
-#: stringdialog.cc:96
-msgid "String"
-msgstr "String"
-
-#: stringdialog.cc:106
-msgid "Number of strings:"
-msgstr "Number of strings:"
-
-#: stringdialog.cc:114
-msgid "Displayed:"
-msgstr "Displayed:"
-
-#: stringdialog.cc:197
-msgid ""
-"The filter expression you have specified is illegal. You must specify a valid "
-"regular expression.\n"
-"Continue without filter?"
-msgstr ""
-"The filter expression you have specified is illegal. You must specify a valid "
-"regular expression.\n"
-"Continue without filter?"
-
-#: fileinfodialog.cc:160 stringdialog.cc:254
-msgid "Warning: Document has been modified since last update"
-msgstr "Warning: Document has been modified since last update"
-
-#: statusbarprogress.cc:268
-msgid "%1... %2 of %3"
-msgstr "%1... %2 of %3"
-
-#: statusbarprogress.cc:272
-msgid "%1... %2%"
-msgstr "%1... %2%"
+#: printdialogpage.cc:38
+msgid "Page Layout"
+msgstr "Page Layout"
 
-#: dialog.cc:44
-msgid "Goto Offset"
-msgstr "Goto Offset"
+#: printdialogpage.cc:59
+msgid "Margins [millimeter]"
+msgstr "Margins [millimetre]"
 
-#: dialog.cc:60
-msgid "O&ffset:"
-msgstr "O&ffset:"
+#: printdialogpage.cc:72
+msgid "&Top:"
+msgstr "&Top:"
 
-#: dialog.cc:73 dialog.cc:223 dialog.cc:564 dialog.cc:810
-msgid "&From cursor"
-msgstr "&From cursor"
+#: printdialogpage.cc:73
+msgid "&Bottom:"
+msgstr "&Bottom:"
 
-#: dialog.cc:75 dialog.cc:225 dialog.cc:566 dialog.cc:812
-msgid "&Backwards"
-msgstr "&Backwards"
+#: printdialogpage.cc:74
+msgid "&Left:"
+msgstr "&Left:"
 
-#: dialog.cc:77 dialog.cc:816
-msgid "&Stay visible"
-msgstr "&Stay visible"
+#: printdialogpage.cc:75
+msgid "&Right:"
+msgstr "&Right:"
 
-#: dialog.cc:194
-msgid "Fo&rmat:"
-msgstr "Fo&rmat:"
+#: printdialogpage.cc:102
+msgid "Draw h&eader above text"
+msgstr "Draw h&eader above text"
 
-#: dialog.cc:209 dialog.cc:520
-msgid "F&ind:"
-msgstr "F&ind:"
+#: printdialogpage.cc:118
+msgid "Left:"
+msgstr "Left:"
 
-#: dialog.cc:227 dialog.cc:568 dialog.cc:814
-msgid "&In selection"
-msgstr "&In selection"
+#: printdialogpage.cc:119
+msgid "Center:"
+msgstr "Centre:"
 
-#: dialog.cc:229
-msgid "&Use navigator"
-msgstr "&Use navigator"
+#: printdialogpage.cc:120
+msgid "Right:"
+msgstr "Right:"
 
-#: dialog.cc:231 dialog.cc:572
-msgid "Ignore c&ase"
-msgstr "Ignore c&ase"
+#: printdialogpage.cc:121
+msgid "Border:"
+msgstr "Border:"
 
-#: dialog.cc:348
-msgid "Find (Navigator)"
-msgstr "Find (Navigator)"
+#: printdialogpage.cc:125
+msgid "Date & Time"
+msgstr "Date & Time"
 
-#: dialog.cc:349
-msgid "New &Key"
-msgstr "New &Key"
+#: exportdialog.cc:333 printdialogpage.cc:126
+msgid "Page Number"
+msgstr "Page Number"
 
-#: dialog.cc:350
-msgid "&Next"
-msgstr "&Next"
+#: exportdialog.cc:332 printdialogpage.cc:127
+msgid "Filename"
+msgstr "Filename"
 
-#: dialog.cc:362
-msgid "Searching for:"
-msgstr "Searching for:"
+#: printdialogpage.cc:131
+msgid "Single Line"
+msgstr "Single Line"
 
-#: dialog.cc:485 dialog.cc:681 hexeditorwidget.cc:1768 hexeditorwidget.cc:1775
-msgid "Find & Replace"
-msgstr "Find & Replace"
+#: printdialogpage.cc:132
+msgid "Rectangle"
+msgstr "Rectangle"
 
-#: dialog.cc:504
-msgid "Fo&rmat (find):"
-msgstr "Fo&rmat (find):"
+#: printdialogpage.cc:164
+msgid "Draw &footer below text"
+msgstr "Draw &footer below text"
 
-#: dialog.cc:533
-msgid "For&mat (replace):"
-msgstr "For&mat (replace):"
+#: searchbar.cc:63 toplevel.cc:862
+msgid "Hex"
+msgstr "Hex"
 
-#: dialog.cc:550
-msgid "Rep&lace:"
-msgstr "Rep&lace:"
+#: searchbar.cc:63 toplevel.cc:866
+msgid "Dec"
+msgstr "Dec"
 
-#: dialog.cc:570
-msgid "&Prompt"
-msgstr "&Prompt"
+#: searchbar.cc:63 toplevel.cc:870
+msgid "Oct"
+msgstr "Oct"
 
-#: dialog.cc:657
-msgid "Source and target values can not be equal."
-msgstr "Source and target values can not be equal."
+#: searchbar.cc:63 toplevel.cc:874
+msgid "Bin"
+msgstr "Bin"
 
-#: dialog.cc:682
-msgid "Replace &All"
-msgstr "Replace &All"
+#: searchbar.cc:64 toplevel.cc:878
+msgid "Txt"
+msgstr "Txt"
 
-#: dialog.cc:683
-msgid "Do Not Replace"
-msgstr "Do Not Replace"
+#: dialog.cc:178 hexeditorwidget.cc:1515 hexeditorwidget.cc:1529
+#: hexeditorwidget.cc:1597 searchbar.cc:73
+msgid "Find"
+msgstr "Find"
 
-#: dialog.cc:691
-msgid "Replace marked data at cursor position?"
-msgstr "Replace marked data at cursor position?"
+#: searchbar.cc:79
+msgid "Backwards"
+msgstr "Backwards"
 
-#: dialog.cc:761
-msgid "Binary Filter"
-msgstr "Binary Filter"
+#: searchbar.cc:80
+msgid "Ignore case"
+msgstr "Ignore case"
 
-#: dialog.cc:780
-msgid "O&peration:"
-msgstr "O&peration:"
+#: conversion.cc:48
+msgid ""
+"_: Default encoding\n"
+"Default"
+msgstr "Default"
 
-#: dialog.cc:855
-msgid "Fo&rmat (operand):"
-msgstr "Fo&rmat (operand):"
+#: conversion.cc:49
+msgid "EBCDIC"
+msgstr "EBCDIC"
 
-#: dialog.cc:871
-msgid "O&perand:"
-msgstr "O&perand:"
+#: conversion.cc:50
+msgid "US-ASCII (7 bit)"
+msgstr "US-ASCII (7 bit)"
 
-#: dialog.cc:891
-msgid "Swap rule"
-msgstr "Swap rule"
+#: conversion.cc:51
+msgid "Unknown"
+msgstr "Unknown"
 
-#: dialog.cc:903
-msgid "&Reset"
-msgstr "&Reset"
+#: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
+#: exportdialog.cc:566 exportdialog.cc:634
+msgid "Export Document"
+msgstr "Export Document"
 
-#: dialog.cc:929
-msgid "&Group size [bytes]"
-msgstr "&Group size [bytes]"
+#: exportdialog.cc:40
+msgid "Destination"
+msgstr "Destination"
 
-#: dialog.cc:941
-msgid "S&hift size [bits]"
-msgstr "S&hift size [bits]"
+#: exportdialog.cc:158
+msgid "Plain Text"
+msgstr "Plain Text"
 
-#: dialog.cc:985
-msgid "Shift size is zero."
-msgstr "Shift size is zero."
+#: exportdialog.cc:159
+msgid "HTML Tables"
+msgstr "HTML Tables"
 
-#: dialog.cc:994
-msgid "Swap rule does not define any swapping."
-msgstr "Swap rule does not define any swapping."
+#: exportdialog.cc:160
+msgid "Rich Text (RTF)"
+msgstr "Rich Text (RTF)"
 
-#: dialog.cc:1070
-msgid "Insert Pattern"
-msgstr "Insert Pattern"
+#: exportdialog.cc:161
+msgid "C Array"
+msgstr "C Array"
 
-#: dialog.cc:1089
-msgid "&Size:"
-msgstr "&Size:"
+#: exportdialog.cc:169
+msgid "&Format:"
+msgstr "&Format:"
 
-#: dialog.cc:1102
-msgid "Fo&rmat (pattern):"
-msgstr "Fo&rmat (pattern):"
+#: exportdialog.cc:177
+msgid "&Destination:"
+msgstr "&Destination:"
 
-#: dialog.cc:1118
-msgid "&Pattern:"
-msgstr "&Pattern:"
+#: exportdialog.cc:181
+msgid "(Package folder)"
+msgstr "(Package folder)"
 
-#: dialog.cc:1127
-msgid "&Offset:"
-msgstr "&Offset:"
+#: exportdialog.cc:191
+msgid "Choose..."
+msgstr "Choose..."
 
-#: dialog.cc:1142
-msgid "R&epeat pattern"
-msgstr "R&epeat pattern"
+#: exportdialog.cc:202
+msgid "Export Range"
+msgstr "Export Range"
 
-#: dialog.cc:1144
-msgid "&Insert on cursor position"
-msgstr "&Insert on cursor position"
+#: exportdialog.cc:210
+msgid "&Everything"
+msgstr "&Everything"
 
-#: dialog.cc:1284
-msgid "Your request can not be processed."
-msgstr "Your request can not be processed."
+#: exportdialog.cc:215
+msgid "&Selection"
+msgstr "&Selection"
 
-#: dialog.cc:1288
-msgid "Examine argument(s) and try again."
-msgstr "Examine argument(s) and try again."
+#: exportdialog.cc:220
+msgid "&Range"
+msgstr "&Range"
 
-#: dialog.cc:1294
-msgid "Invalid argument(s)"
-msgstr "Invalid argument(s)"
+#: exportdialog.cc:229
+msgid "&From offset:"
+msgstr "&From offset:"
 
-#: dialog.cc:1303
-msgid "You must specify a destination file."
-msgstr "You must specify a destination file."
+#: exportdialog.cc:235
+msgid "&To offset:"
+msgstr "&To offset:"
 
-#: dialog.cc:1313
-msgid "You have specified an existing folder."
-msgstr "You have specified an existing folder."
+#: exportdialog.cc:280 exportdialog.cc:374
+msgid "No options for this format."
+msgstr "No options for this format."
 
-#: dialog.cc:1320
-msgid "You do not have write permission to this file."
-msgstr "You do not have write permission to this file."
+#: exportdialog.cc:296
+msgid "HTML Options (one table per page)"
+msgstr "HTML Options (one table per page)"
 
-#: dialog.cc:1325
-msgid ""
-"You have specified an existing file.\n"
-"Overwrite current file?"
-msgstr ""
-"You have specified an existing file.\n"
-"Overwrite current file?"
+#: exportdialog.cc:317
+msgid "&Lines per table:"
+msgstr "&Lines per table:"
 
-#: dialog.cc:1328 hexeditorwidget.cc:990
-msgid "Overwrite"
-msgstr "Overwrite"
+#: exportdialog.cc:325
+msgid "Filename &prefix (in package):"
+msgstr "Filename &prefix (in package):"
 
-#: dialog.cc:1405
-msgid "Regular Text"
-msgstr "Regular Text"
+#: exportdialog.cc:331
+msgid "Filename with Path"
+msgstr "Filename with Path"
 
-#: dialog.cc:1416
-msgid "operand AND data"
-msgstr "operand AND data"
+#: exportdialog.cc:339
+msgid "Header &above text:"
+msgstr "Header &above text:"
 
-#: dialog.cc:1417
-msgid "operand OR data"
-msgstr "operand OR data"
+#: exportdialog.cc:347
+msgid "&Footer below text:"
+msgstr "&Footer below text:"
 
-#: dialog.cc:1418
-msgid "operand XOR data"
-msgstr "operand XOR data"
+#: exportdialog.cc:351
+msgid "Link \"index.html\" to &table of contents file"
+msgstr "Link \"index.html\" to &table of contents file"
 
-#: dialog.cc:1419
-msgid "INVERT data"
-msgstr "INVERT data"
+#: exportdialog.cc:355
+msgid "&Include navigator bar"
+msgstr "&Include navigator bar"
 
-#: dialog.cc:1420
-msgid "REVERSE data"
-msgstr "REVERSE data"
+#: exportdialog.cc:359
+msgid "&Use black and white only"
+msgstr "&Use black and white only"
 
-#: dialog.cc:1421
-msgid "ROTATE data"
-msgstr "ROTATE data"
+#: exportdialog.cc:388
+msgid "C Array Options"
+msgstr "C Array Options"
 
-#: dialog.cc:1422
-msgid "SHIFT data"
-msgstr "SHIFT data"
+#: exportdialog.cc:402
+msgid "Array name:"
+msgstr "Array name:"
 
-#: dialog.cc:1423
-msgid "Swap Individual Bits"
-msgstr "Swap Individual Bits"
+#: exportdialog.cc:407
+msgid "char"
+msgstr "char"
 
-#: hextoolwidget.cc:44
-msgid "Signed 8 bit:"
-msgstr "Signed 8 bit:"
+#: exportdialog.cc:408
+msgid "unsigned char"
+msgstr "unsigned char"
 
-#: hextoolwidget.cc:44
-msgid "Unsigned 8 bit:"
-msgstr "Unsigned 8 bit:"
+#: exportdialog.cc:409
+msgid "short"
+msgstr "short"
 
-#: hextoolwidget.cc:45
-msgid "Signed 16 bit:"
-msgstr "Signed 16 bit:"
+#: exportdialog.cc:410
+msgid "unsigned short"
+msgstr "unsigned short"
 
-#: hextoolwidget.cc:45
-msgid "Unsigned 16 bit:"
-msgstr "Unsigned 16 bit:"
+#: exportdialog.cc:411
+msgid "int"
+msgstr "int"
 
-#: hextoolwidget.cc:50
-msgid "Signed 32 bit:"
-msgstr "Signed 32 bit:"
+#: exportdialog.cc:412
+msgid "unsigned int"
+msgstr "unsigned int"
 
-#: hextoolwidget.cc:50
-msgid "Unsigned 32 bit:"
-msgstr "Unsigned 32 bit:"
+#: exportdialog.cc:413
+msgid "float"
+msgstr "float"
 
-#: hextoolwidget.cc:51
-msgid "32 bit float:"
-msgstr "32 bit float:"
+#: exportdialog.cc:414
+msgid "double"
+msgstr "double"
 
-#: hextoolwidget.cc:51
-msgid "64 bit float:"
-msgstr "64 bit float:"
+#: exportdialog.cc:419
+msgid "Element type:"
+msgstr "Element type:"
 
-#: converterdialog.cc:81 hextoolwidget.cc:56
-msgid "Hexadecimal:"
-msgstr "Hexadecimal:"
+#: exportdialog.cc:427
+msgid "Elements per line:"
+msgstr "Elements per line:"
 
-#: converterdialog.cc:85 hextoolwidget.cc:56
-msgid "Octal:"
-msgstr "Octal:"
+#: exportdialog.cc:431
+msgid "Print unsigned values as hexadecimal"
+msgstr "Print unsigned values as hexadecimal"
 
-#: converterdialog.cc:87 hextoolwidget.cc:57
-msgid "Binary:"
-msgstr "Binary:"
+#: exportdialog.cc:535
+msgid "The filename prefix can not contain empty letters or punctuation marks."
+msgstr ""
+"The filename prefix can not contain empty letters or punctuation marks."
 
-#: converterdialog.cc:89 hextoolwidget.cc:57
-msgid "Text:"
-msgstr "Text:"
+#: exportdialog.cc:561
+msgid "This format is not yet supported."
+msgstr "This format is not yet supported."
 
-#: hextoolwidget.cc:96
-msgid "Show little endian decoding"
-msgstr "Show little endian decoding"
+#: exportdialog.cc:638
+msgid "You must specify a destination."
+msgstr "You must specify a destination."
 
-#: hextoolwidget.cc:110
-msgid "Show unsigned as hexadecimal"
-msgstr "Show unsigned as hexadecimal"
+#: exportdialog.cc:650
+msgid "Unable to create a new folder"
+msgstr "Unable to create a new folder"
 
-#: hextoolwidget.cc:122
-msgid "Stream length:"
-msgstr "Stream length:"
+#: exportdialog.cc:661
+msgid "You have specified an existing file"
+msgstr "You have specified an existing file"
 
-#: hextoolwidget.cc:127
-msgid "Fixed 8 Bit"
-msgstr "Fixed 8 Bit"
+#: exportdialog.cc:669
+msgid "You do not have write permission to this folder."
+msgstr "You do not have write permission to this folder."
 
-#: hextoolwidget.cc:132
-msgid "Bit Window"
-msgstr "Bit Window"
+#: exportdialog.cc:679
+msgid ""
+"You have specified an existing folder.\n"
+"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
+"Continue?"
+msgstr ""
+"You have specified an existing folder.\n"
+"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
+"Continue?"
 
-#: hextoolwidget.cc:132
-msgid "Bits Window"
-msgstr "Bits Window"
+#: hexviewwidget.cc:1128
+msgid "Remove Bookmark"
+msgstr "Remove Bookmark"
 
-#: converterdialog.cc:71
-msgid "Converter"
-msgstr "Converter"
+#: hexviewwidget.cc:1158
+msgid "Replace Bookmark"
+msgstr "Replace Bookmark"
 
-#: converterdialog.cc:72
-msgid "&On Cursor"
-msgstr "&On Cursor"
+#: statusbarprogress.cc:268
+msgid "%1... %2 of %3"
+msgstr "%1... %2 of %3"
 
-#: converterdialog.cc:83
-msgid "Decimal:"
-msgstr "Decimal:"
+#: statusbarprogress.cc:272
+msgid "%1... %2%"
+msgstr "%1... %2%"
 
 #: toplevel.cc:133
 msgid "&Insert..."
@@ -884,119 +1410,249 @@ msgstr "Encoding: %1"
 msgid "Selection:"
 msgstr "Selection:"
 
-#: hexerror.cc:32
-msgid "No data"
-msgstr "No data"
+#: converterdialog.cc:71
+msgid "Converter"
+msgstr "Converter"
 
-#: hexerror.cc:33
-msgid "Insufficient memory"
-msgstr "Insufficient memory"
+#: converterdialog.cc:72
+msgid "&On Cursor"
+msgstr "&On Cursor"
 
-#: hexerror.cc:34
-msgid "List is full"
-msgstr "List is full"
+#: converterdialog.cc:83
+msgid "Decimal:"
+msgstr "Decimal:"
 
-#: hexerror.cc:35
-msgid "Read operation failed"
-msgstr "Read operation failed"
+#: dialog.cc:44
+msgid "Goto Offset"
+msgstr "Goto Offset"
 
-#: hexerror.cc:36
-msgid "Write operation failed"
-msgstr "Write operation failed"
+#: dialog.cc:60
+msgid "O&ffset:"
+msgstr "O&ffset:"
 
-#: hexerror.cc:37
-msgid "Empty argument"
-msgstr "Empty argument"
+#: dialog.cc:73 dialog.cc:223 dialog.cc:564 dialog.cc:810
+msgid "&From cursor"
+msgstr "&From cursor"
 
-#: hexerror.cc:38
-msgid "Illegal argument"
-msgstr "Illegal argument"
+#: dialog.cc:75 dialog.cc:225 dialog.cc:566 dialog.cc:812
+msgid "&Backwards"
+msgstr "&Backwards"
 
-#: hexerror.cc:39
-msgid "Null pointer argument"
-msgstr "Null pointer argument"
+#: dialog.cc:77 dialog.cc:816
+msgid "&Stay visible"
+msgstr "&Stay visible"
 
-#: hexerror.cc:40
-msgid "Wrap buffer"
-msgstr "Wrap buffer"
+#: dialog.cc:194
+msgid "Fo&rmat:"
+msgstr "Fo&rmat:"
 
-#: hexerror.cc:41
-msgid "No match"
-msgstr "No match"
+#: dialog.cc:209 dialog.cc:520
+msgid "F&ind:"
+msgstr "F&ind:"
 
-#: hexerror.cc:42
-msgid "No data is selected"
-msgstr "No data is selected"
+#: dialog.cc:227 dialog.cc:568 dialog.cc:814
+msgid "&In selection"
+msgstr "&In selection"
 
-#: hexerror.cc:43
-msgid "Empty document"
-msgstr "Empty document"
+#: dialog.cc:229
+msgid "&Use navigator"
+msgstr "&Use navigator"
 
-#: hexerror.cc:44
-msgid "No active document"
-msgstr "No active document"
+#: dialog.cc:231 dialog.cc:572
+msgid "Ignore c&ase"
+msgstr "Ignore c&ase"
 
-#: hexerror.cc:45
-msgid "No data is marked"
-msgstr "No data is marked"
+#: dialog.cc:348
+msgid "Find (Navigator)"
+msgstr "Find (Navigator)"
 
-#: hexerror.cc:46
-msgid "Document is write protected"
-msgstr "Document is write protected"
+#: dialog.cc:349
+msgid "New &Key"
+msgstr "New &Key"
 
-#: hexerror.cc:47
-msgid "Document is resize protected"
-msgstr "Document is resize protected"
+#: dialog.cc:350
+msgid "&Next"
+msgstr "&Next"
 
-#: hexerror.cc:48
-msgid "Operation was stopped"
-msgstr "Operation was stopped"
+#: dialog.cc:362
+msgid "Searching for:"
+msgstr "Searching for:"
 
-#: hexerror.cc:49
-msgid "Illegal mode"
-msgstr "Illegal mode"
+#: dialog.cc:485 dialog.cc:681 hexeditorwidget.cc:1768 hexeditorwidget.cc:1775
+msgid "Find & Replace"
+msgstr "Find & Replace"
 
-#: hexerror.cc:50
-msgid "Program is busy, try again later"
-msgstr "Program is busy, try again later"
+#: dialog.cc:504
+msgid "Fo&rmat (find):"
+msgstr "Fo&rmat (find):"
 
-#: hexerror.cc:51
-msgid "Value is not within valid range"
-msgstr "Value is not within valid range"
+#: dialog.cc:533
+msgid "For&mat (replace):"
+msgstr "For&mat (replace):"
 
-#: hexerror.cc:52
-msgid "Operation was aborted"
-msgstr "Operation was aborted"
+#: dialog.cc:550
+msgid "Rep&lace:"
+msgstr "Rep&lace:"
 
-#: hexerror.cc:53
-msgid "File could not be opened for writing"
-msgstr "File could not be opened for writing"
+#: dialog.cc:570
+msgid "&Prompt"
+msgstr "&Prompt"
 
-#: hexerror.cc:54
-msgid "File could not be opened for reading"
-msgstr "File could not be opened for reading"
+#: dialog.cc:657
+msgid "Source and target values can not be equal."
+msgstr "Source and target values can not be equal."
 
-#: hexerror.cc:60
-msgid "Unknown error"
-msgstr "Unknown error"
+#: dialog.cc:682
+msgid "Replace &All"
+msgstr "Replace &All"
 
-#: conversion.cc:48
+#: dialog.cc:683
+msgid "Do Not Replace"
+msgstr "Do Not Replace"
+
+#: dialog.cc:691
+msgid "Replace marked data at cursor position?"
+msgstr "Replace marked data at cursor position?"
+
+#: dialog.cc:761
+msgid "Binary Filter"
+msgstr "Binary Filter"
+
+#: dialog.cc:780
+msgid "O&peration:"
+msgstr "O&peration:"
+
+#: dialog.cc:855
+msgid "Fo&rmat (operand):"
+msgstr "Fo&rmat (operand):"
+
+#: dialog.cc:871
+msgid "O&perand:"
+msgstr "O&perand:"
+
+#: dialog.cc:891
+msgid "Swap rule"
+msgstr "Swap rule"
+
+#: dialog.cc:903
+msgid "&Reset"
+msgstr "&Reset"
+
+#: dialog.cc:929
+msgid "&Group size [bytes]"
+msgstr "&Group size [bytes]"
+
+#: dialog.cc:941
+msgid "S&hift size [bits]"
+msgstr "S&hift size [bits]"
+
+#: dialog.cc:985
+msgid "Shift size is zero."
+msgstr "Shift size is zero."
+
+#: dialog.cc:994
+msgid "Swap rule does not define any swapping."
+msgstr "Swap rule does not define any swapping."
+
+#: dialog.cc:1070
+msgid "Insert Pattern"
+msgstr "Insert Pattern"
+
+#: dialog.cc:1089
+msgid "&Size:"
+msgstr "&Size:"
+
+#: dialog.cc:1102
+msgid "Fo&rmat (pattern):"
+msgstr "Fo&rmat (pattern):"
+
+#: dialog.cc:1118
+msgid "&Pattern:"
+msgstr "&Pattern:"
+
+#: dialog.cc:1127
+msgid "&Offset:"
+msgstr "&Offset:"
+
+#: dialog.cc:1142
+msgid "R&epeat pattern"
+msgstr "R&epeat pattern"
+
+#: dialog.cc:1144
+msgid "&Insert on cursor position"
+msgstr "&Insert on cursor position"
+
+#: dialog.cc:1284
+msgid "Your request can not be processed."
+msgstr "Your request can not be processed."
+
+#: dialog.cc:1288
+msgid "Examine argument(s) and try again."
+msgstr "Examine argument(s) and try again."
+
+#: dialog.cc:1294
+msgid "Invalid argument(s)"
+msgstr "Invalid argument(s)"
+
+#: dialog.cc:1303
+msgid "You must specify a destination file."
+msgstr "You must specify a destination file."
+
+#: dialog.cc:1313
+msgid "You have specified an existing folder."
+msgstr "You have specified an existing folder."
+
+#: dialog.cc:1320
+msgid "You do not have write permission to this file."
+msgstr "You do not have write permission to this file."
+
+#: dialog.cc:1325
 msgid ""
-"_: Default encoding\n"
-"Default"
-msgstr "Default"
+"You have specified an existing file.\n"
+"Overwrite current file?"
+msgstr ""
+"You have specified an existing file.\n"
+"Overwrite current file?"
 
-#: conversion.cc:49
-msgid "EBCDIC"
-msgstr "EBCDIC"
+#: dialog.cc:1328 hexeditorwidget.cc:990
+msgid "Overwrite"
+msgstr "Overwrite"
 
-#: conversion.cc:50
-msgid "US-ASCII (7 bit)"
-msgstr "US-ASCII (7 bit)"
+#: dialog.cc:1405
+msgid "Regular Text"
+msgstr "Regular Text"
 
-#: conversion.cc:51
-msgid "Unknown"
-msgstr "Unknown"
+#: dialog.cc:1416
+msgid "operand AND data"
+msgstr "operand AND data"
+
+#: dialog.cc:1417
+msgid "operand OR data"
+msgstr "operand OR data"
+
+#: dialog.cc:1418
+msgid "operand XOR data"
+msgstr "operand XOR data"
+
+#: dialog.cc:1419
+msgid "INVERT data"
+msgstr "INVERT data"
+
+#: dialog.cc:1420
+msgid "REVERSE data"
+msgstr "REVERSE data"
+
+#: dialog.cc:1421
+msgid "ROTATE data"
+msgstr "ROTATE data"
+
+#: dialog.cc:1422
+msgid "SHIFT data"
+msgstr "SHIFT data"
+
+#: dialog.cc:1423
+msgid "Swap Individual Bits"
+msgstr "Swap Individual Bits"
 
 #: hexeditorwidget.cc:583
 #, c-format
@@ -1416,661 +2072,6 @@ msgid ""
 msgstr ""
 "Could not finish operation.\n"
 
-#: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
-#: exportdialog.cc:566 exportdialog.cc:634
-msgid "Export Document"
-msgstr "Export Document"
-
-#: exportdialog.cc:40
-msgid "Destination"
-msgstr "Destination"
-
-#: exportdialog.cc:158
-msgid "Plain Text"
-msgstr "Plain Text"
-
-#: exportdialog.cc:159
-msgid "HTML Tables"
-msgstr "HTML Tables"
-
-#: exportdialog.cc:160
-msgid "Rich Text (RTF)"
-msgstr "Rich Text (RTF)"
-
-#: exportdialog.cc:161
-msgid "C Array"
-msgstr "C Array"
-
-#: exportdialog.cc:169
-msgid "&Format:"
-msgstr "&Format:"
-
-#: exportdialog.cc:177
-msgid "&Destination:"
-msgstr "&Destination:"
-
-#: exportdialog.cc:181
-msgid "(Package folder)"
-msgstr "(Package folder)"
-
-#: exportdialog.cc:191
-msgid "Choose..."
-msgstr "Choose..."
-
-#: exportdialog.cc:202
-msgid "Export Range"
-msgstr "Export Range"
-
-#: exportdialog.cc:210
-msgid "&Everything"
-msgstr "&Everything"
-
-#: exportdialog.cc:215
-msgid "&Selection"
-msgstr "&Selection"
-
-#: exportdialog.cc:220
-msgid "&Range"
-msgstr "&Range"
-
-#: exportdialog.cc:229
-msgid "&From offset:"
-msgstr "&From offset:"
-
-#: exportdialog.cc:235
-msgid "&To offset:"
-msgstr "&To offset:"
-
-#: exportdialog.cc:280 exportdialog.cc:374
-msgid "No options for this format."
-msgstr "No options for this format."
-
-#: exportdialog.cc:296
-msgid "HTML Options (one table per page)"
-msgstr "HTML Options (one table per page)"
-
-#: exportdialog.cc:317
-msgid "&Lines per table:"
-msgstr "&Lines per table:"
-
-#: exportdialog.cc:325
-msgid "Filename &prefix (in package):"
-msgstr "Filename &prefix (in package):"
-
-#: exportdialog.cc:330 optiondialog.cc:175 optiondialog.cc:438
-#: printdialogpage.cc:124 printdialogpage.cc:130
-msgid "None"
-msgstr "None"
-
-#: exportdialog.cc:331
-msgid "Filename with Path"
-msgstr "Filename with Path"
-
-#: exportdialog.cc:332 printdialogpage.cc:127
-msgid "Filename"
-msgstr "Filename"
-
-#: exportdialog.cc:333 printdialogpage.cc:126
-msgid "Page Number"
-msgstr "Page Number"
-
-#: exportdialog.cc:339
-msgid "Header &above text:"
-msgstr "Header &above text:"
-
-#: exportdialog.cc:347
-msgid "&Footer below text:"
-msgstr "&Footer below text:"
-
-#: exportdialog.cc:351
-msgid "Link \"index.html\" to &table of contents file"
-msgstr "Link \"index.html\" to &table of contents file"
-
-#: exportdialog.cc:355
-msgid "&Include navigator bar"
-msgstr "&Include navigator bar"
-
-#: exportdialog.cc:359
-msgid "&Use black and white only"
-msgstr "&Use black and white only"
-
-#: exportdialog.cc:388
-msgid "C Array Options"
-msgstr "C Array Options"
-
-#: exportdialog.cc:402
-msgid "Array name:"
-msgstr "Array name:"
-
-#: exportdialog.cc:407
-msgid "char"
-msgstr "char"
-
-#: exportdialog.cc:408
-msgid "unsigned char"
-msgstr "unsigned char"
-
-#: exportdialog.cc:409
-msgid "short"
-msgstr "short"
-
-#: exportdialog.cc:410
-msgid "unsigned short"
-msgstr "unsigned short"
-
-#: exportdialog.cc:411
-msgid "int"
-msgstr "int"
-
-#: exportdialog.cc:412
-msgid "unsigned int"
-msgstr "unsigned int"
-
-#: exportdialog.cc:413
-msgid "float"
-msgstr "float"
-
-#: exportdialog.cc:414
-msgid "double"
-msgstr "double"
-
-#: exportdialog.cc:419
-msgid "Element type:"
-msgstr "Element type:"
-
-#: exportdialog.cc:427
-msgid "Elements per line:"
-msgstr "Elements per line:"
-
-#: exportdialog.cc:431
-msgid "Print unsigned values as hexadecimal"
-msgstr "Print unsigned values as hexadecimal"
-
-#: exportdialog.cc:535
-msgid "The filename prefix can not contain empty letters or punctuation marks."
-msgstr ""
-"The filename prefix can not contain empty letters or punctuation marks."
-
-#: exportdialog.cc:561
-msgid "This format is not yet supported."
-msgstr "This format is not yet supported."
-
-#: exportdialog.cc:638
-msgid "You must specify a destination."
-msgstr "You must specify a destination."
-
-#: exportdialog.cc:650
-msgid "Unable to create a new folder"
-msgstr "Unable to create a new folder"
-
-#: exportdialog.cc:661
-msgid "You have specified an existing file"
-msgstr "You have specified an existing file"
-
-#: exportdialog.cc:669
-msgid "You do not have write permission to this folder."
-msgstr "You do not have write permission to this folder."
-
-#: exportdialog.cc:679
-msgid ""
-"You have specified an existing folder.\n"
-"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
-"Continue?"
-msgstr ""
-"You have specified an existing folder.\n"
-"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
-"Continue?"
-
-#: hexviewwidget.cc:1128
-msgid "Remove Bookmark"
-msgstr "Remove Bookmark"
-
-#: hexviewwidget.cc:1158
-msgid "Replace Bookmark"
-msgstr "Replace Bookmark"
-
-#: hexbuffer.cc:1925 hexbuffer.cc:4832
-msgid "Page %1 of %2"
-msgstr "Page %1 of %2"
-
-#: hexbuffer.cc:2852
-msgid "to"
-msgstr "to"
-
-#: hexbuffer.cc:4853 hexbuffer.cc:4858
-msgid "Next"
-msgstr "Next"
-
-#: hexbuffer.cc:4863 hexbuffer.cc:4868
-msgid "Previous"
-msgstr "Previous"
-
-#: hexbuffer.cc:4886
-msgid "Generated by khexedit"
-msgstr "Generated by khexedit"
-
-#: printdialogpage.cc:38
-msgid "Page Layout"
-msgstr "Page Layout"
-
-#: printdialogpage.cc:59
-msgid "Margins [millimeter]"
-msgstr "Margins [millimetre]"
-
-#: printdialogpage.cc:72
-msgid "&Top:"
-msgstr "&Top:"
-
-#: printdialogpage.cc:73
-msgid "&Bottom:"
-msgstr "&Bottom:"
-
-#: printdialogpage.cc:74
-msgid "&Left:"
-msgstr "&Left:"
-
-#: printdialogpage.cc:75
-msgid "&Right:"
-msgstr "&Right:"
-
-#: printdialogpage.cc:102
-msgid "Draw h&eader above text"
-msgstr "Draw h&eader above text"
-
-#: printdialogpage.cc:118
-msgid "Left:"
-msgstr "Left:"
-
-#: printdialogpage.cc:119
-msgid "Center:"
-msgstr "Centre:"
-
-#: printdialogpage.cc:120
-msgid "Right:"
-msgstr "Right:"
-
-#: printdialogpage.cc:121
-msgid "Border:"
-msgstr "Border:"
-
-#: printdialogpage.cc:125
-msgid "Date & Time"
-msgstr "Date & Time"
-
-#: printdialogpage.cc:131
-msgid "Single Line"
-msgstr "Single Line"
-
-#: printdialogpage.cc:132
-msgid "Rectangle"
-msgstr "Rectangle"
-
-#: printdialogpage.cc:164
-msgid "Draw &footer below text"
-msgstr "Draw &footer below text"
-
-#: fileinfodialog.cc:73
-msgid "Statistics"
-msgstr "Statistics"
-
-#: fileinfodialog.cc:89
-msgid "File name: "
-msgstr "File name: "
-
-#: fileinfodialog.cc:93
-msgid "Size [bytes]: "
-msgstr "Size [bytes]: "
-
-#: fileinfodialog.cc:110
-msgid "Occurrence"
-msgstr "Occurrence"
-
-#: fileinfodialog.cc:111
-msgid "Percent"
-msgstr "Percent"
-
-#: optiondialog.cc:105
-msgid "Layout"
-msgstr "Layout"
-
-#: optiondialog.cc:105
-msgid "Data Layout in Editor"
-msgstr "Data Layout in Editor"
-
-#: optiondialog.cc:113
-msgid "Hexadecimal Mode"
-msgstr "Hexadecimal Mode"
-
-#: optiondialog.cc:114
-msgid "Decimal Mode"
-msgstr "Decimal Mode"
-
-#: optiondialog.cc:115
-msgid "Octal Mode"
-msgstr "Octal Mode"
-
-#: optiondialog.cc:116
-msgid "Binary Mode"
-msgstr "Binary Mode"
-
-#: optiondialog.cc:117
-msgid "Text Only Mode"
-msgstr "Text Only Mode"
-
-#: optiondialog.cc:146
-msgid "Default l&ine size [bytes]:"
-msgstr "Default l&ine size [bytes]:"
-
-#: optiondialog.cc:150
-msgid "Colu&mn size [bytes]:"
-msgstr "Colu&mn size [bytes]:"
-
-#: optiondialog.cc:158
-msgid "Line size is &fixed (use scrollbar when required)"
-msgstr "Line size is &fixed (use scrollbar when required)"
-
-#: optiondialog.cc:164
-msgid "Loc&k column at end of line (when column size>1)"
-msgstr "Loc&k column at end of line (when column size>1)"
-
-#: optiondialog.cc:176
-msgid "Vertical Only"
-msgstr "Vertical Only"
-
-#: optiondialog.cc:177
-msgid "Horizontal Only"
-msgstr "Horizontal Only"
-
-#: optiondialog.cc:178
-msgid "Both Directions"
-msgstr "Both Directions"
-
-#: optiondialog.cc:185
-msgid "&Gridlines between text:"
-msgstr "&Gridlines between text:"
-
-#: optiondialog.cc:203
-msgid "&Left separator width [pixels]:"
-msgstr "&Left separator width [pixels]:"
-
-#: optiondialog.cc:207
-msgid "&Right separator width [pixels]:"
-msgstr "&Right separator width [pixels]:"
-
-#: optiondialog.cc:223
-msgid "&Separator margin width [pixels]:"
-msgstr "&Separator margin width [pixels]:"
-
-#: optiondialog.cc:227
-msgid "&Edge margin width [pixels]:"
-msgstr "&Edge margin width [pixels]:"
-
-#: optiondialog.cc:231
-msgid "Column separation is e&qual to one character"
-msgstr "Column separation is e&qual to one character"
-
-#: optiondialog.cc:244
-msgid "Column separa&tion [pixels]:"
-msgstr "Column separa&tion [pixels]:"
-
-#: optiondialog.cc:257
-msgid "Cursor"
-msgstr "Cursor"
-
-#: optiondialog.cc:258
-msgid "Cursor Behavior (only valid for editor)"
-msgstr "Cursor Behaviour (only valid for editor)"
-
-#: optiondialog.cc:262
-msgid "Blinking"
-msgstr "Blinking"
-
-#: optiondialog.cc:266 optiondialog.cc:267
-msgid "Do not b&link"
-msgstr "Do not b&link"
-
-#: optiondialog.cc:274
-msgid "&Blink interval [ms]:"
-msgstr "&Blink interval [ms]:"
-
-#: optiondialog.cc:284
-msgid "Shape"
-msgstr "Shape"
-
-#: optiondialog.cc:288
-msgid "Always &use block (rectangular) cursor"
-msgstr "Always &use block (rectangular) cursor"
-
-#: optiondialog.cc:294
-msgid "Use &thick cursor in insert mode"
-msgstr "Use &thick cursor in insert mode"
-
-#: optiondialog.cc:299
-msgid "Cursor Behavior When Editor Loses Focus"
-msgstr "Cursor Behaviour When Editor Loses Focus"
-
-#: optiondialog.cc:304
-msgid "&Stop blinking (if blinking is enabled)"
-msgstr "&Stop blinking (if blinking is enabled)"
-
-#: optiondialog.cc:306
-msgid "H&ide"
-msgstr "H&ide"
-
-#: optiondialog.cc:307
-msgid "Do &nothing"
-msgstr "Do &nothing"
-
-#: optiondialog.cc:323
-msgid "Colors"
-msgstr "Colours"
-
-#: optiondialog.cc:324
-msgid "Editor Colors (system selection color is always used)"
-msgstr "Editor Colours (system selection colour is always used)"
-
-#: optiondialog.cc:329
-msgid "&Use system colors (as chosen in Control Center)"
-msgstr "&Use system colours (as chosen in Control Centre)"
-
-#: optiondialog.cc:342
-msgid "First, Third ... Line Background"
-msgstr "First, Third ... Line Background"
-
-#: optiondialog.cc:343
-msgid "Second, Fourth ... Line Background"
-msgstr "Second, Fourth ... Line Background"
-
-#: optiondialog.cc:344
-msgid "Offset Background"
-msgstr "Offset Background"
-
-#: optiondialog.cc:345
-msgid "Inactive Background"
-msgstr "Inactive Background"
-
-#: optiondialog.cc:346
-msgid "Even Column Text"
-msgstr "Even Column Text"
-
-#: optiondialog.cc:347
-msgid "Odd Column Text"
-msgstr "Odd Column Text"
-
-#: optiondialog.cc:348
-msgid "Non Printable Text"
-msgstr "Non Printable Text"
-
-#: optiondialog.cc:349
-msgid "Offset Text"
-msgstr "Offset Text"
-
-#: optiondialog.cc:350
-msgid "Secondary Text"
-msgstr "Secondary Text"
-
-#: optiondialog.cc:351
-msgid "Marked Background"
-msgstr "Marked Background"
-
-#: optiondialog.cc:352
-msgid "Marked Text"
-msgstr "Marked Text"
-
-#: optiondialog.cc:353
-msgid "Cursor Background"
-msgstr "Cursor Background"
-
-#: optiondialog.cc:354
-msgid "Cursor Text (block shape)"
-msgstr "Cursor Text (block shape)"
-
-#: optiondialog.cc:355
-msgid "Bookmark Background"
-msgstr "Bookmark Background"
-
-#: optiondialog.cc:356
-msgid "Bookmark Text"
-msgstr "Bookmark Text"
-
-#: optiondialog.cc:357
-msgid "Separator"
-msgstr "Separator"
-
-#: optiondialog.cc:358
-msgid "Grid Lines"
-msgstr "Grid Lines"
-
-#: optiondialog.cc:376
-msgid "Font Selection (editor can only use a fixed font)"
-msgstr "Font Selection (editor can only use a fixed font)"
-
-#: optiondialog.cc:381
-msgid "&Use system font (as chosen in Control Center)"
-msgstr "&Use system font (as chosen in Control Centre)"
-
-#: optiondialog.cc:398
-msgid "KHexEdit editor font"
-msgstr "KHexEdit editor font"
-
-#: optiondialog.cc:414
-msgid "&Map non printable characters to:"
-msgstr "&Map non printable characters to:"
-
-#: optiondialog.cc:428
-msgid "File Management"
-msgstr "File Management"
-
-#: optiondialog.cc:439
-msgid "Most Recent Document"
-msgstr "Most Recent Document"
-
-#: optiondialog.cc:440
-msgid "All Recent Documents"
-msgstr "All Recent Documents"
-
-#: optiondialog.cc:446
-msgid "Open doc&uments on startup:"
-msgstr "Open doc&uments on startup:"
-
-#: optiondialog.cc:452
-msgid "&Jump to previous cursor position on startup"
-msgstr "&Jump to previous cursor position on startup"
-
-#: optiondialog.cc:466
-msgid "Open document with &write protection enabled"
-msgstr "Open document with &write protection enabled"
-
-#: optiondialog.cc:472
-msgid "&Keep cursor position after reloading document"
-msgstr "&Keep cursor position after reloading document"
-
-#: optiondialog.cc:478
-msgid "&Make a backup when saving document"
-msgstr "&Make a backup when saving document"
-
-#: optiondialog.cc:488
-msgid "Don't &save \"Recent\" document list on exit"
-msgstr "Don't &save \"Recent\" document list on exit"
-
-#: optiondialog.cc:492
-msgid ""
-"Clicking this check box makes KHexEdit forget his recent document list when the "
-"program is closed.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-msgstr ""
-"Clicking this check box makes KHexEdit forget his recent document list when the "
-"program is closed.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-
-#: optiondialog.cc:499
-msgid "Cl&ear \"Recent\" Document List"
-msgstr "Cl&ear \"Recent\" Document List"
-
-#: optiondialog.cc:503
-msgid ""
-"Clicking this button makes KHexEdit forget his recent document list.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-msgstr ""
-"Clicking this button makes KHexEdit forget his recent document list.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-
-#: optiondialog.cc:520
-msgid "Various Properties"
-msgstr "Various Properties"
-
-#: optiondialog.cc:526
-msgid "Auto&matic copy to clipboard when selection is ready"
-msgstr "Auto&matic copy to clipboard when selection is ready"
-
-#: optiondialog.cc:532
-msgid "&Editor starts in \"insert\" mode"
-msgstr "&Editor starts in \"insert\" mode"
-
-#: optiondialog.cc:538
-msgid "Confirm &wrapping (to beginning or end) during search"
-msgstr "Confirm &wrapping (to beginning or end) during search"
-
-#: optiondialog.cc:544
-msgid "Cursor jumps to &nearest byte when moved"
-msgstr "Cursor jumps to &nearest byte when moved"
-
-#: optiondialog.cc:550
-msgid "Sounds"
-msgstr "Sounds"
-
-#: optiondialog.cc:553
-msgid "Make sound on data &input (eg. typing) failure"
-msgstr "Make sound on data &input (eg. typing) failure"
-
-#: optiondialog.cc:557
-msgid "Make sound on &fatal failure"
-msgstr "Make sound on &fatal failure"
-
-#: optiondialog.cc:562
-msgid "Bookmark Visibility"
-msgstr "Bookmark Visibility"
-
-#: optiondialog.cc:565
-msgid "Use visible bookmarks in the offset column"
-msgstr "Use visible bookmarks in the offset column"
-
-#: optiondialog.cc:569
-msgid "Use visible bookmarks in the editor fields"
-msgstr "Use visible bookmarks in the editor fields"
-
-#: optiondialog.cc:574
-msgid "Confirm when number of printed pages will e&xceed limit"
-msgstr "Confirm when number of printed pages will e&xceed limit"
-
-#: optiondialog.cc:594
-msgid "&Threshold [pages]:"
-msgstr "&Threshold [pages]:"
-
-#: optiondialog.cc:611
-msgid "&Undo limit:"
-msgstr "&Undo limit:"
+#: hexmanagerwidget.cc:136
+msgid "Conversion"
+msgstr "Conversion"
diff --git a/tde-i18n-en_GB/messages/tdeutils/khexedit2part.po b/tde-i18n-en_GB/messages/tdeutils/khexedit2part.po
index 67123b5784c..5123df19c1b 100644
--- a/tde-i18n-en_GB/messages/tdeutils/khexedit2part.po
+++ b/tde-i18n-en_GB/messages/tdeutils/khexedit2part.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khexedit2part\n"
-"POT-Creation-Date: 2005-01-17 01:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-12-11 11:01+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kjots.po b/tde-i18n-en_GB/messages/tdeutils/kjots.po
index d3e09eec2a9..c5bcb92c4fe 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kjots.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kjots.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kjots\n"
-"POT-Creation-Date: 2007-05-02 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:16+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/klaptopdaemon.po b/tde-i18n-en_GB/messages/tdeutils/klaptopdaemon.po
index 57b65f6fb3a..dadc6ee4e9f 100644
--- a/tde-i18n-en_GB/messages/tdeutils/klaptopdaemon.po
+++ b/tde-i18n-en_GB/messages/tdeutils/klaptopdaemon.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klaptopdaemon\n"
-"POT-Creation-Date: 2008-02-03 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2006-12-08 13:58+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -369,18 +370,10 @@ msgstr "CPU Throttling..."
 msgid "Standby..."
 msgstr "Standby..."
 
-#: daemondock.cpp:109
-msgid "&Lock && Suspend..."
-msgstr "&Lock && Suspend..."
-
 #: daemondock.cpp:110
 msgid "&Suspend..."
 msgstr "&Suspend..."
 
-#: daemondock.cpp:111
-msgid "&Lock && Hibernate..."
-msgstr "&Lock && Hibernate..."
-
 #: daemondock.cpp:112
 msgid "&Hibernate..."
 msgstr "&Hibernate..."
@@ -573,3 +566,9 @@ msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "[email protected]"
+
+#~ msgid "&Lock && Suspend..."
+#~ msgstr "&Lock && Suspend..."
+
+#~ msgid "&Lock && Hibernate..."
+#~ msgstr "&Lock && Hibernate..."
diff --git a/tde-i18n-en_GB/messages/tdeutils/kmilo_delli8k.po b/tde-i18n-en_GB/messages/tdeutils/kmilo_delli8k.po
index d991828e8aa..240820c8d99 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kmilo_delli8k.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kmilo_delli8k.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_delli8k\n"
-"POT-Creation-Date: 2004-11-24 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-12-10 00:53+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kmilo_generic.po b/tde-i18n-en_GB/messages/tdeutils/kmilo_generic.po
index ce122099815..4cbe95caf10 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kmilo_generic.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kmilo_generic.po
@@ -6,31 +6,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_generic\n"
-"POT-Creation-Date: 2008-02-07 01:30+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-11-03 18:01+0000\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: generic_monitor.cpp:126 generic_monitor.cpp:166 generic_monitor.cpp:260
+#: generic_monitor.cpp:143 generic_monitor.cpp:183 generic_monitor.cpp:277
 msgid "Starting KMix..."
 msgstr "Starting KMix..."
 
-#: generic_monitor.cpp:139 generic_monitor.cpp:184 generic_monitor.cpp:282
+#: generic_monitor.cpp:156 generic_monitor.cpp:201 generic_monitor.cpp:299
 msgid "It seems that KMix is not running."
 msgstr "It seems that KMix is not running."
 
-#: generic_monitor.cpp:226
+#: generic_monitor.cpp:243
 msgid "Volume"
 msgstr "Volume"
 
-#: generic_monitor.cpp:299
+#: generic_monitor.cpp:316
 msgid "Mute on"
 msgstr "Mute on"
 
-#: generic_monitor.cpp:301
+#: generic_monitor.cpp:318
 msgid "Mute off"
 msgstr "Mute off"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kmilo_kvaio.po b/tde-i18n-en_GB/messages/tdeutils/kmilo_kvaio.po
index 6367d161f88..75b9addbd17 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kmilo_kvaio.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kmilo_kvaio.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_kvaio\n"
-"POT-Creation-Date: 2005-07-08 01:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-07-06 13:19+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kmilo_powerbook.po b/tde-i18n-en_GB/messages/tdeutils/kmilo_powerbook.po
index 06038a7fa11..5a49e9c7dee 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kmilo_powerbook.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kmilo_powerbook.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_powerbook\n"
-"POT-Creation-Date: 2005-11-30 03:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-03-29 12:38+0100\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kmilo_thinkpad.po b/tde-i18n-en_GB/messages/tdeutils/kmilo_thinkpad.po
index 2d7a6faf2d9..a58ff301426 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kmilo_thinkpad.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kmilo_thinkpad.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_thinkpad\n"
-"POT-Creation-Date: 2005-06-14 01:28+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-06-15 13:46+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kmilod.po b/tde-i18n-en_GB/messages/tdeutils/kmilod.po
index fa322297521..47f0d9fc112 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kmilod.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kmilod.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilod\n"
-"POT-Creation-Date: 2005-09-29 02:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-03-31 13:00+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/kregexpeditor.po b/tde-i18n-en_GB/messages/tdeutils/kregexpeditor.po
index 1aa8b818e5a..9c5893fb053 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kregexpeditor.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kregexpeditor.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kregexpeditor\n"
-"POT-Creation-Date: 2005-08-18 04:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:15+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -180,11 +181,13 @@ msgid "The Carriage Return Character (\\r)"
 msgstr "The Carriage Return Character (\\r)"
 
 #: charselector.cpp:68
-msgid "The Horizontal Tab Character (\\t)"
+#, fuzzy
+msgid "TheQt::Horizontal Tab Character (\\t)"
 msgstr "The Horizontal Tab Character (\\t)"
 
 #: charselector.cpp:69
-msgid "The Vertical Tab Character (\\v)"
+#, fuzzy
+msgid "TheQt::Vertical Tab Character (\\v)"
 msgstr "The Vertical Tab Character (\\v)"
 
 #: compoundwidget.cpp:46
@@ -392,10 +395,11 @@ msgid "Clear expression"
 msgstr "Clear expression"
 
 #: kregexpeditorprivate.cpp:168
+#, fuzzy
 msgid ""
 "This is the regular expression in ASCII syntax. You are likely only to be "
 "interested in this if you are a programmer, and need to develop a regular "
-"expression using QRegExp."
+"expression using TQRegExp."
 "<p>You may develop your regular expression both by using the graphical editor, "
 "and by typing the regular expression in this line edit."
 msgstr ""
@@ -426,20 +430,20 @@ msgid "Editor for Regular Expressions"
 msgstr "Editor for Regular Expressions"
 
 #: predefined-regexps.cpp:1
-msgid "anything"
-msgstr "anything"
+msgid "spaces"
+msgstr "spaces"
 
 #: predefined-regexps.cpp:2
-msgid "This regular expression matches anything."
-msgstr "This regular expression matches anything."
+msgid "Matches an arbitrary amount of whitespace."
+msgstr "Matches an arbitrary amount of whitespace."
 
 #: predefined-regexps.cpp:3
-msgid "spaces"
-msgstr "spaces"
+msgid "anything"
+msgstr "anything"
 
 #: predefined-regexps.cpp:4
-msgid "Matches an arbitrary amount of whitespace."
-msgstr "Matches an arbitrary amount of whitespace."
+msgid "This regular expression matches anything."
+msgstr "This regular expression matches anything."
 
 #: regexpbuttons.cpp:66
 msgid "Selection tool"
diff --git a/tde-i18n-en_GB/messages/tdeutils/ksim.po b/tde-i18n-en_GB/messages/tdeutils/ksim.po
index 4ed07111d13..8f26ae5d15e 100644
--- a/tde-i18n-en_GB/messages/tdeutils/ksim.po
+++ b/tde-i18n-en_GB/messages/tdeutils/ksim.po
@@ -6,73 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksim\n"
-"POT-Creation-Date: 2007-05-28 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:15+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: monitorprefs.cpp:35
-msgid "Monitor"
-msgstr "Monitor"
-
-#: monitorprefs.cpp:36
-msgid "Description"
-msgstr "Description"
-
-#: monitorprefs.cpp:37
-msgid "LMB Command"
-msgstr "LMB Command"
-
-#: library/chart.cpp:120 themeprefs.cpp:96
-msgid "None"
-msgstr "None"
-
-#: library/pluginloader.cpp:93
-msgid ""
-"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
-"empty in the plugins desktop file"
-msgstr ""
-"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
-"empty in the plugins desktop file"
-
-#: library/pluginloader.cpp:99
-msgid ""
-"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
-"check that the plugin is installed and is in your $TDEDIR/lib path"
-msgstr ""
-"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
-"check that the plugin is installed and is in your $TDEDIR/lib path"
-
-#: library/pluginloader.cpp:105
-msgid ""
-"<qt>An error occurred while trying \n"
-"to load the plugin '%1'. \n"
-"This could be caused by the following:"
-"<ul>\n"
-"<li>The plugin doesn't have the %2 macro</li>\n"
-"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
-"</ul> \n"
-"Last error message that occurred: \n"
-"%3</qt>"
-msgstr ""
-"<qt>An error occurred while trying \n"
-"to load the plugin '%1'. \n"
-"This could be caused by the following:"
-"<ul>\n"
-"<li>The plugin doesn't have the %2 macro</li>\n"
-"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
-"</ul> \n"
-"Last error message that occurred: \n"
-"%3</qt>"
-
-#: library/pluginloader.cpp:315
-msgid "Unable to get last error message"
-msgstr "Unable to get last error message"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -85,117 +28,13 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: ksimsysinfo.cpp:197
-msgid "Current system time"
-msgstr "Current system time"
-
-#: ksimsysinfo.cpp:211
-msgid "Current system date"
-msgstr "Current system date"
-
-#: ksimsysinfo.cpp:227
-msgid "System uptime"
-msgstr "System uptime"
-
-#: ksimsysinfo.cpp:308
-msgid "Uptime display disabled"
-msgstr "Uptime display disabled"
-
-#: ksimsysinfo.cpp:316
-msgid "Memory display disabled"
-msgstr "Memory display disabled"
-
-#: ksimsysinfo.cpp:324
-msgid "Swap display disabled"
-msgstr "Swap display disabled"
-
-#: ksimpref.cpp:50 ksimpref.cpp:158
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ksimpref.cpp:55
-msgid "Monitors"
-msgstr "Monitors"
-
-#: ksimpref.cpp:56
-msgid "Monitors Installed"
-msgstr "Monitors Installed"
-
-#: ksimpref.cpp:60 monitors/net/netdialog.cpp:123
-msgid "General"
-msgstr "General"
-
-#: ksimpref.cpp:61
-msgid "General Options"
-msgstr "General Options"
-
-#: ksimpref.cpp:66
-msgid "Clock"
-msgstr "Clock"
-
-#: ksimpref.cpp:67
-msgid "Clock Options"
-msgstr "Clock Options"
-
-#: ksimpref.cpp:72
-msgid "Uptime"
-msgstr "Uptime"
-
-#: ksimpref.cpp:73
-msgid "Uptime Options"
-msgstr "Uptime Options"
-
-#: ksimpref.cpp:78
-msgid "Memory"
-msgstr "Memory"
-
-#: ksimpref.cpp:79
-msgid "Memory Options"
-msgstr "Memory Options"
-
-#: ksimpref.cpp:84
-msgid "Swap"
-msgstr "Swap"
-
-#: ksimpref.cpp:85
-msgid "Swap Options"
-msgstr "Swap Options"
-
-#: ksimpref.cpp:89
-msgid "Themes"
-msgstr "Themes"
-
-#: ksimpref.cpp:90
-msgid "Theme Selector"
-msgstr "Theme Selector"
-
-#: ksimpref.cpp:124
-msgid ""
-"Failed to remove %1's config page due to the plugin not being loaded or the "
-"config page has not been created"
-msgstr ""
-"Failed to remove %1's config page due to the plugin not being loaded or the "
-"config page has not been created"
-
-#: ksimpref.cpp:149
-msgid ""
-"Failed to add %1's config page due to the plugin not being loaded or the config "
-"page has not been created"
-msgstr ""
-"Failed to add %1's config page due to the plugin not being loaded or the config "
-"page has not been created"
-
-#: ksimpref.cpp:159
-msgid "%1 Options"
-msgstr "%1 Options"
-
-#: monitors/cpu/ksimcpu.cpp:100
-msgid "KSim CPU Plugin"
-msgstr "KSim CPU Plugin"
+#: monitors/disk/ksimdisk.cpp:96
+msgid "KSim Disk Plugin"
+msgstr "KSim Disk Plugin"
 
-#: monitors/cpu/ksimcpu.cpp:101
-msgid "A cpu monitor plugin for KSim"
-msgstr "A cpu monitor plugin for KSim"
+#: monitors/disk/ksimdisk.cpp:97
+msgid "A disk monitor plugin for KSim"
+msgstr "A disk monitor plugin for KSim"
 
 #: monitors/cpu/ksimcpu.cpp:104 monitors/disk/ksimdisk.cpp:100
 #: monitors/filesystem/ksimfsystem.cpp:74 monitors/i8k/ksimi8k.cpp:69
@@ -204,103 +43,105 @@ msgstr "A cpu monitor plugin for KSim"
 msgid "Author"
 msgstr "Author"
 
-#: monitors/cpu/ksimcpu.cpp:204
-msgid "%1%"
-msgstr "%1%"
-
-#: monitors/cpu/ksimcpu.cpp:371
-msgid "Available CPUs"
-msgstr "Available CPUs"
-
-#: monitors/cpu/ksimcpu.cpp:372
-msgid "Chart Format"
-msgstr "Chart Format"
+#: monitors/disk/ksimdisk.cpp:171 monitors/disk/ksimdisk.cpp:194
+#: monitors/disk/ksimdisk.cpp:529 monitors/disk/ksimdisk.cpp:539
+msgid "All Disks"
+msgstr "All Disks"
 
-#: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
-#: monitors/net/netconfig.cpp:72
-msgid "Modify..."
-msgstr "Modify..."
+#: monitors/disk/ksimdisk.cpp:218 monitors/net/ksimnet.cpp:397
+#: monitors/net/ksimnet.cpp:405
+msgid "in: %1k"
+msgstr "in: %1k"
 
-#: monitors/cpu/ksimcpu.cpp:395
-msgid "Chart Legend"
-msgstr "Chart Legend"
+#: monitors/disk/ksimdisk.cpp:220 monitors/net/ksimnet.cpp:398
+#: monitors/net/ksimnet.cpp:406
+msgid "out: %1k"
+msgstr "out: %1k"
 
-#: monitors/cpu/ksimcpu.cpp:404
-msgid "%T - Total CPU time (sys + user + nice)"
-msgstr "%T - Total CPU time (sys + user + nice)"
+#: monitors/disk/ksimdisk.cpp:224
+msgid "%1k"
+msgstr "%1k"
 
-#: monitors/cpu/ksimcpu.cpp:407
-msgid "%t - Total CPU time (sys + user)"
-msgstr "%t - Total CPU time (sys + user)"
+#: monitors/disk/ksimdisk.cpp:482
+msgid "Disks"
+msgstr "Disks"
 
-#: monitors/cpu/ksimcpu.cpp:410
-#, c-format
-msgid "%s - Total sys time"
-msgstr "%s - Total sys time"
+#: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
+msgid "Add..."
+msgstr "Add..."
 
-#: monitors/cpu/ksimcpu.cpp:413
-#, c-format
-msgid "%u - Total user time"
-msgstr "%u - Total user time"
+#: monitors/disk/ksimdisk.cpp:503
+msgid "Disk Styles"
+msgstr "Disk Styles"
 
-#: monitors/cpu/ksimcpu.cpp:416
-#, c-format
-msgid "%n - Total nice time"
-msgstr "%n - Total nice time"
+#: monitors/disk/ksimdisk.cpp:507
+msgid "Display the read and write data as one"
+msgstr "Display the read and write data as one"
 
-#: monitors/cpu/ksimcpu.cpp:423
-#, c-format
-msgid "cpu %1"
-msgstr "cpu %1"
+#: monitors/disk/ksimdisk.cpp:509
+msgid ""
+"Display the read and write data\n"
+"separately as in/out data"
+msgstr ""
+"Display the read and write data\n"
+"separately as in/out data"
 
-#: monitors/cpu/ksimcpu.cpp:504
-msgid "Modify CPU Format"
-msgstr "Modify CPU Format"
+#: monitors/disk/ksimdisk.cpp:553
+msgid "Add Disk Device"
+msgstr "Add Disk Device"
 
-#: monitors/cpu/ksimcpu.cpp:504
-msgid "Chart format:"
-msgstr "Chart format:"
+#: monitors/disk/ksimdisk.cpp:553
+msgid "Disk name:"
+msgstr "Disk name:"
 
-#: monitors/i8k/ksimi8k.cpp:65
-msgid "KSim I8K Plugin"
-msgstr "KSim I8K Plugin"
+#: monitors/mail/ksimmail.cpp:61
+msgid "KSim Mail Plugin"
+msgstr "KSim Mail Plugin"
 
-#: monitors/i8k/ksimi8k.cpp:66
-msgid "Dell I8K Hardware Monitor plugin"
-msgstr "Dell I8K Hardware Monitor plugin"
+#: monitors/mail/ksimmail.cpp:62
+msgid "A mail monitor plugin for KSim"
+msgstr "A mail monitor plugin for KSim"
 
-#: monitors/i8k/ksimi8k.cpp:198
-msgid "Right fan: %1 RPM"
-msgstr "Right fan: %1 RPM"
+#: monitors/snmp/proberesultdialog.cpp:33
+msgid "Results of scanning host %1:"
+msgstr "Results of scanning host %1:"
 
-#: monitors/i8k/ksimi8k.cpp:200
-msgid "Right fan: Off"
-msgstr "Right fan: Off"
+#: monitors/snmp/configpage.cpp:159
+#, c-format
+msgid ""
+"_n: This host has the following monitor associated. Do you really want to "
+"delete this host entry?\n"
+"This host has the following %n monitors associated. Do you really want to "
+"delete this host entry?"
+msgstr ""
+"This host has the following monitor associated. Do you really want to delete "
+"this host entry?\n"
+"This host has the following %n monitors associated. Do you really want to "
+"delete this host entry?"
 
-#: monitors/i8k/ksimi8k.cpp:203
-msgid "Left fan: %1 RPM"
-msgstr "Left fan: %1 RPM"
+#: monitors/snmp/configpage.cpp:162
+msgid "Delete Host Entry"
+msgstr "Delete Host Entry"
 
-#: monitors/i8k/ksimi8k.cpp:205
-msgid "Left fan: Off"
-msgstr "Left fan: Off"
+#: monitors/snmp/monitordialog.cpp:92
+msgid "Please enter a name for this monitor"
+msgstr "Please enter a name for this monitor"
 
-#: monitors/i8k/ksimi8k.cpp:207
-msgid "CPU temp: %1°%2"
-msgstr "CPU temp: %1°%2"
+#: monitors/snmp/monitordialog.cpp:95
+msgid "Please enter a valid name for the object identifier"
+msgstr "Please enter a valid name for the object identifier"
 
-#: monitors/i8k/ksimi8k.cpp:214
-msgid "Show temperature in Fahrenheit"
-msgstr "Show temperature in Fahrenheit"
+#: monitors/snmp/probedialog.cpp:42
+msgid "SNMP Host Probe"
+msgstr "SNMP Host Probe"
 
-#: monitors/filesystem/fsystemconfig.cpp:73 monitors/i8k/ksimi8k.cpp:216
-#: monitors/lm_sensors/sensorsconfig.cpp:88
-msgid "Update interval:"
-msgstr "Update interval:"
+#: monitors/snmp/probedialog.cpp:45
+msgid "Probing for common object identifiers..."
+msgstr "Probing for common object identifiers..."
 
-#: monitors/i8k/ksimi8k.cpp:219
-msgid " sec"
-msgstr " sec"
+#: monitors/snmp/browsedialog.cpp:35
+msgid "&Stop"
+msgstr "&Stop"
 
 #: monitors/net/ksimnet.cpp:90
 msgid "KSim Net Plugin"
@@ -314,16 +155,6 @@ msgstr "A net plugin for KSim"
 msgid "FreeBSD ports"
 msgstr "FreeBSD ports"
 
-#: monitors/disk/ksimdisk.cpp:218 monitors/net/ksimnet.cpp:397
-#: monitors/net/ksimnet.cpp:405
-msgid "in: %1k"
-msgstr "in: %1k"
-
-#: monitors/disk/ksimdisk.cpp:220 monitors/net/ksimnet.cpp:398
-#: monitors/net/ksimnet.cpp:406
-msgid "out: %1k"
-msgstr "out: %1k"
-
 #: monitors/net/ksimnet.cpp:409
 msgid "offline"
 msgstr "offline"
@@ -356,9 +187,10 @@ msgstr "Timer"
 msgid "Commands"
 msgstr "Commands"
 
-#: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
-msgid "Add..."
-msgstr "Add..."
+#: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
+#: monitors/net/netconfig.cpp:72
+msgid "Modify..."
+msgstr "Modify..."
 
 #: monitors/net/netconfig.cpp:146 monitors/net/netconfig.cpp:151
 msgid "&Add Net Device"
@@ -416,6 +248,10 @@ msgstr "mm - Total minutes online"
 msgid "ss - Total seconds online"
 msgstr "ss - Total seconds online"
 
+#: ksimpref.cpp:61 monitors/net/netdialog.cpp:123
+msgid "General"
+msgstr "General"
+
 #: monitors/net/netdialog.cpp:131
 msgid "Enable connect/disconnect"
 msgstr "Enable connect/disconnect"
@@ -428,100 +264,6 @@ msgstr "Connect command:"
 msgid "Disconnect command:"
 msgstr "Disconnect command:"
 
-#: monitors/disk/ksimdisk.cpp:96
-msgid "KSim Disk Plugin"
-msgstr "KSim Disk Plugin"
-
-#: monitors/disk/ksimdisk.cpp:97
-msgid "A disk monitor plugin for KSim"
-msgstr "A disk monitor plugin for KSim"
-
-#: monitors/disk/ksimdisk.cpp:171 monitors/disk/ksimdisk.cpp:194
-#: monitors/disk/ksimdisk.cpp:529 monitors/disk/ksimdisk.cpp:539
-msgid "All Disks"
-msgstr "All Disks"
-
-#: monitors/disk/ksimdisk.cpp:224
-msgid "%1k"
-msgstr "%1k"
-
-#: monitors/disk/ksimdisk.cpp:482
-msgid "Disks"
-msgstr "Disks"
-
-#: monitors/disk/ksimdisk.cpp:503
-msgid "Disk Styles"
-msgstr "Disk Styles"
-
-#: monitors/disk/ksimdisk.cpp:507
-msgid "Display the read and write data as one"
-msgstr "Display the read and write data as one"
-
-#: monitors/disk/ksimdisk.cpp:509
-msgid ""
-"Display the read and write data\n"
-"separately as in/out data"
-msgstr ""
-"Display the read and write data\n"
-"separately as in/out data"
-
-#: monitors/disk/ksimdisk.cpp:553
-msgid "Add Disk Device"
-msgstr "Add Disk Device"
-
-#: monitors/disk/ksimdisk.cpp:553
-msgid "Disk name:"
-msgstr "Disk name:"
-
-#: monitors/mail/ksimmail.cpp:61
-msgid "KSim Mail Plugin"
-msgstr "KSim Mail Plugin"
-
-#: monitors/mail/ksimmail.cpp:62
-msgid "A mail monitor plugin for KSim"
-msgstr "A mail monitor plugin for KSim"
-
-#: monitors/snmp/proberesultdialog.cpp:33
-msgid "Results of scanning host %1:"
-msgstr "Results of scanning host %1:"
-
-#: monitors/snmp/probedialog.cpp:42
-msgid "SNMP Host Probe"
-msgstr "SNMP Host Probe"
-
-#: monitors/snmp/probedialog.cpp:45
-msgid "Probing for common object identifiers..."
-msgstr "Probing for common object identifiers..."
-
-#: monitors/snmp/monitordialog.cpp:92
-msgid "Please enter a name for this monitor"
-msgstr "Please enter a name for this monitor"
-
-#: monitors/snmp/monitordialog.cpp:95
-msgid "Please enter a valid name for the object identifier"
-msgstr "Please enter a valid name for the object identifier"
-
-#: monitors/snmp/configpage.cpp:159
-#, c-format
-msgid ""
-"_n: This host has the following monitor associated. Do you really want to "
-"delete this host entry?\n"
-"This host has the following %n monitors associated. Do you really want to "
-"delete this host entry?"
-msgstr ""
-"This host has the following monitor associated. Do you really want to delete "
-"this host entry?\n"
-"This host has the following %n monitors associated. Do you really want to "
-"delete this host entry?"
-
-#: monitors/snmp/configpage.cpp:162
-msgid "Delete Host Entry"
-msgstr "Delete Host Entry"
-
-#: monitors/snmp/browsedialog.cpp:35
-msgid "&Stop"
-msgstr "&Stop"
-
 #: monitors/lm_sensors/sensorsconfig.cpp:62
 msgid "No."
 msgstr "No."
@@ -542,6 +284,11 @@ msgstr "Value"
 msgid "Display Fahrenheit"
 msgstr "Display Fahrenheit"
 
+#: monitors/filesystem/fsystemconfig.cpp:73 monitors/i8k/ksimi8k.cpp:216
+#: monitors/lm_sensors/sensorsconfig.cpp:88
+msgid "Update interval:"
+msgstr "Update interval:"
+
 #: monitors/filesystem/fsystemconfig.cpp:84
 #: monitors/lm_sensors/sensorsconfig.cpp:97
 msgid "seconds"
@@ -588,6 +335,126 @@ msgid ""
 "V"
 msgstr "V"
 
+#: monitors/cpu/ksimcpu.cpp:100
+msgid "KSim CPU Plugin"
+msgstr "KSim CPU Plugin"
+
+#: monitors/cpu/ksimcpu.cpp:101
+msgid "A cpu monitor plugin for KSim"
+msgstr "A cpu monitor plugin for KSim"
+
+#: monitors/cpu/ksimcpu.cpp:204
+msgid "%1%"
+msgstr "%1%"
+
+#: monitors/cpu/ksimcpu.cpp:371
+msgid "Available CPUs"
+msgstr "Available CPUs"
+
+#: monitors/cpu/ksimcpu.cpp:372
+msgid "Chart Format"
+msgstr "Chart Format"
+
+#: monitors/cpu/ksimcpu.cpp:395
+msgid "Chart Legend"
+msgstr "Chart Legend"
+
+#: monitors/cpu/ksimcpu.cpp:404
+msgid "%T - Total CPU time (sys + user + nice)"
+msgstr "%T - Total CPU time (sys + user + nice)"
+
+#: monitors/cpu/ksimcpu.cpp:407
+msgid "%t - Total CPU time (sys + user)"
+msgstr "%t - Total CPU time (sys + user)"
+
+#: monitors/cpu/ksimcpu.cpp:410
+#, c-format
+msgid "%s - Total sys time"
+msgstr "%s - Total sys time"
+
+#: monitors/cpu/ksimcpu.cpp:413
+#, c-format
+msgid "%u - Total user time"
+msgstr "%u - Total user time"
+
+#: monitors/cpu/ksimcpu.cpp:416
+#, c-format
+msgid "%n - Total nice time"
+msgstr "%n - Total nice time"
+
+#: monitors/cpu/ksimcpu.cpp:423
+#, c-format
+msgid "cpu %1"
+msgstr "cpu %1"
+
+#: monitors/cpu/ksimcpu.cpp:504
+msgid "Modify CPU Format"
+msgstr "Modify CPU Format"
+
+#: monitors/cpu/ksimcpu.cpp:504
+msgid "Chart format:"
+msgstr "Chart format:"
+
+#: monitors/i8k/ksimi8k.cpp:65
+msgid "KSim I8K Plugin"
+msgstr "KSim I8K Plugin"
+
+#: monitors/i8k/ksimi8k.cpp:66
+msgid "Dell I8K Hardware Monitor plugin"
+msgstr "Dell I8K Hardware Monitor plugin"
+
+#: monitors/i8k/ksimi8k.cpp:198
+msgid "Right fan: %1 RPM"
+msgstr "Right fan: %1 RPM"
+
+#: monitors/i8k/ksimi8k.cpp:200
+msgid "Right fan: Off"
+msgstr "Right fan: Off"
+
+#: monitors/i8k/ksimi8k.cpp:203
+msgid "Left fan: %1 RPM"
+msgstr "Left fan: %1 RPM"
+
+#: monitors/i8k/ksimi8k.cpp:205
+msgid "Left fan: Off"
+msgstr "Left fan: Off"
+
+#: monitors/i8k/ksimi8k.cpp:207
+msgid "CPU temp: %1°%2"
+msgstr "CPU temp: %1°%2"
+
+#: monitors/i8k/ksimi8k.cpp:214
+msgid "Show temperature in Fahrenheit"
+msgstr "Show temperature in Fahrenheit"
+
+#: monitors/i8k/ksimi8k.cpp:219
+msgid " sec"
+msgstr " sec"
+
+#: monitors/filesystem/filesystemwidget.cpp:187
+msgid "<qt>The following errors occurred:<ul>"
+msgstr "<qt>The following errors occurred:<ul>"
+
+#: monitors/filesystem/filesystemwidget.cpp:219
+msgid "&Mount Device"
+msgstr "&Mount Device"
+
+#: monitors/filesystem/filesystemwidget.cpp:220
+msgid "&Unmount Device"
+msgstr "&Unmount Device"
+
+#: monitors/filesystem/ksimfsystem.cpp:70
+msgid "KSim FileSystem Plugin"
+msgstr "KSim FileSystem Plugin"
+
+#: monitors/filesystem/ksimfsystem.cpp:71
+msgid "A filesystem plugin for KSim"
+msgstr "A filesystem plugin for KSim"
+
+#: monitors/filesystem/ksimfsystem.cpp:76
+msgid "Some Fixes"
+msgstr "Some Fixes"
+
 #: monitors/filesystem/fsystemconfig.cpp:56
 msgid "Mounted Partition"
 msgstr "Mounted Partition"
@@ -620,29 +487,117 @@ msgstr ""
 msgid "0 means no update"
 msgstr "0 means no update"
 
-#: monitors/filesystem/ksimfsystem.cpp:70
-msgid "KSim FileSystem Plugin"
-msgstr "KSim FileSystem Plugin"
+#: ksim.cpp:59
+msgid "KSim"
+msgstr "KSim"
 
-#: monitors/filesystem/ksimfsystem.cpp:71
-msgid "A filesystem plugin for KSim"
-msgstr "A filesystem plugin for KSim"
+#: ksim.cpp:60
+msgid "A plugin based system monitor for TDE"
+msgstr "A plugin based system monitor for TDE"
 
-#: monitors/filesystem/ksimfsystem.cpp:76
-msgid "Some Fixes"
-msgstr "Some Fixes"
+#: ksim.cpp:61
+msgid ""
+"(C) 2001-2003 Robbie Ward\n"
+"(C) 2005 Reuben Sutton"
+msgstr ""
+"(C) 2001-2003 Robbie Ward\n"
+"(C) 2005 Reuben Sutton"
 
-#: monitors/filesystem/filesystemwidget.cpp:187
-msgid "<qt>The following errors occurred:<ul>"
-msgstr "<qt>The following errors occurred:<ul>"
+#: ksim.cpp:62
+msgid "Maintainer"
+msgstr "Maintainer"
 
-#: monitors/filesystem/filesystemwidget.cpp:219
-msgid "&Mount Device"
-msgstr "&Mount Device"
+#: ksim.cpp:63
+msgid "Original Author"
+msgstr "Original Author"
 
-#: monitors/filesystem/filesystemwidget.cpp:220
-msgid "&Unmount Device"
-msgstr "&Unmount Device"
+#: ksim.cpp:65
+msgid "Developer"
+msgstr "Developer"
+
+#: ksim.cpp:67
+msgid "Some FreeBSD ports"
+msgstr "Some FreeBSD ports"
+
+#: ksim.cpp:69
+msgid "Testing, Bug fixing and some help"
+msgstr "Testing, Bug fixing and some help"
+
+#: ksimpref.cpp:51 ksimpref.cpp:159
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ksimpref.cpp:56
+msgid "Monitors"
+msgstr "Monitors"
+
+#: ksimpref.cpp:57
+msgid "Monitors Installed"
+msgstr "Monitors Installed"
+
+#: ksimpref.cpp:62
+msgid "General Options"
+msgstr "General Options"
+
+#: ksimpref.cpp:67
+msgid "Clock"
+msgstr "Clock"
+
+#: ksimpref.cpp:68
+msgid "Clock Options"
+msgstr "Clock Options"
+
+#: ksimpref.cpp:73
+msgid "Uptime"
+msgstr "Uptime"
+
+#: ksimpref.cpp:74
+msgid "Uptime Options"
+msgstr "Uptime Options"
+
+#: ksimpref.cpp:79
+msgid "Memory"
+msgstr "Memory"
+
+#: ksimpref.cpp:80
+msgid "Memory Options"
+msgstr "Memory Options"
+
+#: ksimpref.cpp:85
+msgid "Swap"
+msgstr "Swap"
+
+#: ksimpref.cpp:86
+msgid "Swap Options"
+msgstr "Swap Options"
+
+#: ksimpref.cpp:90
+msgid "Themes"
+msgstr "Themes"
+
+#: ksimpref.cpp:91
+msgid "Theme Selector"
+msgstr "Theme Selector"
+
+#: ksimpref.cpp:125
+msgid ""
+"Failed to remove %1's config page due to the plugin not being loaded or the "
+"config page has not been created"
+msgstr ""
+"Failed to remove %1's config page due to the plugin not being loaded or the "
+"config page has not been created"
+
+#: ksimpref.cpp:150
+msgid ""
+"Failed to add %1's config page due to the plugin not being loaded or the config "
+"page has not been created"
+msgstr ""
+"Failed to add %1's config page due to the plugin not being loaded or the config "
+"page has not been created"
+
+#: ksimpref.cpp:160
+msgid "%1 Options"
+msgstr "%1 Options"
 
 #: themeprefs.cpp:68
 msgid ""
@@ -660,6 +615,10 @@ msgstr "Open Konqueror in KSim's theme folder"
 msgid "Author:"
 msgstr "Author:"
 
+#: library/chart.cpp:120 themeprefs.cpp:96
+msgid "None"
+msgstr "None"
+
 #: themeprefs.cpp:100
 msgid "Theme"
 msgstr "Theme"
@@ -696,53 +655,83 @@ msgstr "None Specified"
 msgid "None specified"
 msgstr "None specified"
 
-#: ksimview.cpp:119
-msgid "Unknown"
-msgstr "Unknown"
+#: monitorprefs.cpp:35
+msgid "Monitor"
+msgstr "Monitor"
 
-#: ksimview.cpp:198
-msgid ""
-"There was an error while trying to create the local folders. This could be "
-"caused by permission problems."
-msgstr ""
-"There was an error while trying to create the local folders. This could be "
-"caused by permission problems."
+#: monitorprefs.cpp:36
+msgid "Description"
+msgstr "Description"
 
-#: ksim.cpp:58
-msgid "KSim"
-msgstr "KSim"
+#: monitorprefs.cpp:37
+msgid "LMB Command"
+msgstr "LMB Command"
 
-#: ksim.cpp:59
-msgid "A plugin based system monitor for TDE"
-msgstr "A plugin based system monitor for TDE"
+#: ksimsysinfo.cpp:197
+msgid "Current system time"
+msgstr "Current system time"
 
-#: ksim.cpp:60
-msgid ""
-"(C) 2001-2003 Robbie Ward\n"
-"(C) 2005 Reuben Sutton"
-msgstr ""
-"(C) 2001-2003 Robbie Ward\n"
-"(C) 2005 Reuben Sutton"
+#: ksimsysinfo.cpp:211
+msgid "Current system date"
+msgstr "Current system date"
 
-#: ksim.cpp:61
-msgid "Maintainer"
-msgstr "Maintainer"
+#: ksimsysinfo.cpp:227
+msgid "System uptime"
+msgstr "System uptime"
 
-#: ksim.cpp:62
-msgid "Original Author"
-msgstr "Original Author"
+#: ksimsysinfo.cpp:308
+msgid "Uptime display disabled"
+msgstr "Uptime display disabled"
 
-#: ksim.cpp:64
-msgid "Developer"
-msgstr "Developer"
+#: ksimsysinfo.cpp:316
+msgid "Memory display disabled"
+msgstr "Memory display disabled"
 
-#: ksim.cpp:66
-msgid "Some FreeBSD ports"
-msgstr "Some FreeBSD ports"
+#: ksimsysinfo.cpp:324
+msgid "Swap display disabled"
+msgstr "Swap display disabled"
 
-#: ksim.cpp:68
-msgid "Testing, Bug fixing and some help"
-msgstr "Testing, Bug fixing and some help"
+#: library/pluginloader.cpp:93
+msgid ""
+"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
+"empty in the plugins desktop file"
+msgstr ""
+"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
+"empty in the plugins desktop file"
+
+#: library/pluginloader.cpp:99
+msgid ""
+"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
+"check that the plugin is installed and is in your $TDEDIR/lib path"
+msgstr ""
+"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
+"check that the plugin is installed and is in your $TDEDIR/lib path"
+
+#: library/pluginloader.cpp:105
+msgid ""
+"<qt>An error occurred while trying \n"
+"to load the plugin '%1'. \n"
+"This could be caused by the following:"
+"<ul>\n"
+"<li>The plugin doesn't have the %2 macro</li>\n"
+"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
+"</ul> \n"
+"Last error message that occurred: \n"
+"%3</qt>"
+msgstr ""
+"<qt>An error occurred while trying \n"
+"to load the plugin '%1'. \n"
+"This could be caused by the following:"
+"<ul>\n"
+"<li>The plugin doesn't have the %2 macro</li>\n"
+"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
+"</ul> \n"
+"Last error message that occurred: \n"
+"%3</qt>"
+
+#: library/pluginloader.cpp:315
+msgid "Unable to get last error message"
+msgstr "Unable to get last error message"
 
 #: generalprefs.cpp:50
 msgid "Graph Size"
@@ -929,3 +918,15 @@ msgstr "%f - Total free swap"
 #, c-format
 msgid "%u - Total used swap"
 msgstr "%u - Total used swap"
+
+#: ksimview.cpp:119
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ksimview.cpp:198
+msgid ""
+"There was an error while trying to create the local folders. This could be "
+"caused by permission problems."
+msgstr ""
+"There was an error while trying to create the local folders. This could be "
+"caused by permission problems."
diff --git a/tde-i18n-en_GB/messages/tdeutils/ktimer.po b/tde-i18n-en_GB/messages/tdeutils/ktimer.po
index 976a4c9f5fa..3e69af7ac81 100644
--- a/tde-i18n-en_GB/messages/tdeutils/ktimer.po
+++ b/tde-i18n-en_GB/messages/tdeutils/ktimer.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-07-21 17:34+0100\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,7 +54,7 @@ msgid "Delay [s]"
 msgstr "Delay [s]"
 
 #. i18n: file prefwidget.ui line 53
-#: rc.cpp:12 rc.cpp:42
+#: rc.cpp:12 rc.cpp:45
 #, no-c-format
 msgid "State"
 msgstr "State"
@@ -70,56 +71,56 @@ msgstr "Command"
 msgid "&New"
 msgstr "&New"
 
-#. i18n: file prefwidget.ui line 124
-#: rc.cpp:24
+#. i18n: file prefwidget.ui line 132
+#: rc.cpp:27
 #, no-c-format
 msgid "Settings"
 msgstr "Settings"
 
-#. i18n: file prefwidget.ui line 141
-#: rc.cpp:27
+#. i18n: file prefwidget.ui line 149
+#: rc.cpp:30
 #, no-c-format
 msgid "&Loop"
 msgstr "&Loop"
 
-#. i18n: file prefwidget.ui line 149
-#: rc.cpp:30
+#. i18n: file prefwidget.ui line 157
+#: rc.cpp:33
 #, no-c-format
 msgid "Delay:"
 msgstr "Delay:"
 
-#. i18n: file prefwidget.ui line 165
-#: rc.cpp:33
+#. i18n: file prefwidget.ui line 173
+#: rc.cpp:36
 #, no-c-format
 msgid "Start only &one instance"
 msgstr "Start only &one instance"
 
-#. i18n: file prefwidget.ui line 173
-#: rc.cpp:36
+#. i18n: file prefwidget.ui line 181
+#: rc.cpp:39
 #, no-c-format
 msgid "seconds"
 msgstr "seconds"
 
-#. i18n: file prefwidget.ui line 203
-#: rc.cpp:39
+#. i18n: file prefwidget.ui line 211
+#: rc.cpp:42
 #, no-c-format
 msgid "Command line:"
 msgstr "Command line:"
 
-#. i18n: file prefwidget.ui line 246
-#: rc.cpp:45
+#. i18n: file prefwidget.ui line 254
+#: rc.cpp:48
 #, no-c-format
 msgid "||"
 msgstr "||"
 
-#. i18n: file prefwidget.ui line 254
-#: rc.cpp:48
+#. i18n: file prefwidget.ui line 262
+#: rc.cpp:51
 #, no-c-format
 msgid ">"
 msgstr ">"
 
-#. i18n: file prefwidget.ui line 262
-#: rc.cpp:51
+#. i18n: file prefwidget.ui line 270
+#: rc.cpp:54
 #, no-c-format
 msgid "="
 msgstr "="
diff --git a/tde-i18n-en_GB/messages/tdeutils/superkaramba.po b/tde-i18n-en_GB/messages/tdeutils/superkaramba.po
index 9764d6f6244..feb092a5a1d 100644
--- a/tde-i18n-en_GB/messages/tdeutils/superkaramba.po
+++ b/tde-i18n-en_GB/messages/tdeutils/superkaramba.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: superkaramba\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-11-07 01:14+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/tdelirc.po b/tde-i18n-en_GB/messages/tdeutils/tdelirc.po
index c6333ff9aa4..56cf981bf37 100644
--- a/tde-i18n-en_GB/messages/tdeutils/tdelirc.po
+++ b/tde-i18n-en_GB/messages/tdeutils/tdelirc.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelirc\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-11-02 16:14+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/tdessh.po b/tde-i18n-en_GB/messages/tdeutils/tdessh.po
index 3f403caa906..3f3a0ff7b62 100644
--- a/tde-i18n-en_GB/messages/tdeutils/tdessh.po
+++ b/tde-i18n-en_GB/messages/tdeutils/tdessh.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdessh\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-05 11:23+0100\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdeutils/tdewalletmanager.po b/tde-i18n-en_GB/messages/tdeutils/tdewalletmanager.po
index e3717cf246d..4c9467acd05 100644
--- a/tde-i18n-en_GB/messages/tdeutils/tdewalletmanager.po
+++ b/tde-i18n-en_GB/messages/tdeutils/tdewalletmanager.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdewalletmanager\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2006-12-08 13:58+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,6 +61,96 @@ msgstr ""
 msgid "That wallet file already exists.  You cannot overwrite wallets."
 msgstr "That wallet file already exists.  You cannot overwrite wallets."
 
+#: kwmapeditor.cpp:43
+msgid "Key"
+msgstr "Key"
+
+#: kwmapeditor.cpp:44
+msgid "Value"
+msgstr "Value"
+
+#: kwmapeditor.cpp:121
+msgid "&New Entry"
+msgstr "&New Entry"
+
+#: main.cpp:45
+msgid "Show window on startup"
+msgstr "Show window on startup"
+
+#: main.cpp:46
+msgid "For use by tdewalletd only"
+msgstr "For use by tdewalletd only"
+
+#: main.cpp:47
+msgid "A wallet name"
+msgstr "A wallet name"
+
+#: main.cpp:51 main.cpp:70
+msgid "TDE Wallet Manager"
+msgstr "TDE Wallet Manager"
+
+#: main.cpp:52
+msgid "TDE Wallet Management Tool"
+msgstr "TDE Wallet Management Tool"
+
+#: main.cpp:54
+msgid "(c) 2003,2004 George Staikos"
+msgstr "(c) 2003,2004 George Staikos"
+
+#: main.cpp:57
+msgid "Primary author and maintainer"
+msgstr "Primary author and maintainer"
+
+#: main.cpp:58
+msgid "Developer"
+msgstr "Developer"
+
+#. i18n: file kbetterthankdialogbase.ui line 60
+#: rc.cpp:18
+#, no-c-format
+msgid "&Replace"
+msgstr "&Replace"
+
+#. i18n: file kbetterthankdialogbase.ui line 71
+#: rc.cpp:21
+#, no-c-format
+msgid "Replace &All"
+msgstr "Replace &All"
+
+#. i18n: file kbetterthankdialogbase.ui line 79
+#: rc.cpp:24
+#, no-c-format
+msgid "&Skip"
+msgstr "&Skip"
+
+#. i18n: file kbetterthankdialogbase.ui line 87
+#: rc.cpp:27
+#, no-c-format
+msgid "Skip A&ll"
+msgstr "Skip A&ll"
+
+#. i18n: file walletwidget.ui line 237
+#: rc.cpp:36
+#, no-c-format
+msgid "Hide &Contents"
+msgstr "Hide &Contents"
+
+#. i18n: file walletwidget.ui line 269
+#: rc.cpp:39
+#, no-c-format
+msgid ""
+"This is a binary data entry.  It cannot be editted as its format is unknown and "
+"application specific."
+msgstr ""
+"This is a binary data entry.  It cannot be editted as its format is unknown and "
+"application specific."
+
+#. i18n: file walletwidget.ui line 398
+#: rc.cpp:42
+#, no-c-format
+msgid "Show &Contents"
+msgstr "Show &Contents"
+
 #: tdewalleteditor.cpp:81
 msgid "&Show values"
 msgstr "&Show values"
@@ -313,93 +404,3 @@ msgstr "Please choose a name that contains only alphanumeric characters:"
 #: tdewalletpopup.cpp:60
 msgid "Disconnec&t"
 msgstr "Disconnec&t"
-
-#: kwmapeditor.cpp:43
-msgid "Key"
-msgstr "Key"
-
-#: kwmapeditor.cpp:44
-msgid "Value"
-msgstr "Value"
-
-#: kwmapeditor.cpp:121
-msgid "&New Entry"
-msgstr "&New Entry"
-
-#: main.cpp:45
-msgid "Show window on startup"
-msgstr "Show window on startup"
-
-#: main.cpp:46
-msgid "For use by tdewalletd only"
-msgstr "For use by tdewalletd only"
-
-#: main.cpp:47
-msgid "A wallet name"
-msgstr "A wallet name"
-
-#: main.cpp:51 main.cpp:70
-msgid "TDE Wallet Manager"
-msgstr "TDE Wallet Manager"
-
-#: main.cpp:52
-msgid "TDE Wallet Management Tool"
-msgstr "TDE Wallet Management Tool"
-
-#: main.cpp:54
-msgid "(c) 2003,2004 George Staikos"
-msgstr "(c) 2003,2004 George Staikos"
-
-#: main.cpp:57
-msgid "Primary author and maintainer"
-msgstr "Primary author and maintainer"
-
-#: main.cpp:58
-msgid "Developer"
-msgstr "Developer"
-
-#. i18n: file kbetterthankdialogbase.ui line 60
-#: rc.cpp:18
-#, no-c-format
-msgid "&Replace"
-msgstr "&Replace"
-
-#. i18n: file kbetterthankdialogbase.ui line 71
-#: rc.cpp:21
-#, no-c-format
-msgid "Replace &All"
-msgstr "Replace &All"
-
-#. i18n: file kbetterthankdialogbase.ui line 79
-#: rc.cpp:24
-#, no-c-format
-msgid "&Skip"
-msgstr "&Skip"
-
-#. i18n: file kbetterthankdialogbase.ui line 87
-#: rc.cpp:27
-#, no-c-format
-msgid "Skip A&ll"
-msgstr "Skip A&ll"
-
-#. i18n: file walletwidget.ui line 237
-#: rc.cpp:36
-#, no-c-format
-msgid "Hide &Contents"
-msgstr "Hide &Contents"
-
-#. i18n: file walletwidget.ui line 269
-#: rc.cpp:39
-#, no-c-format
-msgid ""
-"This is a binary data entry.  It cannot be editted as its format is unknown and "
-"application specific."
-msgstr ""
-"This is a binary data entry.  It cannot be editted as its format is unknown and "
-"application specific."
-
-#. i18n: file walletwidget.ui line 398
-#: rc.cpp:42
-#, no-c-format
-msgid "Show &Contents"
-msgstr "Show &Contents"