Update translation files

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

15 files changed, 11623 insertions, 9404 deletions

diff --git a/po/cs.po b/po/cs.po
index 78fd09e..bed9b7b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,24 +4,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2006-07-29 12:57+0200\n"
 "Last-Translator: Radomir Fojtik <radfoj@seznam.cz>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Radomir Fojtik"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -39,46 +40,51 @@ msgid "BasKet Note Pads"
 msgstr "BasKet Note Pads"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Autor, maintainer"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Šifrování košíků, integrace s Kontactem, Knowit import"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
 msgstr ""
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Ikona"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr ""
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr ""
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr ""
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 #, fuzzy
 msgid "Basket Archive Error"
 msgstr "Chyba ukládání"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr ""
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -87,41 +93,41 @@ msgid ""
 "original one."
 msgstr ""
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
 msgstr ""
 
-#: backup.cpp:56
+#: backup.cpp:58
 #, fuzzy
 msgid "Backup & Restore"
 msgstr "&Obnovit"
 
-#: backup.cpp:65
+#: backup.cpp:67
 #, fuzzy
 msgid "Save Folder"
 msgstr "Uložit do souboru"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr ""
 
-#: backup.cpp:69
+#: backup.cpp:71
 #, fuzzy
 msgid "&Move to Another Folder..."
 msgstr "&Uložit do souboru..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr ""
 
-#: backup.cpp:71
+#: backup.cpp:73
 #, fuzzy
 msgid "Why to do that?"
 msgstr "Co to znamená?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -135,154 +141,154 @@ msgid ""
 "to the basket).</p>"
 msgstr ""
 
-#: backup.cpp:89
+#: backup.cpp:91
 msgid "Backups"
 msgstr ""
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr ""
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr ""
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr ""
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr ""
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr ""
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr ""
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr ""
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr ""
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr ""
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr ""
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
 msgstr ""
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr ""
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr ""
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 #, fuzzy
 msgid "All Files"
 msgstr "&Soubory"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 #, fuzzy
 msgid "Backup Baskets"
 msgstr "Košíky"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr ""
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr ""
 
-#: backup.cpp:200
+#: backup.cpp:202
 #, fuzzy
 msgid "Backing up baskets. Please wait..."
 msgstr "&Exportovat do HTML..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr ""
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr ""
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
 msgstr ""
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr ""
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
 msgstr ""
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
 msgstr ""
 
-#: backup.cpp:254
+#: backup.cpp:256
 #, fuzzy
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "&Exportovat do HTML..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
 msgstr ""
 
-#: backup.cpp:257
+#: backup.cpp:259
 #, fuzzy
 msgid "Restore Baskets"
 msgstr "Odstranit košík"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr ""
 
-#: backup.cpp:287
+#: backup.cpp:289
 #, fuzzy
 msgid "Restore Error"
 msgstr "&Obnovit"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -305,39 +311,39 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr ""
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "Nová poznámka neodpovídá filtru a je skrytá."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Nová poznámka neodpovídá filtru a je skrytá."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr "Některé nové poznámky neodpovídají filtru a jsou skryty."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "Nové poznámky neodpovídají filtru a jsou skryty."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Skupina"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Vložit"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Upuštěno do košíku <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 #, fuzzy
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
@@ -346,7 +352,7 @@ msgstr ""
 "Tato zpráva by se neměla zobrazit. Pokud je tomu tak, je tento program "
 "chybný! Prosím reportujte bug vývojáři."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -354,48 +360,48 @@ msgstr ""
 "Vložit poznámku\n"
 "Klikněte pravým myšítkem pro více možností"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Změňte velikost těchto sloupců"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Změňte velikost této skupiny"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Změňte velikost této poznámky"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Vyberte nebo přesuňte tuto poznámku"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Vyberte nebo přesuňte tuto skupinu"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Přiřaď nebo zruš značku pro tuto poznámku"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Přiřazené značky </b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Rozbalit tuto skupinu"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Sbalit tuto skupinu"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -403,7 +409,7 @@ msgstr ""
 "Seskupit poznámku spoznámkou níže\n"
 "Klikněte pravým myšítkem pro více možností"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -411,73 +417,78 @@ msgstr ""
 "Seskupit poznámku spoznámkou výše\n"
 "Klikněte pravým myšítkem pro více možností"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Přidáno"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Poslední změna"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Klikněte napravo pro seskupení místo vložení"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Klikněte nalevo pro vložení místo seskupení"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Odemknout"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Heslem chráněný košík."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 #, fuzzy
 msgid "Press Unlock to access it."
 msgstr "Zmáčkněte Odemknout pro zobrazení."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Šifrování není podporováno <br/>touto verzí %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
 msgstr ""
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Načítám..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Odstranit vše"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Přizpůsobit..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtrovat touto značkou"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtrovat tímto &stavem"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Značky"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -487,7 +498,7 @@ msgstr ""
 "<qt>Opravdu chcete smazat tyto <b>%n</b> poznámky?</qt>\n"
 "<qt>Opravdu chcete smazat těchto <b>%n</b> poznámek?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -496,7 +507,7 @@ msgstr ""
 "Smazat poznámky\n"
 "Smazat poznámky"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -505,7 +516,7 @@ msgstr ""
 "Poznámky zkopírovány  do schránky.\n"
 "Poznámky zkopírovány  do schránky."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -514,7 +525,7 @@ msgstr ""
 "Poznámky vyjmuty do schránky.\n"
 "Poznámky vyjmuty do schránky."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -523,40 +534,45 @@ msgstr ""
 "Zkopírovány poznámky do výběru.\n"
 "Zkopírovány poznámky do výběru."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Nelze otevřít tuto poznámku."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Nejste oprávněni otevřít tento soubor."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Uložit do souboru"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Zadejte prosím heslo pro následující soukromý klíč:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Zadejte prosím heslo pro košík <i>%1</i>"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Zvolte prosím heslo pro košík <i>%1</i>"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 #, fuzzy
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Nedostatečné místo na disku pro uložení dat košíku"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Špatné práva souboru košíku"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -564,7 +580,7 @@ msgstr ""
 "Prosím odstraňte soubory na disku <b>%1</b>, aby aplikace bezpečně uložila "
 "Vámi provedené změny."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 #, fuzzy
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
@@ -573,10 +589,36 @@ msgstr ""
 "Práva k souboru jsou špatná pro <b>%1</b>. Prosím zkontrolujte, zda máte "
 "právo zápisu."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Chyba ukládání"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Zobrazit/skrýt hlavní okno"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"&Obnovit hlavní okno, když myš přejede přes ikonu v systémovém panelu na"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+msgid "Open basket archive or template"
+msgstr ""
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Promiňte, ale vytvoření adresáře pro tento košíš se nezdařilo."
@@ -609,10 +651,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Vlastnosti košíku"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Jméno"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 #, fuzzy
 msgid "Background &image:"
@@ -714,26 +760,26 @@ msgstr "<p>Tento košík je <b>zamknutý</b>.<br>Klikněte k jeho odemknutí.</p
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Tento košík je <b>odemknutý</b>.<br>Klikněte k jeho uzamčení.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Obecné"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Zobrazit/skrýt hlavní okno"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr ""
 "Umožní zobrazit hlavní okno, pokud je skryto a skrýt ho, pokud je zobrazeno."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Vložit obsah schránky do současného košíku"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 #, fuzzy
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
@@ -742,19 +788,19 @@ msgstr ""
 "Umožní vložit obsah schránky do současného košíku bez nutnosti otevírat "
 "hlavní okno."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Zobrazit název současného košíku"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "Umožní zjistit současný košík bez nutnosti otevírat hlavní okno."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Vložit výběr do současného košíku"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 #, fuzzy
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
@@ -763,11 +809,11 @@ msgstr ""
 "Umožní vkládat výběr ze schránky do současného košíku bez nutnosti otevírat "
 "hlavní okno."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Vytvořit nový košík"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 #, fuzzy
 msgid ""
 "Allows you to create a new basket without having to open the main window "
@@ -778,11 +824,11 @@ msgstr ""
 "použít jinou globální zkratku pro přidání poznámky, vložení schránky nebo "
 "vložení výběru v tomto novém košíku)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Přejít do předešlého košíku"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 #, fuzzy
 msgid ""
 "Allows you to change current basket to the previous one without having to "
@@ -791,11 +837,11 @@ msgstr ""
 "Umožní změnit současný košík na předchozí bez nutnosti mít otevřené hlavní "
 "okno."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Přejít do následujícího košíku"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 #, fuzzy
 msgid ""
 "Allows you to change current basket to the next one without having to open "
@@ -803,11 +849,11 @@ msgid ""
 msgstr ""
 "Umožní změnit současný košík na další bez nutnosti mít otevřené hlavní okno."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Vložit textovou poznámku"
 
-#: bnpview.cpp:265
+#: bnpview.cpp:308
 #, fuzzy
 msgid ""
 "Add a text note to the current basket without having to open the main window."
@@ -815,11 +861,11 @@ msgstr ""
 "Přodat textovou poznámku do současného košíku bez nutnosti mít otevřené "
 "hlavní okno."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Vložit obrázek"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 #, fuzzy
 msgid ""
 "Add an image note to the current basket without having to open the main "
@@ -827,22 +873,22 @@ msgid ""
 msgstr ""
 "Přidat obrázek do současného košíku bez nutnosti mít otevřené hlavní okno."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Vložit odkaz"
 
-#: bnpview.cpp:273
+#: bnpview.cpp:316
 #, fuzzy
 msgid ""
 "Add a link note to the current basket without having to open the main window."
 msgstr ""
 "Přidat odkaz do současného košíku bez nutnosti mít otevřené hlavní okno."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Vložit barvu"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 #, fuzzy
 msgid ""
 "Add a color note to the current basket without having to open the main "
@@ -850,11 +896,11 @@ msgid ""
 msgstr ""
 "Přidá poznámku barby do současného košíku bez nutnosti otevírat hlavní okno."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Zachytit barvu z obrazovky"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 #, fuzzy
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
@@ -863,11 +909,11 @@ msgstr ""
 "Přidat barvu vybranou z jednoho pixelu na obrazovce do současného košíku bez "
 "nutnosti otevírat hlavní okno."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Sejmou část obrazovky"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 #, fuzzy
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
@@ -876,15 +922,11 @@ msgstr ""
 "Zachytí oblast obrazovky jako obrázek v současném košíku bez otevírání "
 "hlavího okna."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Košíky"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr ""
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -897,247 +939,252 @@ msgstr ""
 "kliknutím na příslušný koš, nebo přeuspořádat je použitím funkce táhní a "
 "pust."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 #, fuzzy
 msgid "&Basket Archive..."
 msgstr "&Nový košík..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Skrýt okno"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 #, fuzzy
 msgid "&HTML Web Page..."
 msgstr "&HTML stránka"
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 #, fuzzy
 msgid "Text &File..."
 msgstr "&Uložit do souboru..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr ""
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Smazat"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Vybere všechny poznámky"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Odz&načit vše"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Odznačí všechny označené poznámky"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Obrátit výběr"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Obrátí současně označené poznámky"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Upravit..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Otevřít"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Otevřít &s..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Uložit do souboru..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Seskupit"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "&Rozdělit"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Posunout &nahoru"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Posunout &výš"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Posunout &níž"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Posunout &dolů"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Text"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "&Odkaz"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Obrázek"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Barva"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "&Spouštěč"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importovat spouštěč z &TDE nabídky..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&portovat ikonu..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Načíst ze &souboru..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "&Barva z obrazovky"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Sejmou část &obrazovky"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Nový košík..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Nový &podřazený košík..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Nový &sourozenecký košík..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Nový"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Vlastnosti košíku"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Odstranit"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Ochrana &Heslem..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "&Zamknout"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtrovat"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtrovat všechny &košíky"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "&Vyčistit filtr"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Předešlý košík"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "&Další košík"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Rozbalit košík"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Sbalit košík"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Nastavit g&lobální zkratky..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 #, fuzzy
 msgid "&Welcome Baskets"
 msgstr "&Odstranit košík"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Převod poznámek prostého textu"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Převádím poznámky v prostém textu do formátovatelných..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Uzamčen"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Žádné poznámky"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1147,7 +1194,7 @@ msgstr ""
 "%n poznámky\n"
 "%n poznámek"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1157,15 +1204,15 @@ msgstr ""
 " %n vybrané\n"
 " %n vybraných"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "všechny odpovídající"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "žádný filtr"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1175,31 +1222,31 @@ msgstr ""
 "%n odpovídají\n"
 "%n odpovídajících"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Vybrána barva do košíku <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 #, fuzzy
 msgid "The plain text notes have been converted to rich text."
 msgstr "Prosté textové poznámky byly převedeny do formátovatelných."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Převod ukončen"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 #, fuzzy
 msgid "There are no plain text notes to convert."
 msgstr "Nejsou žádné textové poznámky k převedení."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 #, fuzzy
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
@@ -1218,45 +1265,45 @@ msgstr ""
 "naistalována, ale měli jste nainstalovanou předešlou preview verzi, zkuste "
 "odstranit %5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Zdroj nenalezen"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Nelze přidat poznámku."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Zachycená část obrazovky do košíku <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Smazat košík"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Smazat pouze ten košík"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 #, fuzzy
 msgid "Delete Note & Children"
 msgstr "Smazat s jeho dětmi"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
+#: bnpview.cpp:1703 bnpview.cpp:1709
 msgid ""
 "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>Opravdu chcete odstranit košík <b>%1</b> a jeho obsah?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Odstranit košík"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Odstranit košík"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 #, fuzzy
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
@@ -1265,46 +1312,46 @@ msgstr ""
 "<qt><b>%1</b> má následující podřazený košík.<br>Chcete ho také odstranit?</"
 "qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 #, fuzzy
 msgid "Remove Children Baskets"
 msgstr "Odstranit podřazený košík"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 #, fuzzy
 msgid "&Remove Children Baskets"
 msgstr "Odstranit &podřazený košík"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 #, fuzzy
 msgid "Basket Archives"
 msgstr "Vlastnosti košíku"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Obsah schránky vložen do košíku <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Výběr vložen do košíku <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Nebyla přidána žádná poznámka."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Košík <i>%1</i> je uzamčen"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Uzamčen)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Přidělit novou značku..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Odstranit vše"
 
@@ -1394,11 +1441,11 @@ msgstr "&Značka: "
 msgid "Filter all Baskets"
 msgstr "Filtrovat všechny košíky"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Neoznačené)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Označené)"
 
@@ -1493,35 +1540,35 @@ msgstr "(Výchozí)"
 msgid "Other..."
 msgstr "Jiný..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Seznam osobních klíčů"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Email"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Zvolte tajný klíč:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Výčet klíčů se nečekaně zkrátil."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr ""
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Nepodporovaný algoritmus"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Chybné heslo."
 
@@ -1561,48 +1608,57 @@ msgstr "Souborový systém"
 msgid "File Types"
 msgstr "Typy souborů"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|ikony (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Otevřít"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr ""
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr ""
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 #, fuzzy
 msgid "&Send a Comment to Developers"
 msgstr "Poslat komentář"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Vítejte do této testovací verze %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr ""
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Vaše komentáře jsou důležité pro zlepšení."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 #, fuzzy
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
@@ -1613,7 +1669,7 @@ msgstr ""
 "příslušnou ručičku umístěnou pod titulkem okna, stručně popište co se Vám "
 "líbí nebo nelíbí a klikněte Poslat."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 #, fuzzy
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
@@ -1623,7 +1679,7 @@ msgstr ""
 "příslušnou ručičku umístěnou pod titulkem okna, stručně popište co se Vám "
 "líbí nebo nelíbí a klikněte Poslat."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 #, fuzzy
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
@@ -1633,7 +1689,7 @@ msgstr ""
 "příslušnou ručičku umístěnou pod titulkem okna, stručně popište co se Vám "
 "líbí nebo nelíbí a klikněte Poslat."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 #, fuzzy
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
@@ -1643,7 +1699,7 @@ msgstr ""
 "Stejný princip platí i pro rychlé nahlášení bugreportu: stačí kliknou na "
 "ikonu bugu v pravém horním rohu okna, popište jej a klikněte Poslat."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 #, fuzzy
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
@@ -1654,47 +1710,47 @@ msgstr ""
 "příslušnou ručičku umístěnou pod titulkem okna, stručně popište co se Vám "
 "líbí nebo nelíbí a klikněte Poslat."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr ""
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr ""
 
-#: likeback.cpp:469
+#: likeback.cpp:470
 #, fuzzy
 msgid ""
 "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr "uvítací stránka tohoto wizardu."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 #, fuzzy
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
 msgstr "když kliknu na tlačítko Přidat, nic se nestane."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Pomozte vylepšit aplikaci"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 #, fuzzy
 msgid "Email Address"
 msgstr "Nastavit emailovou adresu"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Prosím zadejte Vaši emailovou adresu."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 #, fuzzy
 msgid ""
 "It will only be used to contact you back if more information is needed about "
@@ -1705,7 +1761,7 @@ msgstr ""
 "k vašemu původnímu komentáři, jak reprodukovat chybu kterou jste reportoval, "
 "poslat Vám opravu chyby pro její otestování..."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 #, fuzzy
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
@@ -1714,79 +1770,78 @@ msgstr ""
 "Emailová adresa je nepovinná. Pokud ji neposkytnete, Váš komentář bute "
 "odeslát anonymně. V tomto případě pouze klikněte OK."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 #, fuzzy
 msgid "Send a Comment to Developers"
 msgstr "Poslat komentář"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr ""
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr ""
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr ""
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr ""
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr ""
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr ""
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 #, fuzzy
 msgid "&Send Comment"
 msgstr "Poslat komentář"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 #, fuzzy
 msgid "&Email Address..."
 msgstr "Nastavit emailovou adresu"
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr ""
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr ""
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr ""
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
 msgstr ""
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 #, fuzzy
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr "Neptejte se na nové vlastnosti: Vaše přání budou ignorována."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr "<p>Chyba při posílání zprávy.</p><p>Prosím, zkuste později.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Chyba přenosu"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 #, fuzzy
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
@@ -1795,7 +1850,7 @@ msgstr ""
 "<p>Váš komentář byl úspěšně odeslán.</p><p>Díky za Váš čas. Pomůže to ke "
 "zlepšení aplikace.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Komentář odeslán"
 
@@ -1895,19 +1950,19 @@ msgstr ""
 msgid "Example"
 msgstr "Příklad"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimalizovat"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Košík"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Opravdu chcete skončit %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 #, fuzzy
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
@@ -1917,7 +1972,7 @@ msgstr ""
 "<p>Mějte na paměti, že nemusíte ukončit aplikaci před koncem Vaší TDE "
 "relace: Aplikace bude nahrána když se znova přihlásíte.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Potvrdit ukončení"
 
@@ -1988,7 +2043,7 @@ msgstr "Volná forma"
 msgid "Mind map"
 msgstr "Myšlenková mapa"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Obrázek)"
 
@@ -2012,6 +2067,11 @@ msgstr "Animace"
 msgid "Sound"
 msgstr "Zvuk"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Soubory"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Odkaz"
@@ -2020,7 +2080,7 @@ msgstr "Odkaz"
 msgid "Launcher"
 msgstr "Spouštěč"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Barva"
 
@@ -2068,271 +2128,280 @@ msgstr "Upravit tuto barvu"
 msgid "Edit this unknown object"
 msgstr "Upravit tento neznámý objekt"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Otevírám prostý text..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Otevírám prosté texty..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Otevírám prostý text s..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Otevírám prosté texty s..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Otevřít prostý text s:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Otevřít prosté texty s:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Otevírám text..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Otevírám texty..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Otevírám text s..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Otevírám texty s..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Otevřít text s:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Otevřít text s:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Velikost"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 x %2 pixelů"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Otevírám obrázek..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Otevírám obrázky..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Otevírám obrázek s..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Otevírám obrázky s..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Otevřít obrázek s:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Otevřít obrázky s:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Klikněte pro náhled v plné velikosti"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Otevírám animaci..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Otevírám animace..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Otevírám animaci s..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Otevírám animace s..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Otevřít animaci s:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Otevřít animace s:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Typ"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Otevřít tento soubor"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Otevírám soubor..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Otevírám soubory..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Otevírám soubory s..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Otevírám soubory s..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Otevřít soubor s:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Otevřít soubory s:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Otevřít tento zvuk"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Otevírám zvuk..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Otevírám zvuky..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Otevírám zvuk s..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Otevírám zvuky s..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Otevřít zvuk s:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Otevřít zvuky s:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Cíl"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Otevřít tento odkaz"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Odkaz nemá URL, kterou otevřít."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Otevírám cíl odkazu..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Otevírám cíl odkazů..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Otevírám cíl odkazu s..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Otevírám cíl odkazů s..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Otevřít cíl odkazu s:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Otevřít cíl odkazů s:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(spustit v terminálu)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Komentář"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Příkaz"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Spustit tuto aplikaci"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Spouštěč nemá příkaz, který spustit."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Spouštím aplikaci..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Spouštím aplikace..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Červená</i>: %1, <i>Zelená</i>: %2, <i>Modrá</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Odstín</i>: %1, <i>Sytost</i>: %2, <i>Hodnota</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Název CSS barvy"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Název rozšířené CSS barvy"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Je webová barva"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Žádný"
+
+#: noteedit.cpp:385
 #, fuzzy
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
@@ -2343,11 +2412,11 @@ msgstr ""
 "editor obrázků).\n"
 "Chcete je otevřít s aplikací, která to dokáže?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Upravit obrázek"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2355,15 +2424,15 @@ msgstr ""
 "Tento animovaný obrázek zde nemůže být upraven.\n"
 "Chcete ho otevřít s aplikací, která to umí?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Upravit animaci"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Upravit barvu"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2372,74 +2441,97 @@ msgstr ""
 "Typ této poznámky je neznámý a nemůže zde být editován.\n"
 "Můžete ale chytnout nebo kopírovat poznámku do aplikace, která ji rozumí."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Upravit neznámou poznámku"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Upravit odkaz"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Automaticky"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Ikona:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Cíl:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Titulek:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Upravit spouštěč"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Vyberte příkaz k vykonání:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Odhad"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "Pří&kaz:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Název:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Font:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Velikost"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Tučné"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "S&kloněné"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Podtržené"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Zarovnat vlevo"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Zarovnat na střed"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Zarovnat vpravo"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Zarovnat do bloku"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2486,8 +2578,7 @@ msgstr "Zvolte velikost ikony k importu jako obrázek:"
 msgid "Load File Content into a Note"
 msgstr "Nahrát obsah souboru do poznámky"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Ochrana heslem"
@@ -2496,136 +2587,40 @@ msgstr "Ochrana heslem"
 msgid "No private key selected."
 msgstr "Nebyl vybrán osobní klíč."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Košík"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, fuzzy, no-c-format
-msgid "&Export"
-msgstr "&Importovat"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importovat"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Přejít"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Poznámka"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Značky"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Lišta pro formátování textu"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&ltr:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, fuzzy, no-c-format
-msgid "&No protection"
-msgstr "Ochrana heslem"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Chránit košík &heslem"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, fuzzy, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Chránit košík osobním &klíčem"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Vlevo"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Vpravo"
 
-#: settings.cpp:369
+#: settings.cpp:372
 #, fuzzy
 msgid "&Basket tree position:"
 msgstr "Pozic&e stromu košíků:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Nahoře"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Dole"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Pozice nástrojové lišty pro &filtrování:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "&Používat bubliny pro ohlášení výsledku globálních akcí"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr ""
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2634,83 +2629,83 @@ msgid ""
 "middle mouse button on that icon to paste the current selection."
 msgstr ""
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
 msgstr ""
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
 "the main window."
 msgstr ""
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Ikona systémového panelu"
 
-#: settings.cpp:407
+#: settings.cpp:410
 #, fuzzy
 msgid "&Dock in system tray"
 msgstr "&Skrýt v systémové části panelu"
 
-#: settings.cpp:416
+#: settings.cpp:419
 #, fuzzy
 msgid "&Show current basket icon in system tray icon"
 msgstr "Zobrazit ikonu &současného košíku v systémovém panelu"
 
-#: settings.cpp:426
+#: settings.cpp:429
 #, fuzzy
 msgid "&Hide main window when mouse leaves it for"
 msgstr "&Skrýt hlavní okno, když ho opustí kurzor myši na"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " desetiny sekundy"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr ""
 "&Obnovit hlavní okno, když myš přejede přes ikonu v systémovém panelu na"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "&Animovat změny v košících"
 
-#: settings.cpp:514
+#: settings.cpp:517
 #, fuzzy
 msgid "&Show tooltips in baskets"
 msgstr "Zobrazit &nástrojové tipy v košících"
 
-#: settings.cpp:517
+#: settings.cpp:520
 #, fuzzy
 msgid "&Big notes"
 msgstr "Vel&ké poznámky"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr ""
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr ""
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Zeptat se na potvrzení před &smazáním poznámky"
 
-#: settings.cpp:533
+#: settings.cpp:536
 #, fuzzy
 msgid "&Export tags in texts"
 msgstr "E&xportovat značky v textech"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Kdy se to použije?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2718,13 +2713,13 @@ msgstr ""
 "To se použije když kopírujete a vložíte, nebo chytnete a pustíte poznámky do "
 "textového editoru."
 
-#: settings.cpp:541
+#: settings.cpp:544
 msgid ""
 "If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "Pokud je povoleno, správně dovolí vložit značku jako textový ekvivalent."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2734,15 +2729,15 @@ msgstr ""
 "exportovány jako řádky, kterým předchází  <b>[ ]</b> nebo <b>[x]</b>, "
 "reprezentujících prázdný  rámeček a zaškrtnutý rámeček."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "&Seskupit novou poznámku kliknutím na pravou stranu čáry pro vložení"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Jak seskupit novou poznámku?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2752,7 +2747,7 @@ msgstr ""
 "poznámky na pozici kurzoru, ale také umožňuje seskupovat nové poznámky s "
 "těmi, které se nacházejí pod pozicí kurzoru:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2764,175 +2759,175 @@ msgstr ""
 "<b>vpravo</b> pro <b>seskupení</b> poznámky, s tou <b>pod nebo nad</b> - "
 "záleží na pozici Vaší myši.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Nedělej nic"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Vložit schránku"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Vložit spouštěč"
 
-#: settings.cpp:581
+#: settings.cpp:584
 #, fuzzy
 msgid "Insert color from screen"
 msgstr "Zachytit barvu z obrazovky"
 
-#: settings.cpp:582
+#: settings.cpp:585
 #, fuzzy
 msgid "Load note from file"
 msgstr "Načíst ze &souboru..."
 
-#: settings.cpp:583
+#: settings.cpp:586
 #, fuzzy
 msgid "Import Launcher from TDE Menu"
 msgstr "Importovat spouštěč z &TDE nabídky..."
 
-#: settings.cpp:584
+#: settings.cpp:587
 #, fuzzy
 msgid "Import icon"
 msgstr "Im&portovat ikonu..."
 
-#: settings.cpp:585
+#: settings.cpp:588
 #, fuzzy
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+prostřední klik:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "na pozici kurzoru"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr ""
 
-#: settings.cpp:603
+#: settings.cpp:606
 #, fuzzy
 msgid " minutes"
 msgstr "Žádné poznámky"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "Použít GnuPG agenta pro košíky chráněné &soukromým/veřejným klíčem"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr ""
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "V současné poznámce"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "&Nová velikost obrázku:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&X"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pixelů"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Vizualizovat..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Zobrazit obsah přidaných souborů pro následující typy"
 
-#: settings.cpp:732
+#: settings.cpp:735
 #, fuzzy
 msgid "&Plain text"
 msgstr "Prostý &text"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&HTML stránka"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Obrázek nebo animace"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Zvuk"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Audio nahrávka z konference"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Roční zpráva"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Domovský adresář"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Spustit %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Zvuky"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Soubory"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "&Místní odkazy"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "&Síťové odkazy"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "S&pouštěče"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Otevřít &textové poznámky s aplikací:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Otevřít textové poznámky s:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Otevřít &obrázkové poznámky s aplikací:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Otevřít obrázky s:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Otevřít &animované poznámky s aplikací:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Otevřít animace s:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Otevřít &zvukové poznámky s aplikací:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Otevřít zvukové poznámky s:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 #, fuzzy
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
@@ -2942,7 +2937,7 @@ msgstr ""
 "<p>Pokud zatrženo, aplikace uvedená níže bude použita pro otevření tohoto "
 "typu poznámky.</p><p>Jinak bude použita aplikace nastavená v Konqueroru.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2950,11 +2945,11 @@ msgstr ""
 "<p>Zvolte aplikaci pro otevírání typů poznámek místo aplikací nastavených v "
 "Konqueroru.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Jak změnit aplikaci použitou k otevření webových odkazů ?"
 
-#: settings.cpp:904
+#: settings.cpp:907
 #, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
@@ -2962,15 +2957,15 @@ msgid ""
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Webové odkazy jsou otvírány v různých aplikacích podle obsahu odkazu "
 "(webová stránka, obrázek, PDF dokument...), jako by to byly soubory na Vašem "
@@ -2987,11 +2982,11 @@ msgstr ""
 "otevírání webových stránek ve Vašem prohlížeči), přečtěte si druhý odkaz "
 "nápovědy.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Jak změnit aplikaci použitou k otevření souborů a odkazů ?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 #, fuzzy
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
@@ -3001,12 +2996,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Tady se dozvíte, jak nastavit aplikace pro jednotlivé typy souborů. To "
 "platí i pro webové odkazy, pokud zvolíte neotevírat je systematicky ve "
@@ -3251,6 +3246,11 @@ msgstr "Důležité"
 msgid "Very Important"
 msgstr "Velmi důležité"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animace"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Myšlenka"
@@ -3319,6 +3319,11 @@ msgstr "Posunout nahoru (Ctrl+Shift+Up)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Posunout dolů (Ctrl+Shift+Down)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Smazat"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Značka"
@@ -3486,6 +3491,112 @@ msgstr ""
 "velikosti obrázku a zavřete ho\n"
 "nebo stiskněte Esc pro uložení změny."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Košík"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, fuzzy, no-c-format
+msgid "&Export"
+msgstr "&Importovat"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importovat"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Přejít"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Poznámka"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Značky"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Skrýt &nástrojovou lištu"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Lišta pro formátování textu"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&ltr:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Otevřít"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, fuzzy, no-c-format
+msgid "&No protection"
+msgstr "Ochrana heslem"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Chránit košík &heslem"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, fuzzy, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Chránit košík osobním &klíčem"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
 #~ msgid "&Export to HTML..."
 #~ msgstr "&Exportovat do HTML..."
 
@@ -3522,9 +3633,6 @@ msgstr ""
 #~ msgid "I found a bug..."
 #~ msgstr "Nalezl jsem bug..."
 
-#~ msgid "Hide &Toolbar"
-#~ msgstr "Skrýt &nástrojovou lištu"
-
 #~ msgid "&No password"
 #~ msgstr "&Bez hesla"
 
diff --git a/po/da.po b/po/da.po
index da91c45..151d3c7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,23 +4,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2008-06-27 16:12+0200\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team:  <opensuse-translation@opensuse.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Martin Schlander"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -41,14 +42,19 @@ msgid "BasKet Note Pads"
 msgstr "BasKet notesblokke"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Udvikler, vedligeholder"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "BasKet-kryptering, Kontact-integration, Knowit-importering"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -56,32 +62,32 @@ msgstr ""
 "Kurve autolåser, gemmestatus-ikon, HTML kopiér/indsæt, kurvnavn værktøjstip, "
 "slip til kurvnavn"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Ikon"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Gem som Basket-arkiv"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Gemmer som Basket-arkiv. Vent venligst ..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Denne fil er ikke et Basket-arkiv"
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Fejl i Basket-arkiv"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Denne fil er korrupt. Den kan ikke åbnes."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -91,13 +97,11 @@ msgid ""
 msgstr ""
 "Denne fil blev oprettet med en nylig version af %1. Den kan åbnes, men ikke "
 "al information vil være tilgængelig for dig. For eksempel kan nogle noter "
-"mangle "
-"fordi de er af en type som kun er tilgængelig i nye versioner. Når du gemmer "
-"filen "
-"igen, bør du overveje at gemme den til en anden fil, for at bevare "
-"originalen."
+"mangle fordi de er af en type som kun er tilgængelig i nye versioner. Når du "
+"gemmer filen igen, bør du overveje at gemme den til en anden fil, for at "
+"bevare originalen."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
@@ -105,106 +109,104 @@ msgstr ""
 "Denne fil blev oprettet med en nylig version af %1. Opgradér venligst til en "
 "nyere version for at kunne åbne den fil."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Backup & Gendan"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Gem mappe"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Dine kurve er i øjeblikket gemt i den mappe:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&Flyt til anden mappe ..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Brug anden eksisterende mappe ..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Hvorfor gøre det?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
-"your baskets in a visible place in your home folder, like ~/Notes or "
-"~/Baskets, so you can manually backup them when you want.</li><li>Store your "
+"your baskets in a visible place in your home folder, like ~/Notes or ~/"
+"Baskets, so you can manually backup them when you want.</li><li>Store your "
 "baskets on a server to share them between two computers.<br>In this case, "
 "mount the shared-folder to the local file system and ask %2 to use that "
 "mount point.<br>Warning: you should not run %3 at the same time on both "
-"computers, or you risk to loss data while the two applications are "
-"desynced.</li></ul><p>Please remember that you should not change the content "
-"of that folder manually (eg. adding a file in a basket folder will not add "
-"that file to the basket).</p>"
-msgstr ""
-"<p>Du kan flytte mappen hvortil %1 gemmer dine kurve:</p><ul><li>Gem "
-"dine kurve på et synligt sted i din hjemmemappe, som ~/Noter eller "
-"~/Kurve, så du manuelt kan lave backup når du har lyst.</li><li>Gem dine "
-"kurve på en server for at dele dem mellem to computere.<br>I dette tilfælde, "
-"montér den delte mappe til det lokale filsystem og bed %2 om at bruge dette "
-"monteringspunkt.<br>Advarsel, du bør ikke køre %3 på samme tid på begge "
-"computere, ellers risikerer du at miste data mens de to applikationer er ude "
-"af "
-"synkronisering.</li></ul><p>Husk venligst at du ikke bør ændre mappens "
-"indhold "
-"manuelt (f.eks. vil tilføjelsen af en fil i en kurvmappe ikke tilføje den "
-"fil til kurven).</p>"
-
-#: backup.cpp:89
+"computers, or you risk to loss data while the two applications are desynced."
+"</li></ul><p>Please remember that you should not change the content of that "
+"folder manually (eg. adding a file in a basket folder will not add that file "
+"to the basket).</p>"
+msgstr ""
+"<p>Du kan flytte mappen hvortil %1 gemmer dine kurve:</p><ul><li>Gem dine "
+"kurve på et synligt sted i din hjemmemappe, som ~/Noter eller ~/Kurve, så du "
+"manuelt kan lave backup når du har lyst.</li><li>Gem dine kurve på en server "
+"for at dele dem mellem to computere.<br>I dette tilfælde, montér den delte "
+"mappe til det lokale filsystem og bed %2 om at bruge dette monteringspunkt."
+"<br>Advarsel, du bør ikke køre %3 på samme tid på begge computere, ellers "
+"risikerer du at miste data mens de to applikationer er ude af synkronisering."
+"</li></ul><p>Husk venligst at du ikke bør ændre mappens indhold manuelt (f."
+"eks. vil tilføjelsen af en fil i en kurvmappe ikke tilføje den fil til "
+"kurven).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Backup"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Backup ..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Gendan en backup ..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Seneste backup: Aldrig"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Seneste backup: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Vælg en mappe hvortil kurve skal flyttes"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "Mappen <b>%1</b> er ikke tom. Vil du underkende dette?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Underkend mappe?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "&Underkend"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr ""
-"Flytning af dine kurve <b>%1</b> er gennemført. %2 vil blive genstartet "
-"for at tage ændringen i betragtning."
+"Flytning af dine kurve <b>%1</b> er gennemført. %2 vil blive genstartet for "
+"at tage ændringen i betragtning."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Vælg en eksisterende mappe til at gemme kurve"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
@@ -212,46 +214,46 @@ msgstr ""
 "Ændring af din kurv-gemme-mappe til <b>%1</b> er blevet gennemført. %2 vil "
 "blive genstartet for at tage ændringen i betragtning."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Baskets_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Tar-arkiver komprimeret af Gzip"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Alle filer"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Backup-kurve"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "Filen <b>%1</b> eksisterer allerede. Vil du virkelig underkende den?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Underkend fil?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Laver backup af kurve. Vent venligst ..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Åbn Basket-arkiv"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "README.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
@@ -260,23 +262,23 @@ msgstr ""
 "Dette er en sikkerhedskopi af dine kurve som de var før du begyndte at "
 "gendanne backuppen %1."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr ""
-"Hvis gendannelsen blev gennemført og du gendannede det du ønskede "
-"kan du nu fjerne denne mappe."
+"Hvis gendannelsen blev gennemført og du gendannede det du ønskede kan du nu "
+"fjerne denne mappe."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
 msgstr ""
-"Hvis noget gik galt under gendannelsesprocessen kan du genbruge denne "
-"mappe til at gemme dine kurve og intet vil gå tabt."
+"Hvis noget gik galt under gendannelsesprocessen kan du genbruge denne mappe "
+"til at gemme dine kurve og intet vil gå tabt."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
@@ -284,36 +286,34 @@ msgstr ""
 "Vælg \"Basket\" -> \"Backup & Gendan ...\" -> \" Brug anden eksisterende "
 "mappe ...\" og vælg den mappe."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Gendanner <b>%1</b>. Vent venligst ..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
-"If something goes wrong during the restoration process, read the file "
-"<b>%1</b>."
+"If something goes wrong during the restoration process, read the file <b>%1</"
+"b>."
 msgstr ""
-"Hvis noget går galt under gendannelsesprocessen, så læs filen "
-"<b>%1</b>."
+"Hvis noget går galt under gendannelsesprocessen, så læs filen <b>%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Gendan kurve"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr ""
 "Dette arkiv er enten ikke en backup af kurve eller den er korrupt. Den kan "
-"ikke "
-"importeres. Dine gamle kurve er blevet bevaret i stedet."
+"ikke importeres. Dine gamle kurve er blevet bevaret i stedet."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Gendannelsesfejl"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -337,48 +337,47 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Kurve før gendannelse (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "Den nye note matcher ikke filteret og vil blive skjult."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "En ny note matcher ikke filteret og vil blive skjult."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr "Nogle nye noter matcher ikke filteret og vil blive skjult."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "De nye noter matcher ikke filteret og vil blive skjult."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Gruppér"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Indsæt"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Sluppet til kurven <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
 msgstr ""
 "Denne besked bør aldrig vise sig. Hvis den gør er dette program fejlfyldt! "
-"Rapportér "
-"venligst fejlen til udvikleren."
+"Rapportér venligst fejlen til udvikleren."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -386,48 +385,48 @@ msgstr ""
 "Indsæt note here\n"
 "Højreklik for flere valgmuligheder"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Ændr størrelse på disse kollonner"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Ændr størrelse på gruppe"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Ændr størrelse på note"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Vælg eller flyt denne note"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Vælg eller flyt denne gruppe"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Tildel eller fjern mærker fra denne note"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Tildelte mærker</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Udvid denne gruppe"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Fold denne gruppe sammen"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -435,7 +434,7 @@ msgstr ""
 "Gruppér note med den nedenunder\n"
 "Højreklik for flere valgmuligheder"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -443,75 +442,79 @@ msgstr ""
 "Gruppér note med den ovenfor\n"
 "Højreklik for flere valgmuligheder"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Tilføjet"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Seneste ændring"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Klik til højre for at gruppere i stedet for at indsætte"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Klik til venstre for at indsætte i stedet for at gruppere"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Lås op"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Adgangskodebeskyttet kurv."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Tryk på Lås op for at få adgang."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Kryptering er ikke understøttet af <br/>denne version af %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
 msgstr ""
-"For at få kurve til at forblive ulåste ændres den automatiske<br>"
-"låsevarighed i "
-"programopsætningen."
+"For at få kurve til at forblive ulåste ændres den "
+"automatiske<br>låsevarighed i programopsætningen."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Indlæser ..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "Fje&rn alle"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Tilpas ..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtrér efter dette mærke"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtrér efter denne &tilstand"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Mærker"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -520,7 +523,7 @@ msgstr ""
 "<qt>Vil du virkelig slette denne note?</qt>\n"
 "<qt>Vil du virkelig slette disse <b>%n</b> noter?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -528,7 +531,7 @@ msgstr ""
 "Slet note\n"
 "Slet noter"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -536,7 +539,7 @@ msgstr ""
 "Kopierede note til klippebordet.\n"
 "Kopierede noter til klippebordet."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -544,7 +547,7 @@ msgstr ""
 "Klip note til klippebordet.\n"
 "Klip noter til klippebordet."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -552,39 +555,44 @@ msgstr ""
 "Kopierede note til markering.\n"
 "Kopierede noter til markering."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Ikke i stand til at åbne denne note."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Du har ikke tilladelse til at åbne denne fil."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Gem til fil"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Indtast venligst adgangskoden for følgende private nøgle:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Indtast venligst adgangskoden for kurven <b>%1</b>:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Tildel venligst en adgangskode til kurven <b>%1</b>:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Utilstrækkelig diskplads til at gemme Basket-data"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Forkerte Basket-filtilladelser"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -592,19 +600,44 @@ msgstr ""
 "Fjern venligst filer fra disken <b>%1</b> for at lade programmet gemme dine "
 "ændringer sikkert."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
 msgstr ""
 "Dårlige filtilladelser for <b>%1</b>. Kontrollér venligst at du har "
-"skriveadgang til den "
-"og forældremapperne."
+"skriveadgang til den og forældremapperne."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Gemmefejl"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Vis/skjul hovedvinduet"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "Vis &hovedvinduet når musen er over statusområdeikonet i"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Åbn Basket-arkiv"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Beklager, men oprettelsen af mappen til denne nye kurve fejlede."
@@ -637,10 +670,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Egenskaber for kurv"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Navn"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "Baggrundsb&illede:"
@@ -696,21 +733,18 @@ msgid ""
 "useful in addition to the configurable global shortcuts, eg. to paste the "
 "clipboard or the selection into the current basket from anywhere.</p>"
 msgstr ""
-"<p><strong>Nemt at huske genveje</strong>:<br>Med den første "
-"valgmulighed, at give kurven en genvej i form af <strong>Alt+bogstav</strong>"
-" "
-" vil understrege det bogstav i kurv-træet.<br> For eksempel, hvis du "
-"tildeler genvejen <i>Alt+T</i> til en kurv kaldet <i>Tips</i> vil kurven "
-"blive vist som <i><u>T</u>ips</i> i træet. Det hjælper dig til at "
-"visualisere genvejene for at huske dem hurtigere.</p><p><strong>Lokal "
-"vs. Global</strong>:<br>Den første valgmulighed tillader at vise kurven mens "
-"hovedvinduet er aktivt. Globale genveje er gyldige alle steder, selv hvis "
-"vinduet er skjult.</p><p><strong>Vis vs. skift</strong>:<br>Den sidste "
-"valgmulighed "
-"gør denne kurv til den aktuelle uden at åbne hovedvinduet. Det er "
-"nyttigt i tillæg til de konfigurérbare globale genveje, f.eks. for at "
-"indsætte "
-"klippebordet eller markeringen i den aktuelle kurv, hvorsomhelst fra.</p>"
+"<p><strong>Nemt at huske genveje</strong>:<br>Med den første valgmulighed, "
+"at give kurven en genvej i form af <strong>Alt+bogstav</strong>  vil "
+"understrege det bogstav i kurv-træet.<br> For eksempel, hvis du tildeler "
+"genvejen <i>Alt+T</i> til en kurv kaldet <i>Tips</i> vil kurven blive vist "
+"som <i><u>T</u>ips</i> i træet. Det hjælper dig til at visualisere genvejene "
+"for at huske dem hurtigere.</p><p><strong>Lokal vs. Global</strong>:<br>Den "
+"første valgmulighed tillader at vise kurven mens hovedvinduet er aktivt. "
+"Globale genveje er gyldige alle steder, selv hvis vinduet er skjult.</"
+"p><p><strong>Vis vs. skift</strong>:<br>Den sidste valgmulighed gør denne "
+"kurv til den aktuelle uden at åbne hovedvinduet. Det er nyttigt i tillæg til "
+"de konfigurérbare globale genveje, f.eks. for at indsætte klippebordet eller "
+"markeringen i den aktuelle kurv, hvorsomhelst fra.</p>"
 
 #: basketproperties.cpp:149
 msgid "S&how this basket"
@@ -740,89 +774,86 @@ msgstr "<p>Denne kurv er <b>låst</b>.<br>Klik for at låse den op.</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Denne kurv er <b> ulåst</b>.<br>Klik for at låse den.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Generelt"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Vis/skjul hovedvinduet"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr ""
 "Tillader dig at vise hovedvinduet hvis det er skjult, og at skjule det, hvis "
-"det er "
-"vist."
+"det er vist."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Indsæt klippebordets indhold i aktuel kurv"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
 msgstr ""
 "Tillader dig at indsætte klippebordsindholdet i den aktuelle kurv uden at "
-"behøve "
-"at åbne hovedvinduet."
+"behøve at åbne hovedvinduet."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Vis navn på aktuel kurv"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
-msgstr "Tillader dig at vide hvilken kurv der er aktuel uden at åbne hovedvinduet."
+msgstr ""
+"Tillader dig at vide hvilken kurv der er aktuel uden at åbne hovedvinduet."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Indsæt markering i aktuel kurv"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
 msgstr ""
 "Tillader dig at indsætte klippebordsmarkering i den aktuelle kurv uden at "
-"behøve "
-"at åbne hovedvinduet."
+"behøve at åbne hovedvinduet."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Opret en ny kurv"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
 "or paste selection in this new basket)."
 msgstr ""
-"Tillader dig at oprette en ny kurv uden at behøve at åbne hovedvinduet "
-"(du kan da bruge de øvrige globale genveje for at tilføje en note, indsætte "
-"klippebord "
-"eller indsætte markering i denne nye kurv)."
+"Tillader dig at oprette en ny kurv uden at behøve at åbne hovedvinduet (du "
+"kan da bruge de øvrige globale genveje for at tilføje en note, indsætte "
+"klippebord eller indsætte markering i denne nye kurv)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Gå til forrige kurv"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
 msgstr ""
-"Tillader dig at skifte aktuel kurv til den forrige uden at behøve at "
-"åbne hovedvinduet."
+"Tillader dig at skifte aktuel kurv til den forrige uden at behøve at åbne "
+"hovedvinduet."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Gå til næste kurv"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -830,41 +861,43 @@ msgstr ""
 "Tillader dig at skifte aktuel kurv til den næste uden at behøve at åbne "
 "hovedvinduet."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Indsæt tekstnote"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr ""
 "Tilføj en tekstnote til den aktuelle kurv uden at behøve at åbne "
 "hovedvinduet."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Indsæt billednote"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
 msgstr ""
-"Tilføj en billednote til den aktuelle kurv uden at behøve åbne "
-"hovedvinduet."
+"Tilføj en billednote til den aktuelle kurv uden at behøve åbne hovedvinduet."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Indsæt linknote"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Tilføj en linknote til den aktuelle kurv uden at behøve at åbne hovedvinduet."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Tilføj en linknote til den aktuelle kurv uden at behøve at åbne hovedvinduet."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Indsæt farvenote"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
@@ -872,11 +905,11 @@ msgstr ""
 "Tilføj en farvenote til den aktuelle kurv uden at behøve at åbne "
 "hovedvinduet."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Pluk farve fra skærmen"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -884,275 +917,276 @@ msgstr ""
 "Tilføj en farvenote plukket fra en pixel på skærmen til den aktuelle kurv "
 "uden at behøve at åbne hovedvinduet."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Grib skærmzone"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
 msgstr ""
-"Grib en skærmzone som et billede i den aktuelle kurv uden at behøve at "
-"åbne hovedvinduet."
+"Grib en skærmzone som et billede i den aktuelle kurv uden at behøve at åbne "
+"hovedvinduet."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Kurve"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Skriv venligst på engelsk eller fransk."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
 "by creating new baskets inside others. You can browse between them by "
 "clicking a basket to open it, or reorganize them using drag and drop."
 msgstr ""
-"<h2>Kurvtræ</h2>Her er listen over dine kurve. Du kan organisere dine "
-"date ved at putte dem i forskellige kurve. Du kan gruppere kurve efter emne "
-"ved at oprette nye kurve inde i andre. Du kan gennemse dem ved at "
-"klikke på en kurv for at åbne den, eller reorganisere dem med træk og slip."
+"<h2>Kurvtræ</h2>Her er listen over dine kurve. Du kan organisere dine date "
+"ved at putte dem i forskellige kurve. Du kan gruppere kurve efter emne ved "
+"at oprette nye kurve inde i andre. Du kan gennemse dem ved at klikke på en "
+"kurv for at åbne den, eller reorganisere dem med træk og slip."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Basket-arkiv ..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "S&kjul vindue"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "&HTML webside ..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt ..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards ..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Tekst&fil ..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Backup && Gendan ..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "Sl&et"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Markér alle noter"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Af&markér alle"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Afmarkér alle markerede noter"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Omvend markering"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Omvend den aktuelle markering af noter"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Redigér ..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Åbn"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Åbn &med ..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "Gem &til fil ..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Gruppér"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "A&fgruppér"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Flyt til &toppen"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Flyt &op"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Flyt &ned"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Flyt til &bunden"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Tekst"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "&Link"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "B&illede"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Farve"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "Hurtigst&arter"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importér hurtigstarter fra TDE-menuen ..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&portér ikon ..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Indlæs fra &fil ..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "Far&ve fra skærm"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Grib skærm&zone"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Ny kurv ..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Ny &under-kurv ..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Ny søs&kende-kurv ..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Ny"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Egenskaber for kurv"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "Fje&rn"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Adgangsk&ode ..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "&Lås"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtrér"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtrér alle &kurve"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "&Nulstil filter"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "F&orrige kurv"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "&Næste kurv"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Fold kurv"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Udvid kurv"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Konfigurér &globale genveje ..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "&Velkomstkurve"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Konvertering af klartekstnoter"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Konverterer klartekstnoter til rigtekstnoter ..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Låst"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Ingen noter"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1161,7 +1195,7 @@ msgstr ""
 "%n note\n"
 "%n noter"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1170,15 +1204,15 @@ msgstr ""
 "%n markeret\n"
 "%n markeret"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "Alle match"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "intet filter"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1187,128 +1221,127 @@ msgstr ""
 "%n match\n"
 "%n match"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Plukkede farve til kurv <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Klartekstnoterne er blevet konverteret til rigtekst."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Konvertering afsluttet"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Der er ingen klartekstnoter at konvertere."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
-"run without it and will stop.</b></p><p>Please check your installation of "
-"%2.</p><p>If you do not have administrator access to install the application "
+"run without it and will stop.</b></p><p>Please check your installation of %2."
+"</p><p>If you do not have administrator access to install the application "
 "system wide, you can copy the file basketui.rc from the installation archive "
 "to the folder <a href='file://%3'>%4</a>.</p><p>As last ressort, if you are "
 "sure the application is correctly installed but you had a preview version of "
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
 "<p><b>Filen basketui.rc synes ikke at eksistere er eller for gammel.<br>%1 "
-"kan ikke "
-"køre uden den og vil afslutte.</b></p><p>Kontrollér venligst din "
-"installation af "
-"%2.</p><p>Hvis du ikke har administrator adgang til at installere programmet "
-"på hele systemet, kan du kopiere filen basketui.rc fra installationsarkivet "
-"til mappen <a href='file://%3'>%4</a>.</p><p>Som sidste udvej, hvis du er "
-"sikker på at programmet er korrekt installeret, men du havde en testversion "
-"af "
-"det, så forsøg at fjerne filen %5basketui.rc</p>"
-
-#: bnpview.cpp:1495
+"kan ikke køre uden den og vil afslutte.</b></p><p>Kontrollér venligst din "
+"installation af %2.</p><p>Hvis du ikke har administrator adgang til at "
+"installere programmet på hele systemet, kan du kopiere filen basketui.rc fra "
+"installationsarkivet til mappen <a href='file://%3'>%4</a>.</p><p>Som sidste "
+"udvej, hvis du er sikker på at programmet er korrekt installeret, men du "
+"havde en testversion af det, så forsøg at fjerne filen %5basketui.rc</p>"
+
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Ressource ikke fundet"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Kan ikke tilføje note."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Greb skærmzone til kurv <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Slet kurv"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Slet kun den kurv"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Slet note & undernoter"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>Vil du virkelig fjerne kurven <b>%1</b> og dens indhold?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Fjern kurv"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "Fje&rn kurv"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
-msgstr "<qt><b>%1</b> har følgende underkurve.<br> Vil du også fjerne dem?</qt>"
+msgstr ""
+"<qt><b>%1</b> har følgende underkurve.<br> Vil du også fjerne dem?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Fjern underkurve"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "Fje&rn underkurve"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Basket-arkiver"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Klippebordsindhold indsat i kurven <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Markering indsat i kurven <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Ingen note blev tilføjet."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Kurven <i>%1</i> er låst"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Låst)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Tildel nyt mærke ..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "Fje&rn alle"
 
@@ -1326,8 +1359,8 @@ msgstr ""
 "\n"
 "Men, alt er ikke tabt! Du kan muligvis hjælpe os med at rette fejlen. "
 "Information som beskriver nedbruddet er nedenfor, så klik blot send, eller "
-"hvis du "
-"har tid så skriv en kort beskrivelse af hvordan nedbruddet skete first.\n"
+"hvis du har tid så skriv en kort beskrivelse af hvordan nedbruddet skete "
+"first.\n"
 "\n"
 "Mange tak."
 
@@ -1337,8 +1370,7 @@ msgid ""
 "do not modify it."
 msgstr ""
 "Informationen nedenfor er til at hjælpe udviklerne med at identificere "
-"problemet, "
-"undlad venligst at ændre det."
+"problemet, undlad venligst at ændre det."
 
 #: crashhandler.cpp:206
 msgid ""
@@ -1350,8 +1382,7 @@ msgstr ""
 "%1 er gået ned! Vi beklager.\n"
 "\n"
 "Men ikke alt er tabt. Måske er der allerede en opgradering til rådighed som "
-"løser "
-"problemet. Kontrollér venligst din distributions softwarekilder."
+"løser problemet. Kontrollér venligst din distributions softwarekilder."
 
 #: debugwindow.cpp:34
 msgid "Debug Window"
@@ -1401,11 +1432,11 @@ msgstr "M&ærke: "
 msgid "Filter all Baskets"
 msgstr "Filtrér alle kurve"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Ikke mærket)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Mærket)"
 
@@ -1423,20 +1454,17 @@ msgstr "Tillad tabulering"
 
 #: formatimporter.cpp:132
 msgid ""
-"<p>Folder mirroring is not possible anymore (see <a "
-"href='http://basket.kde.org/'>basket.kde.org</a> for more "
-"information).</p><p>The folder <b>%1</b> has been copied for the basket "
-"needs. You can either delete this folder or delete the basket, or use both. "
-"But remember that modifying one will not modify the other anymore as they "
-"are now separate entities.</p>"
-msgstr ""
-"<p>Spejling af mapper er ikke længere muligt (se <a "
-"href='http://basket.kde.org/'>basket.kde.org</a> for mere "
-"information).</p><p>Mappen <b>%1</b> er blevet kopieret efter kurvens "
-"behov. Du kan enten slette denne mappe eller slette kurven, eller anvende "
-"begge. "
-"Men husk at ændring af den ene vil ikke ændre den anden længere da de "
-"nu er adskilte enheder.</p>"
+"<p>Folder mirroring is not possible anymore (see <a href='http://basket.kde."
+"org/'>basket.kde.org</a> for more information).</p><p>The folder <b>%1</b> "
+"has been copied for the basket needs. You can either delete this folder or "
+"delete the basket, or use both. But remember that modifying one will not "
+"modify the other anymore as they are now separate entities.</p>"
+msgstr ""
+"<p>Spejling af mapper er ikke længere muligt (se <a href='http://basket.kde."
+"org/'>basket.kde.org</a> for mere information).</p><p>Mappen <b>%1</b> er "
+"blevet kopieret efter kurvens behov. Du kan enten slette denne mappe eller "
+"slette kurven, eller anvende begge. Men husk at ændring af den ene vil ikke "
+"ændre den anden længere da de nu er adskilte enheder.</p>"
 
 #: formatimporter.cpp:134
 msgid "Folder Mirror Import"
@@ -1499,35 +1527,35 @@ msgstr "(Standard)"
 msgid "Other..."
 msgstr "Andet ..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Privat nøgleliste"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "E-mail"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Vælg hemmelig nøgle:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Nøgleliste uventet trunkeret."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Denne offentlige nøgle er ikke beregnet til kryptering"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Ikke understøttet algoritme"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Forkert adgangskode."
 
@@ -1567,98 +1595,104 @@ msgstr "Filsystem"
 msgid "File Types"
 msgstr "Filtyper"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Åbn"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr "Send programudviklere en kommentar om noget du synes om"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr "Send programudviklere en kommentar om noget du ikke synes om"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr "Send programudviklere en kommentar om dårlig adfærd i programmet"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr "Send programudviklere en kommentar om en ny funktion du ønsker"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "&Send en kommentar til udviklerne"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Velkommen til denne testversion af %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Velkommen til %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Dine kommentarer er vigtige for at hjælpe os med at forbedre det."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
 "or dislike and click Send."
 msgstr ""
 "Hver gang du har en god eller frustrerende oplevelse, bedes du være venlig "
-"og klikke på "
-"det passende ansigt under vinduestitellinjen. Beskriv kort hvad du kan lide "
-"eller "
-"ikke kan lide og send."
+"og klikke på det passende ansigt under vinduestitellinjen. Beskriv kort hvad "
+"du kan lide eller ikke kan lide og send."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
 msgstr ""
-"Hver gang du har en god oplevelse, bedes du være venlig og klikke på "
-"det smilende ansigt under vinduestitellinjen. Beskriv kort hvad du kan lide "
-"og send."
+"Hver gang du har en god oplevelse, bedes du være venlig og klikke på det "
+"smilende ansigt under vinduestitellinjen. Beskriv kort hvad du kan lide og "
+"send."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
 msgstr ""
 "Hver gang du har en frustrerende oplevelse, bedes du være venlig og klikke "
-"på "
-"det smilende ansigt under vinduestitellinjen. Beskriv kort hvad du ikke kan "
-"lide og send."
+"på det smilende ansigt under vinduestitellinjen. Beskriv kort hvad du ikke "
+"kan lide og send."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
-"Follow the same principle to quickly report a bug: just click the "
-"broken-object icon in the top-right corner of the window, describe it and "
-"click Send."
+"Follow the same principle to quickly report a bug: just click the broken-"
+"object icon in the top-right corner of the window, describe it and click "
+"Send."
 msgstr ""
-"Følg samme princip for hurtigt at rapportere en fejl: klik blot på "
-"ødelagt-objekt-ikonet i det øverste højre hjørne af vinduet, beskriv den og "
-"klik send."
+"Følg samme princip for hurtigt at rapportere en fejl: klik blot på ødelagt-"
+"objekt-ikonet i det øverste højre hjørne af vinduet, beskriv den og klik "
+"send."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
-"Each time you discover a bug in the application, please click the "
-"broken-object icon below the window title-bar, briefly describe the "
-"mis-behaviour and click Send."
+"Each time you discover a bug in the application, please click the broken-"
+"object icon below the window title-bar, briefly describe the mis-behaviour "
+"and click Send."
 msgstr ""
-"Hver gang du opdager en fejl i programmet, bedes du være venlig og klikke "
-"på ødelagt-objekt-ikonet under vinduestitellinjen, beskriv kort den "
-"uheldige adfære og klik på send."
+"Hver gang du opdager en fejl i programmet, bedes du være venlig og klikke på "
+"ødelagt-objekt-ikonet under vinduestitellinjen, beskriv kort den uheldige "
+"adfære og klik på send."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1666,53 +1700,53 @@ msgstr ""
 "Eksempel:\n"
 "Eksempler:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Jeg kan lide</b> den nye grafik. Meget forfriskende."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
-msgstr "<b>Jeg kan ikke lide</b> Velkomstsiden til den assistent. For tidskrævende."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+msgstr ""
+"<b>Jeg kan ikke lide</b> Velkomstsiden til den assistent. For tidskrævende."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
 msgstr ""
-"<b>Programmet har en forkert adfærd</b> når man klikker på "
-"Tilføj-knappen. Der sker intet."
+"<b>Programmet har en forkert adfærd</b> når man klikker på Tilføj-knappen. "
+"Der sker intet."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
-"<b>I ønsker en ny funktion</b> som tillader mig at sende mit arbejde med "
-"e-mail."
+"<b>I ønsker en ny funktion</b> som tillader mig at sende mit arbejde med e-"
+"mail."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Hjælp med at forbedre programmet"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "E-mail-adresse"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Angiv venligst din e-mail-adresse"
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
 "corrections for you to test, etc."
 msgstr ""
 "Den vil kun blive brugt til at kontakte dig hvis mere information er "
-"nødvendig omkring "
-"dine kommentarer, spørge dig om hvordan fejlene du rapporterer kan "
-"reproduceres, sende "
-"fejlrettelser som du kan teste, osv."
+"nødvendig omkring dine kommentarer, spørge dig om hvordan fejlene du "
+"rapporterer kan reproduceres, sende fejlrettelser som du kan teste, osv."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1720,80 +1754,79 @@ msgstr ""
 "E-mail-adressen er valgfri. Hvis du angiver nogen, vil dine kommentarer "
 "blive sendt anonymt."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Send en kommentar til udviklerne"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Send programudviklerne en kommentar om:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Noget du kan &lide "
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Noget du ikke kan li&de"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "En uheldig &opførsel i programmet"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "En ny &funktion du ønsker"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "Vis kommentarknapper under &vinduestitellinjer"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Send kommentar"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "&E-mail-adresse ..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Angiv venligst en kort beskrivelse af din mening om %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Skriv venligst på engelsk."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr "Du kan måske bruge et <a href=\"%1\">online oversættelsesværktøj</a>"
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
 msgstr ""
 "For at gøre de kommentarer du sender mere brugbare til at forbedre dette "
-"program, "
-"forsøg da at sende lige dele af positive og negative kommentarer."
+"program, forsøg da at sende lige dele af positive og negative kommentarer."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
-msgstr "Anmod <b>ikke</b> om nye funktioner: Dine anmodninger vil blive ignoreret."
+msgstr ""
+"Anmod <b>ikke</b> om nye funktioner: Dine anmodninger vil blive ignoreret."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Fejl under forsøg på at sende rapport.</p><p>Forsøg venligst igen senere."
 "</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Overførselsfejl"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1801,7 +1834,7 @@ msgstr ""
 "<p>Dine kommentarer er blevet sendt. Det vil hjælpe med at forbedre "
 "programmet.</p><p>Tak for din tid.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Kommentar sendt"
 
@@ -1876,59 +1909,53 @@ msgid ""
 "notes, not file notes.<br>File notes are generic documents, whereas image "
 "notes are pictures you can draw in.</p><p>When dropping files to baskets, %1 "
 "detects their type and shows you the content of the files.<br>For instance, "
-"when dropping image or text files, image and text notes are created for "
-"them.<br>For type of files %2 does not understand, they are shown as generic "
-"file notes with just an icon or file preview and a filename.</p><p>If you do "
-"not want the application to create notes depending on the content of the "
-"files you drop, go to the \"General\" page and uncheck \"Image or "
-"animation\" in the \"View Content of Added Files for the Following Types\" "
-"group.</p>"
+"when dropping image or text files, image and text notes are created for them."
+"<br>For type of files %2 does not understand, they are shown as generic file "
+"notes with just an icon or file preview and a filename.</p><p>If you do not "
+"want the application to create notes depending on the content of the files "
+"you drop, go to the \"General\" page and uncheck \"Image or animation\" in "
+"the \"View Content of Added Files for the Following Types\" group.</p>"
 msgstr ""
 "<p>Dette er normalt fordi der er adskillige typer af noter.<br> Denne "
-"indstilling "
-"gælder kun for fil- og lokale linknoter.<br>Billederne du ser er "
-"billednoter, "
-"ikke filnoter.<br>Filnoter er almindelige dokumenter, hvorimod billednoter "
-"er billeder du kan tegne i.</p><p>Når filer slippes i kurve, opdager %1 "
-"deres type og viser dig indholdet af filerne.<br>For eksempel når billed- "
-"eller "
-"tekstfiler slippes oprettes der billed- eller tekstnoter til dem.<br>For "
-"filtyper "
-"som %2 ikke forstår, vises de som generiske filnoter med blot et ikon eller "
-"filforhåndsvisning og et filnavn.</p><p>Hvis du ikke ønsker at programmet "
-"skal "
-"oprette noter afhængigt af indholdet af de filer du slipper, gå da til "
-"\"Generelt\"-siden og fjern markering ved \"Billed eller animation\" i "
-"gruppen"
-"\"Vis indhold af tilføjede filer for følgende typer\"</p>"
+"indstilling gælder kun for fil- og lokale linknoter.<br>Billederne du ser er "
+"billednoter, ikke filnoter.<br>Filnoter er almindelige dokumenter, hvorimod "
+"billednoter er billeder du kan tegne i.</p><p>Når filer slippes i kurve, "
+"opdager %1 deres type og viser dig indholdet af filerne.<br>For eksempel når "
+"billed- eller tekstfiler slippes oprettes der billed- eller tekstnoter til "
+"dem.<br>For filtyper som %2 ikke forstår, vises de som generiske filnoter "
+"med blot et ikon eller filforhåndsvisning og et filnavn.</p><p>Hvis du ikke "
+"ønsker at programmet skal oprette noter afhængigt af indholdet af de filer "
+"du slipper, gå da til \"Generelt\"-siden og fjern markering ved \"Billed "
+"eller animation\" i gruppen\"Vis indhold af tilføjede filer for følgende "
+"typer\"</p>"
 
 #: linklabel.cpp:623
 msgid "Example"
 msgstr "Eksempel"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimér"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Kurv"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Vil du virkelig afslutte %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
 "the application will be reloaded the next time you log in.</p>"
 msgstr ""
-"<p>Bemærk at du ikke behøver afslutte programmet før du afslutter din "
-"TDE-session. Hvis du afslutter din session mens programmet stadig kører, "
-"vil programmet automatisk blive genstartet næste gang du logger ind.</p>"
+"<p>Bemærk at du ikke behøver afslutte programmet før du afslutter din TDE-"
+"session. Hvis du afslutter din session mens programmet stadig kører, vil "
+"programmet automatisk blive genstartet næste gang du logger ind.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Bekræft afslutning"
 
@@ -1979,22 +2006,17 @@ msgstr "Hvorfor er det nyttigt?"
 #: newbasketdialog.cpp:217
 msgid ""
 "<p>Creating baskets inside of other baskets to form a hierarchy allows you "
-"to be more organized by eg.:</p><ul><li>Grouping baskets by themes or "
-"topics;</li><li>Grouping baskets in folders for different "
-"projects;</li><li>Making sections with sub-baskets representing chapters or "
-"pages;</li><li>Making a group of baskets to export together (to eg. email "
-"them to people).</li></ul>"
+"to be more organized by eg.:</p><ul><li>Grouping baskets by themes or topics;"
+"</li><li>Grouping baskets in folders for different projects;</li><li>Making "
+"sections with sub-baskets representing chapters or pages;</li><li>Making a "
+"group of baskets to export together (to eg. email them to people).</li></ul>"
 msgstr ""
 "<p>Oprettelse af kurve indeni andre kurve for at danne et hierarki tillader "
-"dig "
-"at være mere organiseret ved f.eks.at:</p><ul><li>Gruppere kurve efter "
-"temaer eller "
-"emner;</li><li>Gruppere kurve i mapper for forskellige "
+"dig at være mere organiseret ved f.eks.at:</p><ul><li>Gruppere kurve efter "
+"temaer eller emner;</li><li>Gruppere kurve i mapper for forskellige "
 "projekter;</li><li>Lave sektioner med underkurve som repræsenterer kapitler "
-"eller "
-"sider;</li><li>Lave en gruppe af kurve til at eksportere sammen (f.eks. for "
-"at sende "
-"dem til folk med e-mail).</li></ul>"
+"eller sider;</li><li>Lave en gruppe af kurve til at eksportere sammen (f."
+"eks. for at sende dem til folk med e-mail).</li></ul>"
 
 #: newbasketdialog.cpp:308
 msgid "Free-form"
@@ -2004,7 +2026,7 @@ msgstr "Fri form"
 msgid "Mind map"
 msgstr "Mindmap"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Billed)"
 
@@ -2028,6 +2050,11 @@ msgstr "Animation"
 msgid "Sound"
 msgstr "Lyd"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Filer"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Link"
@@ -2036,7 +2063,7 @@ msgstr "Link"
 msgid "Launcher"
 msgstr "Hurtigstarter"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Farve"
 
@@ -2084,286 +2111,294 @@ msgstr "Redigér denne farve"
 msgid "Edit this unknown object"
 msgstr "Redigér dette ukendt objekt"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Åbner klartekst ..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Åbner klartekster ..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Åbner klartekst med ..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Åbner klartekster med ..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Åbn klartekst med:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Åbn klartekster med:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Åbner tekst ..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Åbner tekster ..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Åbner tekst med ..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Åbner tekster med ..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Åbn tekst med:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Åbn tekster med:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Størrelse"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 gange %2 pixels"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Åbner billed ..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Åbner billeder ..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Åbner billed med ..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Åbner billeder med ..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Åbn billed med:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Åbn billeder med:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Klik for visning i fuld størrelse"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Åbner animation ..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Åbner animationer ..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Åbner animation med ..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Åbner animationer med ..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Åbn animation med:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Åbn animationer med:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Type"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Åbn denne fil"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Åbner fil ..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Åbner filer ..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Åbner fil med ..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Åbner filer med ..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Åbn fil med:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Åbn filer med:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Åbn denne lyd"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Åbner lyd ..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Åbner lyde ..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Åbner lyd med ..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Åbner lyde med ..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Åbn lyd med:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Åbn lyde med:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Destination"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Åbn dette link"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Linket har ingen URL at åbne."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Åbner linkdestination ..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Åbner linkdestinationer ..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Åbner linkdestination med ..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Åbner linkdestinationer med ..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Åbn linkdestination med:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Åbn linkdestinationer med:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(kør i terminal)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Kommentar"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Kommando"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Kør dette program"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Hurtigstarteren har ingen kommando at køre."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Kører programmet ..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Kører programmer ..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Rød</i>: %1, <i>Grøn</i>: %2, <i>Blå</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "CSS farvenavn"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "CSS udvidet farvenavn"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Er webfarve"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
 "Do you want to open it with an application that understand it?"
 msgstr ""
 "Billeder kan ikke redigeres her i øjeblikket (næste version af BasKet "
-"notesblokke "
-"vil inkludere billedredigering).\n"
+"notesblokke vil inkludere billedredigering).\n"
 "Vil du åbne det med et program som forstår det?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Redigér billednote"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2371,92 +2406,114 @@ msgstr ""
 "Dette animerede billed an ikke redigeres her.\n"
 "Vil du åbne det med et program som forstår det?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Redigér animationsnote"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Redigér farvenote"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
 "it."
 msgstr ""
 "Typen af denne note er ukendt og kan ikke redigeres her.\n"
-"Du kan dog trække og kopiere noten ind i et program som forstår "
-"den."
+"Du kan dog trække og kopiere noten ind i et program som forstår den."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Redigér ukendt note"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Redigér linknote"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Auto"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Ikon:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "De&stination:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Titel:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Redigér hurtigstarternote"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Vælg en kommando at køre:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Gæt"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "Komman&do:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "Skri&fttype:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Størrelse"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Fed"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Kursiv"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Understregning"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Venstrejustering"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Centreret"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Højrejustering"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Justeret"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2467,12 +2524,9 @@ msgid ""
 msgstr ""
 "<p>%1 understøtter ikke den data du har sluppet.<br>Det opretter imidlertid "
 "en generisk note, som tillader dig at trække eller kopiere det til et "
-"program "
-"som forstår det.</p><p>Hvis du ønsker understøttelse af disse data, kontakt "
-"da "
-"venligst udvikleren eller besøg <a href=\"http://basket.kde.org/dropdb.php\">"
-"BasKet "
-"slip-database</a>.</p>"
+"program som forstår det.</p><p>Hvis du ønsker understøttelse af disse data, "
+"kontakt da venligst udvikleren eller besøg <a href=\"http://basket.kde.org/"
+"dropdb.php\">BasKet slip-database</a>.</p>"
 
 #: notefactory.cpp:449
 msgid "Unsupported MIME Type(s)"
@@ -2506,8 +2560,7 @@ msgstr "Vælg størrelse på ikonet som skal importeres som billede:"
 msgid "Load File Content into a Note"
 msgstr "Indlæs filindhold til en note"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Adgangskodebeskyttelse"
@@ -2516,135 +2569,39 @@ msgstr "Adgangskodebeskyttelse"
 msgid "No private key selected."
 msgstr "Ingen privat nøgle valgt."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Kurv"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksportér"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importér"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Kør"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Note"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Mærker"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Værktøjslinie til tekstformattering"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&lter:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "I&ngen beskyttelse"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Beskyt kurv med en a&dgangskode"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+D"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Bes&kyt kurv med privat nøgle:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Til venstre"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Til højre"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "&Placering af kurvtræ:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Øverst"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Nederst"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Placering af filterlinie:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "Anvend balloner til at rapportere res&ultater af globale handlinger"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Hvad er globale handlinger?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2653,22 +2610,20 @@ msgid ""
 "middle mouse button on that icon to paste the current selection."
 msgstr ""
 "Du kan konfigurere globale genveje til at udføre visse handlinger uden at "
-"vise "
-"hovedvinduet. For eksempel kan du indsætte klippebordsindholdet, tage en "
-"farve fra et punkt på skærmen, osv. Du kan også bruge musens rullehjul "
+"vise hovedvinduet. For eksempel kan du indsætte klippebordsindholdet, tage "
+"en farve fra et punkt på skærmen, osv. Du kan også bruge musens rullehjul "
 "over statusområdeikonet for at skifte den aktuelle kurv. Eller bruge "
 "midterklik på ikonet for at indsætte aktuel markering."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
 msgstr ""
 "Når du gør dette, vil %1 vise en lille beskedboble for at informere dig om "
-"at "
-"handlingen er blevet gennemført. Du kan deaktivere denne boble."
+"at handlingen er blevet gennemført. Du kan deaktivere denne boble."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2678,63 +2633,63 @@ msgstr ""
 "er synligt. Dette er fordi du allerede ser resultatet af dine handlinger in "
 "hovedvinduet."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Statusområdeikon"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "&Dok i statusområde"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "Vi&s aktuel kurvs ikon i statusområdeikonet"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "S&kjul hovedvindue når musen forlader det i"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "tiendedele af sekunder"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "Vis &hovedvinduet når musen er over statusområdeikonet i"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Ani&mér ændringer i kurve"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "Vi&s værktøjstips i kurve"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "&Store noter"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Adfærd"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr "&Omdan lines startende med * eller - til lister i tekstredigering"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Be&d om bekræftelse før sletning af noter"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "&Eksportér mærker i tekster"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Hvornår gælder dette?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2742,13 +2697,14 @@ msgstr ""
 "Det gælder når du kopierer og indsætter eller trækker og slipper noter til "
 "et tekstredigeringsprogram."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "Hvis aktiveret, lader denne egenskab dig indsætte mærkerne som svarende til "
 "tekst."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2756,18 +2712,17 @@ msgid ""
 msgstr ""
 "For eksempel, eksporteres en liste af noter med <b>Gøremål</b> og "
 "<b>Afsluttet</b> mærker som linjer med <b>[ ]</b> eller <b>[x]</b> foran, "
-"som "
-"repræsenterer hhv. et tomt og et afkrydset afkrydsningsfelt."
+"som repræsenterer hhv. et tomt og et afkrydset afkrydsningsfelt."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "&Gruppér en ny note når der klikkes til højre for indsættelseslinien"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Hvordan grupperes en ny note?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2775,185 +2730,182 @@ msgid ""
 msgstr ""
 "<p>Når denne valgmulighed er aktiveret, tillader indsættelseslinien ikke kun "
 "at indsætte noter ved cursorpositionen, men tillader dig også at gruppere en "
-"ny "
-"note med den under cursoren:</p>"
+"ny note med den under cursoren:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
-"on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a "
-"note.<br>Click on the <b>right</b> to <b>group</b> a note, with the one "
-"<b>below or above</b>, depending on where your mouse is.</p>"
-msgstr ""
-"<p>Pacér din mus mellem noter, hvor du vil tilføje en ny.<br> Klik "
-"til <b>venstre</b> for indsættelsesliniens midtermærke for at <b>indsætte</b>"
-" en "
-"note.<br>Klik til <b>højre</b> for at <b>gruppere</b> en note, med den <b>"
-"nedenunder "
-"eller over</b>, afhængigt af hvor musen er.</p>"
-
-#: settings.cpp:574
+"on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
+"<br>Click on the <b>right</b> to <b>group</b> a note, with the one <b>below "
+"or above</b>, depending on where your mouse is.</p>"
+msgstr ""
+"<p>Pacér din mus mellem noter, hvor du vil tilføje en ny.<br> Klik til "
+"<b>venstre</b> for indsættelsesliniens midtermærke for at <b>indsætte</b> en "
+"note.<br>Klik til <b>højre</b> for at <b>gruppere</b> en note, med den "
+"<b>nedenunder eller over</b>, afhængigt af hvor musen er.</p>"
+
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Gør intet"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Indsæt klippebordet"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Indsæt hurtigstarternote"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Indsæt farve fra skærm"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Indlæs note fra fil"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Importér hurtigstarter fra TDE-menu"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importér ikon"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+midterklik overalt:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "ved cursorpositionen"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "Lås a&utomatisk beskyttede kurve når lukket i"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr "minutter"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "Anvend GnuPG-agent til kurve beskyttet med &privat/offentlig nøgle"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Placering af nye noter:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Ved nuværende note"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "&Ny billedstørrelse:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&efter"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pixels"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Visualisér"
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Vis indhold af tilføjede filer for følgende typer"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "&Klartekst"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&HTML-side"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Billed eller animation"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Lyd"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Lydoptagelse af konference"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Årlig rapport"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Hjemmemappe"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Kør %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Lyde"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Filer"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "&Lokale links"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "&Netværklinks"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "&Hurtigstartere"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Åbn &tekstnoter med et brugerdefineret program:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Åbn tekstnoter med:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Åbn b&illednoter med et brugerdefineret program:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Åbn billednoter med:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Åbn a&nimationsnoter med et brugerdefineret program:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Åbn animationsnoter med:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Åbn L&ydnoter med et brugerdefineret program:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Åbn lydnoter med:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2961,31 +2913,31 @@ msgid ""
 msgstr ""
 "<p>Hvis afkrydste, vil det nedenfor definerede program blive brugt når den "
 "type note åbnes.</p><p>Ellers vil det program du har konfigureret i "
-"Konqueror "
-"blive brugt.</p>"
+"Konqueror blive brugt.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
 msgstr ""
-"<p>Deinér det program der skal bruges til at åbne den type af note i "
-"stedet for det program som er konfigureret i Konqueror.</p>"
+"<p>Deinér det program der skal bruges til at åbne den type af note i stedet "
+"for det program som er konfigureret i Konqueror.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Hvordan ændres det program som bruges til at åbne weblinks?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
-"is useful if you are not using TDE (if you are using eg. GNOME, "
-"XFCE...).</p><ul><li>Open the Trinity Control Center (if it is not available, "
-"try to type \"kcontrol\" in a command line terminal);</li><li>Go to the "
-"\"TDE Components\" and then \"Components Selector\" section;</li><li>Choose "
+"is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
 "\"Web Browser\", check \"In the following browser:\" and enter the name of "
 "your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
 "you click <i>any</i> link that start with \"http://...\", it will be opened "
@@ -2993,32 +2945,25 @@ msgid ""
 "fine-grained configuration (like opening only Web pages in your Web "
 "browser), read the second help link.</p>"
 msgstr ""
-"<p>Når weblinks åbnes, åbnes de i forskellige programmer, "
-"afhængigt af linkets indhold (en hjemmside, et billed, et "
-"PDF-dokument ...), ligesom hvis de var filer på din computer.</p> "
-"<p>Her er hvordan du skal gøre hvis du ønsker at alle webadresser skal åbnes "
-"i din webbrowser. Det er nyttigt hvis ikke bruger TDE (hvis du f.eks. bruger "
-"GNOME, "
-"Xfce ...).</p><ul><li>Åbn TDE kontrolcenteret (hvis det ikke er tilgængeligt "
-"prøv da "
-"at skrive \"kcontrol\" i en terminal);</li><li>Gå til \"TDE-komponenter\" og "
-"så "
-"\"Komponentvælger\"-sektionen;</li><li>Vælg \"Browser\", afkryds \"I "
-"følgende browser:\" "
-"og angiv navnet på din webbrowser (f.eks. \"firefox\" eller \"epiphany\").<"
-"/li></ul><p>Når du "
-"nu klikker på <i>ethvert</i> link som starter med \"http://..\", vil det "
-"blive åbnet i din "
-"webbrowser (f.eks. Mozilla Firefox eller Epiphany eller ...).</p><p>For mere "
-"finkornet konfiguration (såsom kun at åbne websider i din webbrowser), læs "
-"det "
-"andet hjælp-link.</p>"
-
-#: settings.cpp:922
+"<p>Når weblinks åbnes, åbnes de i forskellige programmer, afhængigt af "
+"linkets indhold (en hjemmside, et billed, et PDF-dokument ...), ligesom hvis "
+"de var filer på din computer.</p> <p>Her er hvordan du skal gøre hvis du "
+"ønsker at alle webadresser skal åbnes i din webbrowser. Det er nyttigt hvis "
+"ikke bruger TDE (hvis du f.eks. bruger GNOME, Xfce ...).</p><ul><li>Åbn TDE "
+"kontrolcenteret (hvis det ikke er tilgængeligt prøv da at skrive \"kcontrol"
+"\" i en terminal);</li><li>Gå til \"TDE-komponenter\" og så \"Komponentvælger"
+"\"-sektionen;</li><li>Vælg \"Browser\", afkryds \"I følgende browser:\" og "
+"angiv navnet på din webbrowser (f.eks. \"firefox\" eller \"epiphany\").</"
+"li></ul><p>Når du nu klikker på <i>ethvert</i> link som starter med "
+"\"http://..\", vil det blive åbnet i din webbrowser (f.eks. Mozilla Firefox "
+"eller Epiphany eller ...).</p><p>For mere finkornet konfiguration (såsom kun "
+"at åbne websider i din webbrowser), læs det andet hjælp-link.</p>"
+
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Hvordan ændres det program som bruges til at åbne filer og links?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -3027,31 +2972,26 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line "
-"terminal);</li><li>Go to the \"TDE Components\" and then \"File "
-"Associations\" section;</li><li>In the tree, expand \"text\" and click "
-"\"html\";</li><li>In the applications list, add your Web browser as the "
-"first entry;</li><li>Do the same for the type \"application -> "
-"xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Sådan her sætter du det program som skal bruges til åbne hver filtype. "
-"Dette "
-"gælder også weblinks, hvis du vælger ikke at åbne dem systematisk i en "
+"Dette gælder også weblinks, hvis du vælger ikke at åbne dem systematisk i en "
 "webbrowser (jf. første hjælp-link). Standardindstillingerne burde være gode "
 "nok til dig, men dette tip er nyttigt hvis du bruger GNOME, Xfce eller et "
-"andet miljø end TDE.</p><p>Dette er et eksempel på hvordan HTML-sider "
-"åbnes i din webbrowser (og at blive ved med at bruge andre programmer "
-"til andre adresser eller filer). Gentag disse trin for hver filtype du "
-"ønsker "
-"at åbne med et specifikt program.</p><ul><li>Åbn TDE kontrolcenter (hvis "
-"det ikke er tilgængeligt prøv da at skrive \"kcontrol\" i en terminal);</li>"
-"<li> "
-"Gå til \"TDE-komponenter\" og så \"Filassociationer\"-sektionen;</li><li> "
-"I træet udvides \"tekst\" og klik på \"HTML\";</li><li>I programlisten "
-"tilføjes "
-"din webbrowser som første punkt;</li><li>Gør det samme for \"program -> "
-"xhtml+xml\".</li></ul>"
+"andet miljø end TDE.</p><p>Dette er et eksempel på hvordan HTML-sider åbnes "
+"i din webbrowser (og at blive ved med at bruge andre programmer til andre "
+"adresser eller filer). Gentag disse trin for hver filtype du ønsker at åbne "
+"med et specifikt program.</p><ul><li>Åbn TDE kontrolcenter (hvis det ikke er "
+"tilgængeligt prøv da at skrive \"kcontrol\" i en terminal);</li><li> Gå til "
+"\"TDE-komponenter\" og så \"Filassociationer\"-sektionen;</li><li> I træet "
+"udvides \"tekst\" og klik på \"HTML\";</li><li>I programlisten tilføjes din "
+"webbrowser som første punkt;</li><li>Gør det samme for \"program -> xhtml+xml"
+"\".</li></ul>"
 
 #: softwareimporters.cpp:45
 msgid "Import Hierarchy"
@@ -3129,8 +3069,10 @@ msgid ""
 msgstr "Fra %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
-msgstr "Kan ikke importere den fil. Den er enten korrupt, eller ikke en TuxCards-fil."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
+msgstr ""
+"Kan ikke importere den fil. Den er enten korrupt, eller ikke en TuxCards-fil."
 
 #: softwareimporters.cpp:643
 msgid "Bad File Format"
@@ -3141,8 +3083,8 @@ msgid ""
 "A note is encrypted. The importer does not yet support encrypted notes. "
 "Please remove the encryption with TuxCards and re-import the file."
 msgstr ""
-"En note er krypteret. Importøren understøtter endnu ikke krypterede "
-"noter. Fjern venligst krypteringen med TuxCards og genimportér filen."
+"En note er krypteret. Importøren understøtter endnu ikke krypterede noter. "
+"Fjern venligst krypteringen med TuxCards og genimportér filen."
 
 #: softwareimporters.cpp:671
 msgid "Encrypted Notes not Supported Yet"
@@ -3151,11 +3093,11 @@ msgstr "Krypterede noter er endnu ikke understøttet"
 #: softwareimporters.cpp:673
 msgid ""
 "<font color='red'><b>Encrypted note.</b><br>The importer do not support "
-"encrypted notes yet. Please remove the encryption with TuxCards and "
-"re-import the file.</font>"
+"encrypted notes yet. Please remove the encryption with TuxCards and re-"
+"import the file.</font>"
 msgstr ""
-"<font color='red'><b>Krypteret note.</b><br>Importøren understøtter ikke"
-"krypterede noter endnu. Fjern venligst krypteringen med TuxCards og "
+"<font color='red'><b>Krypteret note.</b><br>Importøren understøtter "
+"ikkekrypterede noter endnu. Fjern venligst krypteringen med TuxCards og "
 "genimportér filen.</font>"
 
 #: systemtray.cpp:140
@@ -3275,6 +3217,11 @@ msgstr "Vigtig"
 msgid "Very Important"
 msgstr "Meget vigtig"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animation"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Ide"
@@ -3343,6 +3290,11 @@ msgstr "Flyt op (Ctrl+Shift+Op)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Flyt ned (Ctrl+Shift+Ned)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "Sl&et"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Mærke"
@@ -3412,8 +3364,8 @@ msgid ""
 "If filled, this property lets you paste this tag or this state as textual "
 "equivalent."
 msgstr ""
-"Hvis udfyldt lader denne egenskab dig indsætte dette mærke eller "
-"denne tilstand som svarende til tekst."
+"Hvis udfyldt lader denne egenskab dig indsætte dette mærke eller denne "
+"tilstand som svarende til tekst."
 
 #: tagsedit.cpp:496
 msgid "On ever&y line"
@@ -3441,7 +3393,8 @@ msgstr ""
 "linjer."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 "Sletning af mærket vil fjerne det fra alle noter hvortil det i aktuelt er "
 "tildelt."
@@ -3460,8 +3413,7 @@ msgid ""
 "currently assigned to."
 msgstr ""
 "Sletning af tilstanden vil fjerne mærket den fra alle noter hvortil "
-"tilstandend "
-"aktuelt er tildelt."
+"tilstandend aktuelt er tildelt."
 
 #: tagsedit.cpp:909
 msgid "Confirm Delete State"
@@ -3507,3 +3459,111 @@ msgstr ""
 "Ændr størrelse på vinduet for at vælge billedstørrelsen\n"
 "og luk det eller tryk Escape for at acceptere ændringer."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Kurv"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksportér"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importér"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Kør"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Note"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Mærker"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Værktøjslinie til tekstformattering"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Værktøjslinie til tekstformattering"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&lter:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Åbn"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "I&ngen beskyttelse"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Beskyt kurv med en a&dgangskode"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+D"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Bes&kyt kurv med privat nøgle:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Skriv venligst på engelsk eller fransk."
diff --git a/po/de.po b/po/de.po
index b98bc2a..a3f963b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,23 +11,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-01-27 14:17+0100\n"
 "Last-Translator: Florian Sievert <kde@floriansievert.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Florian Sievert"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,14 +49,20 @@ msgid "BasKet Note Pads"
 msgstr "BasKet Notizblätter"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Autor, Betreuer"
 
 #: aboutdata.cpp:45
-msgid "Basket encryption, Kontact integration, KnowIt importer"
-msgstr "Verschlüsselung von Körben, Integration in Kontact, Importer für KnowIt"
+msgid "Original Author"
+msgstr ""
 
 #: aboutdata.cpp:49
+msgid "Basket encryption, Kontact integration, KnowIt importer"
+msgstr ""
+"Verschlüsselung von Körben, Integration in Kontact, Importer für KnowIt"
+
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -63,71 +70,80 @@ msgstr ""
 "Automatische Sperrung von Körben, Speicherstatus-Symbol, HTML kopieren/"
 "einfügen, Kurzhinweise für Korbname, Absetzen zu Korbname"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Symbol"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Als Korbarchiv speichern"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Korbarchiv wird gespeichert. Bitte warten..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Diese Datei ist kein Korbarchiv."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Korbarchiv-Fehler"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
-msgstr "Diese Datei ist beschädigt und kann daher leider nicht geöffnet werden."
+msgstr ""
+"Diese Datei ist beschädigt und kann daher leider nicht geöffnet werden."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
 "missing because they are of a type only available in new versions. When "
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
-msgstr "Diese Datei wurde mit einer älteren Version von %1 erzeugt. Sie kann geöffnet werden, allerdings werden nicht alle Bestandteile für Sie verfügbar sein. Beispielsweise könnten einige Notizen fehlen, die von einem Notiztyp sind, der erst in neueren Versionen verfügbar ist. Wenn Sie die Datei zurückschreiben wollen, speichern Sie diese in einer anderen Datei, um die Ursprüngliche zu erhalten."
+msgstr ""
+"Diese Datei wurde mit einer älteren Version von %1 erzeugt. Sie kann "
+"geöffnet werden, allerdings werden nicht alle Bestandteile für Sie verfügbar "
+"sein. Beispielsweise könnten einige Notizen fehlen, die von einem Notiztyp "
+"sind, der erst in neueren Versionen verfügbar ist. Wenn Sie die Datei "
+"zurückschreiben wollen, speichern Sie diese in einer anderen Datei, um die "
+"Ursprüngliche zu erhalten."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
-msgstr "Diese Datei wurde mit einer älteren Version von %1 erzeugt. Bitte versuchen Sie eine neuere Version zu installieren, um diese Datei zu öffnen."
+msgstr ""
+"Diese Datei wurde mit einer älteren Version von %1 erzeugt. Bitte versuchen "
+"Sie eine neuere Version zu installieren, um diese Datei zu öffnen."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Sichern & Wiederherstellen"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Speicherort"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Ihre Körbe befinden sich momentan an diesem Ort:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&An einen anderen Ort verschieben ..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Einen anderen existierenden Ordner ..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Wozu?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -140,156 +156,187 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>Sie können den Ordner bestimmen in denen %1 Ihre Körbe sichert werden:</p><ul> <li>an einem leicht zu erreichenden Ort in Ihrem Heimatverzeichnis, wie beispielsweise ~/Notizen oder ~/Körbe. Auf diese Weise können Sie Ihre Körbe stets manuell sichern."
-"</li> <li>auf einem Server, um Ihre Körbe auf zwei Computern nutzen zu können. <br>In diesem Fall müssen Sie den gemeinsam verwendeten Ordner ins lokale Dateisystem mounten und %2 anweisen den Mountpunkt zu verwenden.<br>Achtung: Sie sollten %3 nicht gleichzeitig auf beiden Computern verwenden! Ansonsten riskieren Sie den Verlust von Daten, wenn beide Anwendungen asyncron darauf zugreifen.</li> "
-"</ul><p>Bitte beachten Sie, dass Sie den Inhalt des Ordners nicht eigenständig verändern sollten. (z.B. wird durch das Hinzufügen einer Datei diese nicht automatisch im Korb angezeigt).</p>"
-
-#: backup.cpp:89
+"<p>Sie können den Ordner bestimmen in denen %1 Ihre Körbe sichert werden:</"
+"p><ul> <li>an einem leicht zu erreichenden Ort in Ihrem Heimatverzeichnis, "
+"wie beispielsweise ~/Notizen oder ~/Körbe. Auf diese Weise können Sie Ihre "
+"Körbe stets manuell sichern.</li> <li>auf einem Server, um Ihre Körbe auf "
+"zwei Computern nutzen zu können. <br>In diesem Fall müssen Sie den gemeinsam "
+"verwendeten Ordner ins lokale Dateisystem mounten und %2 anweisen den "
+"Mountpunkt zu verwenden.<br>Achtung: Sie sollten %3 nicht gleichzeitig auf "
+"beiden Computern verwenden! Ansonsten riskieren Sie den Verlust von Daten, "
+"wenn beide Anwendungen asyncron darauf zugreifen.</li> </ul><p>Bitte "
+"beachten Sie, dass Sie den Inhalt des Ordners nicht eigenständig verändern "
+"sollten. (z.B. wird durch das Hinzufügen einer Datei diese nicht automatisch "
+"im Korb angezeigt).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Sicherungen"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Sicherung ..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "Sicherung &wiederherstellen ..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Letzte Sicherung: nie"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Letzte Sicherung: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Wählen Sie einen Ort"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "Der Ordner <b>%1</b> ist nicht leer. Wollen Sie ihn überschreiben?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Ordner überschreiben?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "Ü&berschreiben"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Ihre Körbe wurden erfolgreich nach <b>%1</b> verschoben. %2 wird nun neugestartet, damit die Änderungen wirksam werden."
+msgstr ""
+"Ihre Körbe wurden erfolgreich nach <b>%1</b> verschoben. %2 wird nun "
+"neugestartet, damit die Änderungen wirksam werden."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Wählen Sie einen existierenden Ordner"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
-msgstr "Der Speicherort Ihrer Körbe wurde erfolgreich geändert nach <b>%1</b>.%2 wird nun neugestartet, damit die Änderungen wirksam werden."
+msgstr ""
+"Der Speicherort Ihrer Körbe wurde erfolgreich geändert nach <b>%1</b>.%2 "
+"wird nun neugestartet, damit die Änderungen wirksam werden."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Körbe_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Gzip-komprimiertes Tar-Archiv"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Körbe sichern"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
-msgstr "Die Datei <b>%1</b> existiert bereits. Soll sie wirklich überschrieben werden?"
+msgstr ""
+"Die Datei <b>%1</b> existiert bereits. Soll sie wirklich überschrieben "
+"werden?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Datei überschreiben?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Körbe werden gesichert. Bitte warten..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Korbarchiv öffnen"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "Liesmich.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Dies ist eine Sicherheitskopie Ihrer Körben auf dem Stand bevor Sie mit der Wiederherstellung der Sicherung %1 begonnen haben."
+msgstr ""
+"Dies ist eine Sicherheitskopie Ihrer Körben auf dem Stand bevor Sie mit der "
+"Wiederherstellung der Sicherung %1 begonnen haben."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
-msgstr "Falls die Wiederherstellung erfolgreich war und Sie alles wichtige wieder verfügbar haben, können Sie diesen Ordner entfernen."
+msgstr ""
+"Falls die Wiederherstellung erfolgreich war und Sie alles wichtige wieder "
+"verfügbar haben, können Sie diesen Ordner entfernen."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Falls irgendetwas beim Wiederherstellen fehl schlägt, können Sie diesen Ordner verwenden, um Ihre Körbe wiederherzustellen. Auf diese Weise kann nichts verloren gehen."
+msgstr ""
+"Falls irgendetwas beim Wiederherstellen fehl schlägt, können Sie diesen "
+"Ordner verwenden, um Ihre Körbe wiederherzustellen. Auf diese Weise kann "
+"nichts verloren gehen."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Wählen Sie \"Korb\"->\"Sichern & Wiederherstellen ...\"->\"Einen anderen existierenden Ordner ...\" und wählen Sie diesen Ordner aus."
+msgstr ""
+"Wählen Sie \"Korb\"->\"Sichern & Wiederherstellen ...\"->\"Einen anderen "
+"existierenden Ordner ...\" und wählen Sie diesen Ordner aus."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Stelle <b>%1</b> wieder her. Bitte warten..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr "Wenn etwas während der Wiederherstellung fehlschlagen sollte, lesen Sie bitte die Datei <b>%1</b>."
+msgstr ""
+"Wenn etwas während der Wiederherstellung fehlschlagen sollte, lesen Sie "
+"bitte die Datei <b>%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Körbe wiederherstellen"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
-msgstr "Dieses Archiv ist entweder keine Sicherung Ihrer Körbe oder ist beschädigt worden. Es kann leider nichts importiert werden. Ihre alten Körbe blieben unverändert erhalten."
+msgstr ""
+"Dieses Archiv ist entweder keine Sicherung Ihrer Körbe oder ist beschädigt "
+"worden. Es kann leider nichts importiert werden. Ihre alten Körbe blieben "
+"unverändert erhalten."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Fehler beim Wiederherstellen"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Ihre Sicherung wurde erfolgreich wiederhergestellt nach <b>%1</b>.%2 wird nun neugestartet, damit die Änderungen wirksam werden."
+msgstr ""
+"Ihre Sicherung wurde erfolgreich wiederhergestellt nach <b>%1</b>.%2 wird "
+"nun neugestartet, damit die Änderungen wirksam werden."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -307,48 +354,50 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Körbe vor Wiederherstellung (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "Die neue Notiz entspricht nicht dem Filter und wird nicht angezeigt."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Eine neue Notiz entspricht nicht dem Filter und wird nicht angezeigt."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
-msgstr "Einige neue Notizen entsprechen nicht dem Filter und werden nicht angezeigt."
+msgstr ""
+"Einige neue Notizen entsprechen nicht dem Filter und werden nicht angezeigt."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
-msgstr "Die neuen Notizen entsprechen nicht dem Filter und werden nicht angezeigt."
+msgstr ""
+"Die neuen Notizen entsprechen nicht dem Filter und werden nicht angezeigt."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Gruppieren"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Einfügen"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Abgelegt in Korb <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
 msgstr ""
-"Diese Nachricht sollte eigentlich nie angezeigt werden. Wenn dies geschehen ist, "
-"enthält das Programm einen Fehler. Bitte melden Sie diesen bei dem "
+"Diese Nachricht sollte eigentlich nie angezeigt werden. Wenn dies geschehen "
+"ist, enthält das Programm einen Fehler. Bitte melden Sie diesen bei dem "
 "Entwickler."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -356,48 +405,48 @@ msgstr ""
 "Füge eine Notiz hier ein\n"
 "Rechter Mausklick für mehr Optionen"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Diese Spalte vergrößern"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Diese Gruppe vergrößern"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Diese Notiz vergrößern"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Diese Notiz auswählen oder entfernen"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Diese Gruppe auswählen oder entfernen"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Dieser Notiz eine Marke zuweisen oder entfernen"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Zugewiesene Marken</b>:%1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Gruppe ausklappen"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Gruppe zusammenklappen"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -405,7 +454,7 @@ msgstr ""
 "Gruppiere eine Notiz zusammen mit der darunter\n"
 "Rechter Klick für mehr Optionen"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -413,46 +462,46 @@ msgstr ""
 "Gruppiere eine Notiz zusammen mit der darüber\n"
 "Rechter Klick für mehr Optionen"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Hinzugefügt"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Letzte Änderung"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>:%2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Klicke rechts um etwas zu gruppieren, anstatt es einzufügen"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Klicke links um etwas einzufügen, anstatt es zu gruppieren"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Entsperren"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Durch Passwort geschützter Korb."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Drücken Sie Entsperren, um Zugriff zu erlangen."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Verschlüsselung wird nicht unterstützt<br/>in dieser Version von %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -460,27 +509,32 @@ msgstr ""
 "Damit Körbe entsperrt bleiben, ändern Sie die Dauer der<br> automatischen "
 "Sperrung in den Einstellungen der Anwendung."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Lade ..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Alle entfernen"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Anpassen ..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtere nach dieser Marke"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtere nach diesem &Zustand"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Marken"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -489,7 +543,7 @@ msgstr ""
 "<qt>Sind Sie sicher, dass Sie diese Notiz entfernen wollen?</qt>\n"
 "<qt>Sind Sie sicher, dass Sie <b>%n</b> Notizen entfernen wollen?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -497,7 +551,7 @@ msgstr ""
 "Entferne Notiz\n"
 "Entferne Notizen"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -505,7 +559,7 @@ msgstr ""
 "Notiz in Zwischenablage kopiert.\n"
 "Notizen in Zwischenablage kopiert."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -513,7 +567,7 @@ msgstr ""
 "Notiz ausgeschnitten und in Zwischenablage eingefügt.\n"
 "Notizen ausgeschnitten und in Zwischenablage eingefügt."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -521,39 +575,45 @@ msgstr ""
 "Notiz in Selektion kopiert.\n"
 "Notizen in Selektion kopiert."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Diese Notiz kann nicht geöffnet werden."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Sie sind nicht berechtigt diese Datei zu öffnen."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Speichern in Datei"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Bitte geben Sie das Passwort für den folgenden privaten Schlüssel ein:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Bitte geben Sie das Passwort für den Korb <b>%1</b> ein:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Bitte weisen Sie dem Korb <b>%1</b> ein Passwort zu:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
-msgstr "Ungenügend freier Speicher auf der Festplatte um die Korbdaten zu speichern"
+msgstr ""
+"Ungenügend freier Speicher auf der Festplatte um die Korbdaten zu speichern"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Falsche Berechtigung für Korbdatei"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -561,7 +621,7 @@ msgstr ""
 "Bitte entfernen Sie Dateien auf der Festplatte <b>%1</b>, um es der "
 "Anwendung zu ermögichen Ihre Änderungen sicher zu speichern."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -570,10 +630,36 @@ msgstr ""
 "ob Sie schreibenden Zugriff für die Datei und dem übergeordneten Ordner "
 "besitzen."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Fehler beim Speichern"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Hauptfenster zeigen/verstecken"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "Zeige Hauptfenster bei &Mauskontakt mit dem Kontrollleistensymbol für"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Korbarchiv öffnen"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Leider schlug das Erstellen des Ordner für den neuen Korb fehl."
@@ -606,10 +692,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Eigenschaften des Korbes"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Name"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "Hintergrund&bild:"
@@ -714,25 +804,25 @@ msgstr ""
 "<p>Dieser Korb ist <b>nicht gesperrt</b>.<br>Um ihn zu sperren, klicke Sie "
 "bitte hierher.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Allgemein"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Hauptfenster zeigen/verstecken"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr "Erlaubt Ihnen das Hauptfenster ein- und ausblenden."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Inhalt der Zwischenablage im aktuellen Korb einfügen"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
@@ -740,21 +830,21 @@ msgstr ""
 "Erlaubt Ihnen den Inhalt der Zwischenablage in den aktuellen Korb einzufügen,"
 "ohne dabei das Hauptfenster öffnen zu müssen."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Zeigt den Namen des aktuellen Korbes"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr ""
 "Erlaubt Ihnen den aktuellen Korbnamen anzuzeigen, ohne das Hauptfenster "
 "öffnen zu müssen."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Selektion einfügen im aktuellen Korb"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
@@ -762,11 +852,11 @@ msgstr ""
 "Erlaubt Ihnen den Inhalt der Zwischenablage in den aktuellen Korb einzufügen,"
 "ohne dabei das Hauptfenster öffnen zu müssen."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Neuen Korb erstellen"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -777,11 +867,11 @@ msgstr ""
 "ein Element hinzuzufügen oder die Inhalte der Selektion oder Zwischenablage "
 "in den neuen Korb einfügen)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Vorheriger Korb"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
@@ -789,11 +879,11 @@ msgstr ""
 "Erlaubt Ihnen den vorherigen Korb auswählen, ohne dabei das Hauptfenster "
 "öffnen zu müssen."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Nächster Korb"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -801,21 +891,22 @@ msgstr ""
 "Erlaubt Ihnen den nächsten Korb auszuwählen, ohne dabei das Hauptfenster "
 "öffnen zu müssen."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Textnotiz einfügen"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr ""
 "Fügt eine neue Textnotiz im aktuellen Korb ein, ohne dabei das Hauptfenster "
 "zu öffnen."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Bildenotiz einfügen"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
@@ -823,21 +914,22 @@ msgstr ""
 "Fügt eine Bildnotiz im aktuellen Korb ein ,ohne dabei das Hauptfenster zu "
 "öffnen."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Verknüpfungsnotiz einfügen"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
 msgstr ""
 "Fügt eine neue Verknüpfungsnotiz im akuellen Korb ein, ohne dabei das "
 "Hauptfenster zu öffnen."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Farbnotiz einfügen"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
@@ -845,11 +937,11 @@ msgstr ""
 "Fügt eine neue Farbnotiz im aktuellen Korb ein, ohne dabei das Hauptfenster "
 "zu öffnen."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Farbe vom Bildschirm auswählen"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -857,11 +949,11 @@ msgstr ""
 "Fügt eine vom Bildschirm ausgewählte Farbe in den aktuellen Korb ein, ohne "
 "dabei das Hauptfenster zu öffnen."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Bildschirmbereich abgreifen"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -869,15 +961,11 @@ msgstr ""
 "Einen Bildschirmbereich als Bild abgreifen und im aktuellen Korb einfügen, "
 "ohne dabei das Hauptfenster zu öffnen."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Körbe"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Bitte schreiben Sie in Englisch oder Französisch."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -890,243 +978,248 @@ msgstr ""
 "anlegen. Durch einen Klick können Sie diese öffnen oder mit der Maus an eine "
 "neue Position ziehen."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Korbarchiv ..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Hauptfenster verstecken"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "&HTML-Seite ..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt ..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards ..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Text&datei ..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Sichern && Wiederherstellen ..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Entfernen"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Alle Notizen auswählen"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Auswahl &aufheben"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Auswahl aller angewählten Notizen aufheben"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "Auswahl &umkehren"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Kehrt aktuelle Auswahl von Notizen um"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Bearbeiten ..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "Ö&ffnen"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Öffnen &mit ..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Speichern in Datei ..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Gruppieren"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "Gruppierung &aufheben"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Nach &oben"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "&Hoch bewegen"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "&Runter bewegen"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Nach &unten"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Text"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "&Verknüpfung"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Bild"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Farbe"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "&Starter"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "&TDE Menu-Starter importieren ..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Symbol im&portieren ..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Aus &Datei laden ..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "&Farbe vom Bildschirm "
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Bildschirmbereich ab&greifen"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Neuer Korb ..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Neuer &Unterkorb ..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Neuer &gleichgestellter Korb ..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Neu"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Eigenschaften des Korbes"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "Korb &entfernen"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Pass&wort ..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "Korb &sperren"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filter"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtere alle Körbe"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "Filter &zurücksetzen"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Vorheriger Korb"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "&Nächster Korb"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "Korb &zusammenklappen"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "Korb &ausklappen"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "&Tastenkürzel einrichten ..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "&Willkommenskörbe"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Konvertierung einfacher Textnotizen"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Konvertiere einfache Textnotizen in RichText-Notizen ..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Keine Notizen"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1135,7 +1228,7 @@ msgstr ""
 "%n Notiz\n"
 "%n Notizen"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1144,15 +1237,15 @@ msgstr ""
 "%n ausgewählt\n"
 "%n ausgewählt"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "alle Treffer"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "kein Filter"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1161,29 +1254,30 @@ msgstr ""
 "%n Treffer\n"
 "%n Treffer"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Ausgewählte Farbe abgelegt in <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Die einfachen Textnotizen wurden umgewandelt ins RichText-Format."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Konvertierung beendet."
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
-msgstr "Es existiert keine einfachen Textnotizen, die konvertiert werden müssen."
+msgstr ""
+"Es existiert keine einfachen Textnotizen, die konvertiert werden müssen."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1202,43 +1296,45 @@ msgstr ""
 "sind, dass die Anwendung richtig installiert wurde, sollten Sie versuchen "
 "die Datei %5basketui.rc zu entfernen.</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Ressource nicht gefunden"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Kann Notiz nicht einfügen."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Gewählter Bildschirmbereich in Korb <i>%1</i> abgelegt"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Korb löschen"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Nur diesen Korb löschen"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Entferne Notizen und Unterobjekte"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
-msgstr "<qt>Sind Sie sicher, dass <b>%1</b> mitsamt Inhalt entfernt werden soll?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+msgstr ""
+"<qt>Sind Sie sicher, dass <b>%1</b> mitsamt Inhalt entfernt werden soll?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Korb entfernen"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "Korb &entfernen"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
@@ -1246,43 +1342,43 @@ msgstr ""
 "<qt><b>%1</b> hat die folgenden Körbe untergeordnen.<br>Wollen Sie diese "
 "auch entfernen?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Untergeordnete Körbe entfernen"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "Untergeordnete Körbe &entfernen"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Korbarchiv"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Inhalt der Zwischenablage in Korb <i>%1</i> eingefügt"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Selektion in Korb <i>%1</i> eingefügt"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Keine Notiz wurde hinzugefügt."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Korb <i>%1</i> ist gesperrt"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(gesperrt)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "Neue Marke &zuweisen ..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Alle entfernen"
 
@@ -1374,11 +1470,11 @@ msgstr "&Marke:"
 msgid "Filter all Baskets"
 msgstr "Filter auf alle Körbe anwenden"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(ohne Marke)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(mit Marke)"
 
@@ -1459,8 +1555,8 @@ msgstr "Daten"
 #: htmlexporter.cpp:319
 msgid "Made with %1, a TDE tool to take notes and keep information at hand."
 msgstr ""
-"Erstellt mit %1, einer TDE-Anwendung um Notizen zu verwalten und die Übersicht "
-"über Ihre Daten zu behalten."
+"Erstellt mit %1, einer TDE-Anwendung um Notizen zu verwalten und die "
+"Übersicht über Ihre Daten zu behalten."
 
 #: kcolorcombo2.cpp:126 kcolorcombo2.cpp:602 kcolorcombo2.cpp:624
 #: tagsedit.cpp:470 variouswidgets.cpp:269
@@ -1471,35 +1567,36 @@ msgstr "(Standard)"
 msgid "Other..."
 msgstr "Andere ..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Liste privater Schlüssel"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "E-Mail"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Wählen Sie einen geheimen Schlüssel:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Auflistung der Schlüssel wurde unerwartet unterbrochen."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
-msgstr "Dieser öffentliche Schlüssel ist nicht für eine Verschlüsselung vorgesehen."
+msgstr ""
+"Dieser öffentliche Schlüssel ist nicht für eine Verschlüsselung vorgesehen."
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Nicht unterstütztes Verfahren"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
@@ -1539,21 +1636,31 @@ msgstr "Dateisystem"
 msgid "File Types"
 msgstr "Dateitypen"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Symboldateien (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "Ö&ffnen"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
-msgstr "Schicken Sie den Entwicklern ein Kommentar zu etwas, dass Sie gemocht haben"
+msgstr ""
+"Schicken Sie den Entwicklern ein Kommentar zu etwas, dass Sie gemocht haben"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 "Schicken Sie den Entwicklern ein Kommentar zu etwas, dass Sie nicht gemocht "
 "haben"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
@@ -1561,33 +1668,33 @@ msgstr ""
 "Schicken Sie den Entwicklern eine Nachricht und berichten Sie einen Fehler "
 "der Anwendung"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 "Schicken Sie den Entwicklern der Anwendung einen Wunsch für eine neue "
 "Softwarefunktion"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "Entwicklern ein Kommentar &schicken ..."
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Willkommen bei dieser Testversion von %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Willkommen bei %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr ""
 "Ihre Kommentare sind wichtig, um uns dabei zu helfen die Anwendung zu "
 "verbessern."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1598,7 +1705,7 @@ msgstr ""
 "Fenstertitelleiste. Beschreiben Sie bitte kurz, was Sie gemocht oder nicht "
 "gemocht haben und klicken abschließend auf Versenden."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1607,7 +1714,7 @@ msgstr ""
 "lächelnde Gesicht unterhalb der Fenstertitelleiste. Beschreiben Sie bitte "
 "dann kurz, was sie gemocht haben und klicken auf Versenden."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1616,7 +1723,7 @@ msgstr ""
 "auf das stirnrunzelnde Gesicht unterhalb der Fenstertitelleiste. Bitte "
 "beschreiben Sie dann kurz, was Sie nicht mochten und klicken auf Versenden."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1626,34 +1733,35 @@ msgstr ""
 "Sie auf das Symbol mit dem zebrochenen Gegenstand in der oberen rechten Ecke "
 "des Fenster. Beschreiben Sie den Fehler kurz und drücken dann auf Versenden."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
 "and click Send."
 msgstr ""
-"Immer wenn Sie einen Fehler in der Anwendung gefunden haben, klicken "
-"Sie auf das Symbol mit dem zerbrochenen Objekt unterhalb der "
-"Fenstertitelleiste. Beschreiben Sie dann bitte kurz, was nicht wie erwartet "
-"funktioniert hat und klicken Sie dann auf Senden."
+"Immer wenn Sie einen Fehler in der Anwendung gefunden haben, klicken Sie auf "
+"das Symbol mit dem zerbrochenen Objekt unterhalb der Fenstertitelleiste. "
+"Beschreiben Sie dann bitte kurz, was nicht wie erwartet funktioniert hat und "
+"klicken Sie dann auf Senden."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr "Beispiele:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Ich mag</b> die neue Gestaltung. Sehr erfrischend."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 "<b>Ich mag nicht</b> die Willkommenseite des Assistenten. Sie ist zu "
 "unübersichtlich und kostet daher Zeit."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1661,25 +1769,25 @@ msgstr ""
 "<b>Die Anwendung verhält sich fehlerhaft.</b> Beim Klicken auf den Knopf "
 "Hinzufügen ist nichts passiert."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 "<b>Ich wünsche mir eine neue Funktion</b>, die es mir erlaubt meine Arbeit "
 "als E-Mail zu verschicken."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Helfen Sie die Anwendung zu verbessern"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Bitte geben Sie Ihre E-Mail-Adresse an."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1689,7 +1797,7 @@ msgstr ""
 "Ihren Kommentar oder einem Fehlerbericht benötigt werden. Auch können wir "
 "Ihnen auf diese Weise eine Korrektur zusenden, damit Sie diese testen können."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1697,59 +1805,58 @@ msgstr ""
 "Die Eingabe der E-Mail-Adresse ist freiwillig. Wenn Sie keine angeben, wird "
 "Ihr Kommentar anonym versendet."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Sende ein Kommentar zu den Entwicklern"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Sende Sie den Entwicklern ein Kommentar bezüglich:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Etwas das Sie &gemocht haben"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Etwas das Sie &nicht gemocht haben"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Ein fehlerhaftes &Verhalten dieser Anwendung"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Eine neue &Funktion, die Sie sich wünschen"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "Zeige Kommentar-Knöpfe unter der &Fenstertitelleiste."
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "Kommentar &versenden"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "&E-Mail-Adresse ..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Bitte beschreiben Sie kurz, was Ihre Meinung über %1 ist."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Bitte schreiben Sie in Englisch."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr ""
 "Vielleicht können Sie ein <a href=\"%1\">Online-Übersetzungstool</a> "
 "verwenden."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1758,23 +1865,23 @@ msgstr ""
 "versuchen das die Anzahl von positiven und negativen Kommentaren in etwa "
 "gleich hoch ist."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 "Fragen Sie <b>nicht</b> nach neuen Funktionen - Ihre Anfrage wird ignoriert "
 "werden."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Es trat ein Fehler beim Versenden Ihres Berichtes auf.</p><p>Bitte "
 "versuchen Sie es später nochmal.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Übertragungsfehler"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1782,7 +1889,7 @@ msgstr ""
 "<p>Ihr Kommentar wurde erfolgreich versendet. Er wird dazu beitragen die "
 "Anwendung zu verbessern.</p><p>Vielen Dank für Ihre Hilfe.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Kommentar versendet"
 
@@ -1868,8 +1975,8 @@ msgstr ""
 "wird nur angewendet auf Dateien und lokalen Elementen.<br>Die Bilder, die "
 "Sie sehen sind Bildnotizen und keine Dateinotizen.<br>Dateinotizen sind "
 "generische Dokumente. So sind Bildnotizen beispielsweise in Bilder in denen "
-"Sie zeichnen können.</p> <p>Wenn Sie Dateien in Körbe hineinziehen, erkennt %"
-"1 den Dateityp und zeigt Ihnen den Inhalt der Datei.<br>Wenn Sie "
+"Sie zeichnen können.</p> <p>Wenn Sie Dateien in Körbe hineinziehen, erkennt "
+"%1 den Dateityp und zeigt Ihnen den Inhalt der Datei.<br>Wenn Sie "
 "beispielsweise ein Bild- oder eine Textdatei einfügen, wird automatisch eine "
 "Bildnotiz und eine Textnotiz für Sie erzeugt.<br>Bei Dateien die %2 nicht "
 "kennt, werden diese angezeigt als generische Dateinotiz mit einem Symbol, "
@@ -1882,19 +1989,19 @@ msgstr ""
 msgid "Example"
 msgstr "Beispiel"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimieren"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Korb"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Sind Sie sicher, dass Sie %1 beenden wollen?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1905,7 +2012,7 @@ msgstr ""
 "während Sie sich abmelden, wird diese automatisch erneut gestartet, wenn Sie "
 "sich wieder bei TDE anmelden.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Verlassen der Anwendung bestätigen"
 
@@ -1976,7 +2083,7 @@ msgstr "Frei"
 msgid "Mind map"
 msgstr "Mindmap"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Bild)"
 
@@ -2000,6 +2107,11 @@ msgstr "Animation"
 msgid "Sound"
 msgstr "Klang"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Dateien"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Verknüpfung"
@@ -2008,7 +2120,7 @@ msgstr "Verknüpfung"
 msgid "Launcher"
 msgstr "Starter"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Farbe"
 
@@ -2056,271 +2168,280 @@ msgstr "Diese Farbe bearbeiten"
 msgid "Edit this unknown object"
 msgstr "Dieses unbekannte Objekt bearbeiten"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Öffne gerade einfachen Text ..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Öffne gerade einfache Texte ..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Öffne gerade einen einfachen Text mit ..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Öffne gerade einfache Texte mit ..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Öffne einfachen Text mit:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Öffne einfache Texte mit:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Öffne gerade Textelement ..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Öffne gerade Textelemente ..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Öffne gerade Textelement mit ..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Öffne gerade Textelemente mit ..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Öffne Textelement mit:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Öffne Textelemente mit:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Größe"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 mal %2 Pixel"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Öffne gerade Bildelement ..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Öffne gerade Bildelemente ..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Öffne gerade Bildelement ..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Öffne Bildelemente mit ..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Öffne Bildelement mit:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Öffne Bildelemente mit:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Anklicken für eine Ansicht in voller Größe"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Öffne gerade Animationselement ..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Öffne gerade Animationselemente ..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Öffne gerade Animationselement mit ..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Öffne gerade Animationselemente mit ..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Öffne Animationselement mit:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Öffne Animationselemente mit:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Typ"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Öffne diese Datei ..."
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Öffne gerade Datei ..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Öffne gerade Dateien ..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Öffne gerade Datei mit ..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Öffne gerade Dateien mit ..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Öffne Datei mit:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Öffne Textelemente mit:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Öffne diesen Klang"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Öffne gerade Klangelement ..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Öffne gerade Klangelemente ..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Öffne gerade Klangelement mit ..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Öffne gerade Klangelemente mit ..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Öffne Klangelement mit:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Öffne Klangelemente mit:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Ziel"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Öffne diese Verknüpfung"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Die Verknüpfung hat keine URL, die aufgerufen werden kann."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Öffne gerade verknüpftes Ziel ..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Öffne gerade verknüpfte Ziele ..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Öffne gerade Ziel der Verknüpfung mit ..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Öffne gerade Ziel der Verknüpfungen mit ..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Öffne Ziel der Verknüpfung mit ..."
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Öffne Ziel der Verknüpfungen mit ..."
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(in &Terminal starten)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Kommentar"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Befehl"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Starte die Anwendung"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Der Starter hat keinen Befehl, der ausgeführt werden kann."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Starte Anwendung ..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Starte gerade Anwendung ..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Rot</i>: %1, <i>Grün</i>: %2, <i>Blau</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Farbton</i>: %1, <i>Sättigung</i>: %2, <i>Wert</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "CSS Farbname"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Erweiterter CSS Farbname"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Ist eine Webfarbe"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Keine"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2330,11 +2451,11 @@ msgstr ""
 "nächste Version von BasKet wird einen Bildeditor beinhalten).\n"
 "Wollen Sie eine Anwendung öffnen, die dies kann?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Bildnotiz bearbeiten"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2342,15 +2463,15 @@ msgstr ""
 "Das animierte Bild kann nicht mit dieser Anwendung bearbeitet werden.\n"
 "Wollen Sie es eine Anwendung öffnen, die dies kann?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Animationsnotiz bearbeiten"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Farbnotiz bearbeiten"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2360,74 +2481,97 @@ msgstr ""
 "bearbeitetwerden.\n"
 "Sie sollten das Element in eine Anwendung ziehen, die damit umgehen kann."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Unbekannte Notiz bearbeiten"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Verknüpfungsnotiz bearbeiten"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Auto"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "S&ymbol:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "Ziel:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Titel:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Starternotiz bearbeiten"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Wählen Sie einen Befehl, der ausgeführt werden soll:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Erraten"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "&Befehl:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Name:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Schriftart:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Größe"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Fett"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Kursiv"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Linksbündig"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Zentriert"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Rechtsbündig"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Blocksatz"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2475,8 +2619,7 @@ msgstr "Wählen Sie die Größe des Symbols um es als Bild zu importieren."
 msgid "Load File Content into a Note"
 msgstr "Laden eines Dateinhaltes in eine Notiz"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Passwortschutz"
@@ -2485,137 +2628,41 @@ msgstr "Passwortschutz"
 msgid "No private key selected."
 msgstr "Kein privater Schlüssel wurde ausgewählt."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Korb"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportieren"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importieren"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Gehe zu"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Notiz"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Marken"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Textformat-Werkzeugleiste"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&lter:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "ALT+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Kein Passwortschutz"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "ALT+K"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Schütze Korb mit einem &Passwort"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "ALT+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Schütze Korb mit einem privaten &Schlüssel:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "ALT+S"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Links"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Rechts"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "&Position der Korbansicht:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Oben"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Unten"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Position der &Suchleiste:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr ""
 "Benutze Systemnachrichten um über das Ergebnis einer globalen Aktion zu "
 "&berichten"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Was sind globale Aktionen?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2631,7 +2678,7 @@ msgstr ""
 "durch einen Klick mit der mittleren Maustaste die aktuelle Selektion "
 "einfügen."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2640,7 +2687,7 @@ msgstr ""
 "informieren, ob die Aktion erfolgreich war. Sie können diese "
 "Benachrichtigung deaktivieren."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2650,63 +2697,63 @@ msgstr ""
 "zu erscheinen, wenn das Hauptfenster sichtbar ist. In diesem Fall haben Sie "
 "das Ergebnis der Aktionen bereits im Hauptfenster gesehen."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Kontrollleistensymbol"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "Andocken in der &Kontrollleiste"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "Zeige aktuelles &Korbsymbol in der Kontrollleiste"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "&Hauptfenster verstecken, wenn Mauszeiger außerhalb für"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " Zehntelsekunden"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "Zeige Hauptfenster bei &Mauskontakt mit dem Kontrollleistensymbol für"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Änderungen in Körben animieren"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "&Kurzhinweise in Körben anzeigen"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "&Große Notizen"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Verhalten"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr "&Wandle Linien, die mit * oder - beginnen in Listen um"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Vor dem &Entfernen von Notizen nach einer Bestätigung verlangen"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "E&xportiere Marken in Texte"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Wann wird dies verwendet?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2714,31 +2761,32 @@ msgstr ""
 "Dies findet Verwendung, wenn Sie eine Notiz kopieren und einfügen oder sie "
 "ziehen und in einem Texteditor ablegen."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "Wenn diese Einstellung aktiviert ist, können Sie Marken als einfachen Text "
 "darstellen und einfügen."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
 "empty checkbox and a checked box."
 msgstr ""
 "Beispielsweise wird eine Liste von Notizen mit den Marken <b>Aufgaben</b> "
-"und <b>Fertig</b> exportiert als Zeilen beginnend mit <b>[ ]</b> oder <b>[x]"
-"</b>. Dies repräsentiert ein leeres und ein angekreuztes Kreuzfeld.</p>"
+"und <b>Fertig</b> exportiert als Zeilen beginnend mit <b>[ ]</b> oder "
+"<b>[x]</b>. Dies repräsentiert ein leeres und ein angekreuztes Kreuzfeld.</p>"
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "&Gruppiere neue Notizen beim Klick rechts auf die Einfügelinie"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Wie kann man neue Notizen gruppieren?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2748,7 +2796,7 @@ msgstr ""
 "nur Notizen an der Cursorposition einzufügen, sondern auch eine neue Notiz "
 "mit der unter dem Cursor zu gruppieren:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2762,170 +2810,170 @@ msgstr ""
 "Mauszeiger sich befinden, geschieht dies mit der Notiz <b>darüber oder "
 "darunter</b>.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Mache nichts"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Zwischenablage einfügen"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Starternotiz einfügen"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Farbe vom Bildschirm auswählen"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Lade Notiz aus Datei"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "&TDE Menu-Starter importieren"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Symbol importieren"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Umschalt+mittlere Maustaste irgendwohin:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "beim Mauszeiger"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "&Automatisch geschützte Körbe sperren, wenn länger geschlossen als"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " Minuten"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr ""
 "Benutze GnuPG-Agenten um Körbe mit privaten/öffentlichen Schlüsseln zu "
 "schützen"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Platzierung neuer Notizen:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Bei der aktuellen Notiz"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "&Größe neuer Bilder:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&mal"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "Pixel"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "Grafische &Auswahl ..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Zeige den Inhalt von hinzugefügten Dateien folgender Typen"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "Einfacher &Text"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&HTML-Seite"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Bild oder Animation"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Klang"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Audio-Aufnahmen der Konferenz"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Jahresbericht"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Persönlicher Ordner"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Starter %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Klänge"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Dateien"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Verknüpfungen (&lokal)"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "Verknüpfungen (&Netzwerk)"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "S&tarter"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Öffne &Textnotiz mit dieser Anwendung:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Öffne Textnotiz mit:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Öffne &Bildnotiz mit dieser Anwendung:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Öffne Bildnotiz mit:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Öffne &Animationnotiz mit dieser Anwendung:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Öffne Animationsnotiz mit:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Öffne &Klangnotiz mit dieser Anwendung:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Öffne Klangnotiz mit:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2935,7 +2983,7 @@ msgstr ""
 "des Notiztypes verwendet.</p><p>Andernfalls wird die Anwendung verwendet, "
 "die Sie im Konqueror angegeben haben.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2943,28 +2991,29 @@ msgstr ""
 "<p>Bestimmt die Anwendung, die beim Öffnen dieses Notiztypes verwendet "
 "werden soll, anstelle der im Konqueror eingestellten.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr ""
 "Wie kann man die Anwendung bestimmen, die für das Öffnen von "
 "Webverknüpfungen verwendet wird?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Wenn Sie eine Verknüpfung ins Web folgen, wird die Datei (je nach Inhalt) "
 "in Anwendungen geöffnet als würde sie lokal auf Ihrem Rechner verfügbar sein."
@@ -2981,13 +3030,13 @@ msgstr ""
 "feinkörnigen Konfiguration (z.B. nur Webseiten im Brower zu öffnen), lesen "
 "Sie bitten den zweiten Tipp.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr ""
 "Wie kann man die Anwendungen bestimmen, die für das Öffnen von Dateien und "
 "Verknüpfungen verwendet wird?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2996,12 +3045,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Es wird hier beschrieben, wie Sie festlegen können mit welcher Anwendung "
 "ein spezieller Dateityp benutzt werden soll. Dies betrifft auch "
@@ -3031,7 +3080,8 @@ msgstr "Wie kann man Notizen importieren?"
 
 #: softwareimporters.cpp:52
 msgid "&Keep original hierarchy (all notes in separate baskets)"
-msgstr "&Ursprüngliche Hierachie erhalten (alle Notizen in verschiedenen Körben)"
+msgstr ""
+"&Ursprüngliche Hierachie erhalten (alle Notizen in verschiedenen Körben)"
 
 #: softwareimporters.cpp:53
 msgid "&First level notes in separate baskets"
@@ -3097,7 +3147,8 @@ msgid ""
 msgstr "Aus %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 "Datei kann nicht importiert werden. Sie ist entweder beschädigt oder keine "
 "Datei von TuxCard."
@@ -3247,6 +3298,11 @@ msgstr "Wichtig"
 msgid "Very Important"
 msgstr "Sehr wichtig"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animation"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Idee"
@@ -3315,6 +3371,11 @@ msgstr "Aufwärts (Strg+Umschalt+Hoch)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Abwärts (Strg+Umschalt+Runter)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Entfernen"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Marke"
@@ -3414,7 +3475,8 @@ msgstr ""
 "exportiert wird."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 "Das Entfernen der Marke führt dazu, dass Sie von allen Notizen entfernt "
 "wird, der sie momentan zugewiesen wurde."
@@ -3479,3 +3541,111 @@ msgstr ""
 "Verändern Sie die Größe des Fensters, um eine Bildgröße auszuwählen\n"
 "und schließen Sie es mit Escape um Ihre Auswahl zu bestätigen."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Korb"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportieren"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importieren"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Gehe zu"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Notiz"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Marken"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Textformat-Werkzeugleiste"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Textformat-Werkzeugleiste"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&lter:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "Ö&ffnen"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "ALT+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Kein Passwortschutz"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "ALT+K"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Schütze Korb mit einem &Passwort"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "ALT+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Schütze Korb mit einem privaten &Schlüssel:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "ALT+S"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Bitte schreiben Sie in Englisch oder Französisch."
diff --git a/po/es.po b/po/es.po
index 896afcf..bf8eefe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,27 +9,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-01-23 14:40+0100\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "José Luis Tallón,Rafael Rodríguez,Enrique Matías Sánchez (Quique)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr "jltallon@adv-solutions.net,rafael.rodriguez.tf@gmail.com,cronopios@gmail.com"
+msgstr ""
+"jltallon@adv-solutions.net,rafael.rodriguez.tf@gmail.com,cronopios@gmail.com"
 
 #: aboutdata.cpp:27
 msgid ""
@@ -38,94 +40,107 @@ msgid ""
 "Organizing your notes has never been so easy.</p>"
 msgstr ""
 "<p><b>Cuidado de sus ideas.</b></p><p>Una aplicación para tomar notas que le "
-"facilita registrar ideas según se le ocurren, y encontrarlas rápidamente más adelante. "
-"¡Organizar sus notas nunca fue tan fácil!</p>"
+"facilita registrar ideas según se le ocurren, y encontrarlas rápidamente más "
+"adelante. ¡Organizar sus notas nunca fue tan fácil!</p>"
 
 #: aboutdata.cpp:34
 msgid "BasKet Note Pads"
 msgstr "Blocs de notas BasKet"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Autor, mantenedor"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Cifrado de las cestas, integración en Kontact, importador de KnowIt"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
 msgstr ""
-"Bloqueo automático de las cestas, icono del estado de guardado, copiar/pegar HTML, "
-"consejos sobre el nombre de las cestas, soltar sobre el nombre de las cestas"
+"Bloqueo automático de las cestas, icono del estado de guardado, copiar/pegar "
+"HTML, consejos sobre el nombre de las cestas, soltar sobre el nombre de las "
+"cestas"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Icono"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Guardar como archivo de cestas"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Guardando como archivo de cestas. Por favor, espere..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Este fichero no es un archivo de cestas."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Error del archivo de cestas"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Este fichero está corrupto. No se puede abrir."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
 "missing because they are of a type only available in new versions. When "
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
-msgstr "Este fichero fue creado con una versión reciente de %1. Se puede abrir, pero puede que falte parte de la información. Por ejemplo, pueden faltar algunas notas porque sean de un tipo que sólo esté disponible en versiones más modernas. Cuando vuelva a grabar el fichero, puede que sea sensato guardarlo en otro fichero, para conservar el original."
+msgstr ""
+"Este fichero fue creado con una versión reciente de %1. Se puede abrir, pero "
+"puede que falte parte de la información. Por ejemplo, pueden faltar algunas "
+"notas porque sean de un tipo que sólo esté disponible en versiones más "
+"modernas. Cuando vuelva a grabar el fichero, puede que sea sensato guardarlo "
+"en otro fichero, para conservar el original."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
-msgstr "Este fichero fue creado con una versión reciente de %1. Por favor, actualice a una versión más moderna para poder abrir ese fichero."
+msgstr ""
+"Este fichero fue creado con una versión reciente de %1. Por favor, actualice "
+"a una versión más moderna para poder abrir ese fichero."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Respaldar y restaurar"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Carpeta donde guardar"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Sus cestas se almacenan actualmente es esta carpeta: <br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&Mover a otra carpeta..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Usar otra carpeta ya existente..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "¿Por qué hacer eso?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -138,156 +153,183 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>Puede mover la carpeta en la que %1 almacena sus cestas a:</p><ul><li>Almacenar sus carpetas en un lugar visible de su carpeta personal, como ~/Notas o ~/Cestas, a fin de poder hacer copias de respaldo cuando lo deseea.</li> "
-"<li>Almacenar sus cestas en un servidor para compartirlas entre dos computadoras.<br>En este caso, monte la carpeta compartida en el sistema de ficheros local y solicite a %2 que use ese punto de montaje.<br>Advertencia: no debe ejecutar %3 al mismo tiempo en las dos computadoras, o se arriesgaría a perder datos mientras las dos aplicaciones estén desincronizadas.</li></ul><p>"
-"Recuerde que no debe cambiar manualmente el contenido de esta carpeta (por ejemplo añadir un fichero a una carpeta de basket no añadirá ese fichero a una carpeta de cesta no añadirá ese fichero a la cesta.)</p>"
-
-#: backup.cpp:89
+"<p>Puede mover la carpeta en la que %1 almacena sus cestas a:</"
+"p><ul><li>Almacenar sus carpetas en un lugar visible de su carpeta personal, "
+"como ~/Notas o ~/Cestas, a fin de poder hacer copias de respaldo cuando lo "
+"deseea.</li> <li>Almacenar sus cestas en un servidor para compartirlas entre "
+"dos computadoras.<br>En este caso, monte la carpeta compartida en el sistema "
+"de ficheros local y solicite a %2 que use ese punto de montaje."
+"<br>Advertencia: no debe ejecutar %3 al mismo tiempo en las dos "
+"computadoras, o se arriesgaría a perder datos mientras las dos aplicaciones "
+"estén desincronizadas.</li></ul><p>Recuerde que no debe cambiar manualmente "
+"el contenido de esta carpeta (por ejemplo añadir un fichero a una carpeta de "
+"basket no añadirá ese fichero a una carpeta de cesta no añadirá ese fichero "
+"a la cesta.)</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Copias de respaldo"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Copia de respaldo..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Restaurar una copia de respaldo..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Última copia de respaldo: nunca"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Última copia de respaldo: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Elija una carpeta a la que mover las cestas"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "La carpeta <b>%1</b> no está vacía. ¿Desea sobreescribirla?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "¿Sobreescribir la carpeta?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "S&obreescribir"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Sus cestas se han movido con éxito a <b>%1</b>. %2 va a ser reiniciado para tener en cuenta este cambio."
+msgstr ""
+"Sus cestas se han movido con éxito a <b>%1</b>. %2 va a ser reiniciado para "
+"tener en cuenta este cambio."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Elija una carpeta existente en la que almacenar las cestas"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
-msgstr "Sus carpeta para guardar las cestas ha sido cambiada con éxito a <b>%1</b>. %2 va a ser reiniciado para tener en cuenta este cambio."
+msgstr ""
+"Sus carpeta para guardar las cestas ha sido cambiada con éxito a <b>%1</b>. "
+"%2 va a ser reiniciado para tener en cuenta este cambio."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Cestas_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Archivos tar comprimidos con gzip"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Todos los ficheros"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Hacer una copia de respaldo de las cestas"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "El fichero <b>%1</b> ya existe. ¿Desea sobreescribirlo?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "¿Sobreescribir el fichero?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Haciendo copia de respaldo de las cestas. Por favor, espere..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Abriar un archivo de cestas"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "LEAME.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Ésta es una copia de seguridad de sus cestas, tal y como estaban antes de que empezar a restaurar la copia de respaldo %1."
+msgstr ""
+"Ésta es una copia de seguridad de sus cestas, tal y como estaban antes de "
+"que empezar a restaurar la copia de respaldo %1."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
-msgstr "Si la restauración ha tenido éxito y ha restaurado lo que quería restaurar, puede eliminar esta carpeta."
+msgstr ""
+"Si la restauración ha tenido éxito y ha restaurado lo que quería restaurar, "
+"puede eliminar esta carpeta."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Si algo fuera mal durante el proceso de restauración, puede volver a usar esta carpeta para almacenar sus cestas y no se perderá nada."
+msgstr ""
+"Si algo fuera mal durante el proceso de restauración, puede volver a usar "
+"esta carpeta para almacenar sus cestas y no se perderá nada."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Seleccione «Basket» -> «Respaldar y restaurar...» -> «Usar otra carpeta existente...» y seleccione esa carpeta."
+msgstr ""
+"Seleccione «Basket» -> «Respaldar y restaurar...» -> «Usar otra carpeta "
+"existente...» y seleccione esa carpeta."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Restaurando <b>%1</b>. Por favor, espere..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr "Si algo fuse mal durante el proceso de restauración, lea el fichero <b>%1</b>."
+msgstr ""
+"Si algo fuse mal durante el proceso de restauración, lea el fichero <b>%1</"
+"b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Restaurar las cestas"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
-msgstr "Este archivo no es una copia de respaldo de cestas, o está corrupto. No se puede importar. En su lugar se han conservado sus cestas viejas."
+msgstr ""
+"Este archivo no es una copia de respaldo de cestas, o está corrupto. No se "
+"puede importar. En su lugar se han conservado sus cestas viejas."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Error de restauración"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Su copia de respaldo ha sido restaurada con éxito en <b>%1</b>. %2 va a ser reiniciado para tener en cuenta este cambio."
+msgstr ""
+"Su copia de respaldo ha sido restaurada con éxito en <b>%1</b>. %2 va a ser "
+"reiniciado para tener en cuenta este cambio."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -305,41 +347,42 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Cestas antes de la restauración (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "La nota nueva no coincide con el filtro y está oculta."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Una nota nueva no coincide con el filtro y está oculta."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr ""
 "Algunas notas nuevas no coinciden con el criterio de filtrado y están "
 "ocultas."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
-msgstr "Las notas nuevas no coinciden con el criterio de filtrado y están ocultas."
+msgstr ""
+"Las notas nuevas no coinciden con el criterio de filtrado y están ocultas."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Agrupar"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Insertar"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Soltado en la cesta <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -347,7 +390,7 @@ msgstr ""
 "Este mensaje nunca debería aparecer. Si lo hace, ¡el programa tiene un "
 "fallo! Por favor, informe del error al desarrollador."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -355,48 +398,48 @@ msgstr ""
 "Inserte una nota aquí\n"
 "Pulse con el botón derecho para ver más opciones"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Redimensionar esas columnas"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Redimensionar este grupo"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Redimensionar esta nota"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Seleccionar o mover esta nota"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Seleccionar o mover este grupo"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Asignar o eliminar etiquetas de esta nota"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Etiquetas asignadas</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Expandir este grupo"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Contraer este grupo"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -404,7 +447,7 @@ msgstr ""
 "Agrupar la nota con la que está debajo\n"
 "Pulse con el botón derecho para ver más opciones"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -412,74 +455,79 @@ msgstr ""
 "Agrupar la nota con la que está encima\n"
 "Pulse con el botón derecho para ver más opciones"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Añadido"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Última modificación"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Pulse en la derecha para agrupar en vez de insertar"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Pulse en la izquierda para insertar en vez de agrupar"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Desbloquear"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Cesta protegida con contraseña."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Pulse «Desbloquear» para acceder a ella."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
-msgstr ""
-"Esta versión de %1<br/> "
-"no admite cifrado."
+msgstr "Esta versión de %1<br/> no admite cifrado."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
-msgstr "Para hacer que las cestas permanezcan desbloqueadas, cambie<br>la duración del bloqueo automático en las preferencias de la aplicación."
+msgstr ""
+"Para hacer que las cestas permanezcan desbloqueadas, cambie<br>la duración "
+"del bloqueo automático en las preferencias de la aplicación."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "Elimina&r todas"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Personalizar..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtrar por esta etiqueta"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtrar por este e&stado"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -488,7 +536,7 @@ msgstr ""
 "<qt>¿Realmente desea borrar esta nota?</qt>\n"
 "<qt>¿Desea realmente borrar esas <b>%n</b> notas?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -496,7 +544,7 @@ msgstr ""
 "Borrar nota\n"
 "Borrar notas"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -504,7 +552,7 @@ msgstr ""
 "Nota copiada al portapapeles.\n"
 "Notas copiadas al portapapeles."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -512,7 +560,7 @@ msgstr ""
 "Nota cortada al portapapeles.\n"
 "Notas cortadas al portapapeles."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -520,39 +568,44 @@ msgstr ""
 "Nota copiada a la selección.\n"
 "Notas copiadas a la selección."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "No se puede abrir esta nota."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "No está autorizado a abrir este fichero."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Guardar en un fichero"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Por favor, introduzca la contraseña para la siguiente clave privada:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Por favor, introduzca la contraseña para la cesta <b>%1</b>:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Por favor, asigne una contraseña a la cesta <b>%1</b>:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "No hay suficiente espacio en disco para guardar los datos de la cesta"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Permisos erróneos sobre los ficheros de la cesta"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -560,7 +613,7 @@ msgstr ""
 "Por favor, elimine los ficheros del disco <b>%1</b> para permitir que la "
 "aplicación guarde sus cambios de forma segura."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -568,13 +621,42 @@ msgstr ""
 "Los permisos del archivo <b>%1</b> no son válidos. Por favor, compruebe que "
 "tiene acceso de escritura sobre él y sobre las carpetas padre."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Error de guardado"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Mostrar/ocultar la ventana principal"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"&Mostrar la ventana principal cuando el ratón pase por encima del icono de "
+"la bandeja del sistema durante"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Abriar un archivo de cestas"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
-msgstr "Disculpe, pero la creación de una carpeta para esta nueva cesta ha fallado."
+msgstr ""
+"Disculpe, pero la creación de una carpeta para esta nueva cesta ha fallado."
 
 #: basketfactory.cpp:60 basketfactory.cpp:90 basketfactory.cpp:111
 msgid "Basket Creation Failed"
@@ -582,7 +664,8 @@ msgstr "Falló la creación de la cesta"
 
 #: basketfactory.cpp:90
 msgid "Sorry, but the template copying for this new basket has failed."
-msgstr "Disculpe, pero la copia de la plantilla para esta nueva cesta ha fallado."
+msgstr ""
+"Disculpe, pero la copia de la plantilla para esta nueva cesta ha fallado."
 
 #: basketfactory.cpp:111
 msgid "Sorry, but the template customization for this new basket has failed."
@@ -606,10 +689,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Propiedades de la cesta"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Nombre"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Imagen de fondo:"
@@ -666,11 +753,19 @@ msgid ""
 "clipboard or the selection into the current basket from anywhere.</p>"
 msgstr ""
 "<p><strong>Recordar fácilmente sus accesos rápidos de teclado</strong>:"
-"<br>Con la primera opción, darle a la cesta un acceso rápido de la forma <strong>Alt+Letra<strong> subrayará esa letra en el árbol de cestas."
-"<br>Por ejemplo, si asigna el acceso rápido <i>Alt+C</i> a una cesta llamada <i>Consejos</i>, la cesta será mostrada en el árbol como <i><u>C</u>onsejos</i>. Visualizar los accesos rápidos ayuda a recordarlos más rapidamente.</p> "
-"<p><strong>Local vs Global</strong>:<br> "
-"La primera opción le permite mostrar la cesta mientras la ventana principal está activa. Los accesos rápidos globales son válidos desde cualquier sitio, incluso si la ventana está cerrada.</p>"
-"<p><strong>Mostrar vs Cambiar</strong>:<br>La última opción hace que ésta sea la cesta actual sin abrir la ventana principal. Es útil cuando se añade a los accesos rápidos globales configurables para, por ejemplo, pegar el contenido del portapapeles o la selección en la cesta actual desde cualquier sitio.</p>"
+"<br>Con la primera opción, darle a la cesta un acceso rápido de la forma "
+"<strong>Alt+Letra<strong> subrayará esa letra en el árbol de cestas.<br>Por "
+"ejemplo, si asigna el acceso rápido <i>Alt+C</i> a una cesta llamada "
+"<i>Consejos</i>, la cesta será mostrada en el árbol como <i><u>C</u>onsejos</"
+"i>. Visualizar los accesos rápidos ayuda a recordarlos más rapidamente.</p> "
+"<p><strong>Local vs Global</strong>:<br> La primera opción le permite "
+"mostrar la cesta mientras la ventana principal está activa. Los accesos "
+"rápidos globales son válidos desde cualquier sitio, incluso si la ventana "
+"está cerrada.</p><p><strong>Mostrar vs Cambiar</strong>:<br>La última opción "
+"hace que ésta sea la cesta actual sin abrir la ventana principal. Es útil "
+"cuando se añade a los accesos rápidos globales configurables para, por "
+"ejemplo, pegar el contenido del portapapeles o la selección en la cesta "
+"actual desde cualquier sitio.</p>"
 
 #: basketproperties.cpp:149
 msgid "S&how this basket"
@@ -702,396 +797,421 @@ msgstr "<p>Esta cesta está <b>bloqueada</b>.<br>Pulse para desbloquearla.</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Esta cesta está <b>desbloqueada</b>.<br>Pulse para bloquearla.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "General"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Mostrar/ocultar la ventana principal"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr ""
-"Le permite mostrar la ventana principal si está oculta, y ocultarla si "
-"está visible."
+"Le permite mostrar la ventana principal si está oculta, y ocultarla si está "
+"visible."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Pegar el contenido del portapapeles en la cesta actual"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
-msgstr "Le permite pegar el contenido del portapapeles en la cesta actual sin necesidad de abrir la ventana principal."
+msgstr ""
+"Le permite pegar el contenido del portapapeles en la cesta actual sin "
+"necesidad de abrir la ventana principal."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Mostrar el nombre de la cesta actual"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
-msgstr "Le permite saber qué cesta es la actual sin abrir la ventana principal."
+msgstr ""
+"Le permite saber qué cesta es la actual sin abrir la ventana principal."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Pegar la selección en la cesta actual"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
-msgstr "Le permite pegar la selección del portapapeles en la cesta actual sin necesidad de abrir la ventana principal."
+msgstr ""
+"Le permite pegar la selección del portapapeles en la cesta actual sin "
+"necesidad de abrir la ventana principal."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Crear una nueva cesta"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
 "or paste selection in this new basket)."
-msgstr "Le permite crear una nueva cesta sin necesidad de abrir la ventana principal (a continuación puede usar alguno de los otros accesos rápidos globales para añadir una nota, pegar el contenido del portapapeles o la selección actual en esta nueva cesta)."
+msgstr ""
+"Le permite crear una nueva cesta sin necesidad de abrir la ventana principal "
+"(a continuación puede usar alguno de los otros accesos rápidos globales para "
+"añadir una nota, pegar el contenido del portapapeles o la selección actual "
+"en esta nueva cesta)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Ir a la cesta anterior"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
-msgstr "Le permite cambiar la cesta actual a la cesta anterior sin necesidad de abrir la ventana principal."
+msgstr ""
+"Le permite cambiar la cesta actual a la cesta anterior sin necesidad de "
+"abrir la ventana principal."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Ir a la siguiente cesta"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
-msgstr "Permite cambiar la cesta actual a la cesta siguiente sin necesidad de abrir la ventana principal."
+msgstr ""
+"Permite cambiar la cesta actual a la cesta siguiente sin necesidad de abrir "
+"la ventana principal."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Insertar una nota de texto"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
-msgstr "Añade un texto a la cesta actual sin necesidad de abrir la ventana principal."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
+msgstr ""
+"Añade un texto a la cesta actual sin necesidad de abrir la ventana principal."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Insertar una nota de imagen"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
-msgstr "Añade una imagen a la cesta actual sin necesidad de abrir la ventana principal."
+msgstr ""
+"Añade una imagen a la cesta actual sin necesidad de abrir la ventana "
+"principal."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Insertar una nota de enlace"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Añade un enlace a la cesta actual sin necesidad de abrir la ventana principal."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Añade un enlace a la cesta actual sin necesidad de abrir la ventana "
+"principal."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Insertar una nota de color"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
 msgstr ""
-"Añade un color a la cesta actual sin necesidad de abrir la "
-"ventana principal."
+"Añade un color a la cesta actual sin necesidad de abrir la ventana principal."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Elegir un color de la pantalla"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
 msgstr ""
-"Añade un color escogido de un píxel de la pantalla a la cesta "
-"actual sin necesidad de abrir la ventana principal."
+"Añade un color escogido de un píxel de la pantalla a la cesta actual sin "
+"necesidad de abrir la ventana principal."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Capturar una zona de la pantalla"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
 msgstr ""
-"Captura una zona de la pantalla como imagen en la cesta actual sin "
-"necesidad de abrir la ventana principal."
+"Captura una zona de la pantalla como imagen en la cesta actual sin necesidad "
+"de abrir la ventana principal."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Cestas"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Por favor, escriba en inglés o francés."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
 "by creating new baskets inside others. You can browse between them by "
 "clicking a basket to open it, or reorganize them using drag and drop."
-msgstr "<h2>Árbol de cestas</h2>Aquí está la lista de sus cestas. Puede organizar sus datos poniéndolos en diferentes cestas. Puede agrupar cestas por temática creando nuevas cestas dentro de otras. Puede navegar a través de ellas pulsando en una cesta para abrirla, o reorganizarlas arrastrando y soltando."
+msgstr ""
+"<h2>Árbol de cestas</h2>Aquí está la lista de sus cestas. Puede organizar "
+"sus datos poniéndolos en diferentes cestas. Puede agrupar cestas por "
+"temática creando nuevas cestas dentro de otras. Puede navegar a través de "
+"ellas pulsando en una cesta para abrirla, o reorganizarlas arrastrando y "
+"soltando."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Archivo de cestas..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Ocultar la ventana"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "Página web &HTML..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "&Fichero de texto..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Respaldar y restaurar..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Borrar"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Selecciona todas las notas"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Deseleccio&nar todas"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Deselecciona todas las notas seleccionadas"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Invertir la selección"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Invierte la actual selección de notas"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Editar..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Abrir"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Abrir &con..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Guardar en un fichero..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "A&grupar"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "&Desagrupar"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Llevar a lo más al&to"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "S&ubir"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "&Bajar"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Llevar a lo más &bajo"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Texto"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "En&lace"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Imagen"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Color"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "L&anzador"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importar un lanzador del menú de &TDE..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&portar un icono..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Cargar desde un &fichero..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "C&olor desde la pantalla"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Capturar una &zona de la pantalla"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Nueva cesta..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Nueva &subcesta..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Nueva cesta &vecina..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Nuevo"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Propiedades de la cesta"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "Elimina&r"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "&Contraseña..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "B&loquear"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtrar"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtrar todas las &cestas"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "Vacia&r el filtro"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "Cesta &anterior"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "Cesta siguie&nte"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Plegar esta cesta"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Expandir esta cesta"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Configurar los accesos rápidos &globales..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "Cestas de &bienvenida"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Conversión de notas en texto simple"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Conversión de notas en texto simple a notas en texto enriquecido..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Bloqueada"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Sin notas"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1100,7 +1220,7 @@ msgstr ""
 "%n nota\n"
 "%n notas"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1109,15 +1229,15 @@ msgstr ""
 "%n seleccionada\n"
 "%n seleccionadas"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "todas las coincidencias"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "sin filtro"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1126,29 +1246,30 @@ msgstr ""
 "%n coincidencia\n"
 "%n coincidencias"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Seleccionado un color para la cesta <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
-msgstr "Las notas en texto simple han sido convertidas a notas en texto enriquecido."
+msgstr ""
+"Las notas en texto simple han sido convertidas a notas en texto enriquecido."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Conversión finalizada"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "No hay ninguna nota en texto simple que convertir."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1158,92 +1279,97 @@ msgid ""
 "sure the application is correctly installed but you had a preview version of "
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
-"<p><b>Parece que el fichero basketui.rc no existe o es demasiado antiguo."
-"<br>%1 no puede ejecutarse sin él y terminará.</b></p>"
-"<p>Por favor, compruebe su instalación de %2.</p>"
-"<p>Si no tiene privilegios de administrador para instalar la aplicación en todo el sistema, puede copiar el fichero basketui.rc del archivo de instalación a la carpeta <a "
-"href='file://%3'>%4</a>. </p>"
-"<p>Como último recurso, si está seguro de que la aplicación está bien instalada pero tenía una versión anterior de basketui.rc, trate de eliminar el fichero %5basketui.rc</p>"
+"<p><b>Parece que el fichero basketui.rc no existe o es demasiado antiguo.<br>"
+"%1 no puede ejecutarse sin él y terminará.</b></p><p>Por favor, compruebe su "
+"instalación de %2.</p><p>Si no tiene privilegios de administrador para "
+"instalar la aplicación en todo el sistema, puede copiar el fichero basketui."
+"rc del archivo de instalación a la carpeta <a href='file://%3'>%4</a>. </"
+"p><p>Como último recurso, si está seguro de que la aplicación está bien "
+"instalada pero tenía una versión anterior de basketui.rc, trate de eliminar "
+"el fichero %5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Recurso no encontrado"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "No se pudo añadir una nota."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Capturada una zona de la pantalla en la cesta <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Borrar la cesta"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Borrar sólo esa cesta"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Borrar la nota y sus hijos"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>¿Desea realmente eliminar la cesta <b>%1</b> y su contenido?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Eliminar la cesta"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "Elimina&r la cesta"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
-msgstr "<qt><b>%1</b> tiene las siguientes cestas hija.<br>¿Desea eliminarlas también?</qt>"
+msgstr ""
+"<qt><b>%1</b> tiene las siguientes cestas hija.<br>¿Desea eliminarlas "
+"también?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Eliminar las cestas hija"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "Elimina&r las cestas hija"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Archivos de cestas"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Contenido del portapeles pegado en la cesta <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Selección pegada en la cesta <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "No se ha añadido ninguna nota."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "La cesta <i>%1</i> está bloqueada"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Bloqueada)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Asignar una nueva etiqueta..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "Elimina&r todas"
 
@@ -1259,7 +1385,10 @@ msgid ""
 msgstr ""
 "¡%1 ha dado un error! Disculpe.\n"
 "\n"
-"¡Pero no todo está perdido! Podría ayudarnos a solucionar el fallo. Debajo hay información que describe el error, así que simplemente pulse Enviar o, si tiene tiempo, escriba una breve descripción de qué estaba haciendo justo antes de que se produjera el error.\n"
+"¡Pero no todo está perdido! Podría ayudarnos a solucionar el fallo. Debajo "
+"hay información que describe el error, así que simplemente pulse Enviar o, "
+"si tiene tiempo, escriba una breve descripción de qué estaba haciendo justo "
+"antes de que se produjera el error.\n"
 "\n"
 "Muchas gracias."
 
@@ -1267,7 +1396,9 @@ msgstr ""
 msgid ""
 "The information below is to help the developers identify the problem, please "
 "do not modify it."
-msgstr "La información que de abajo permitirá a los desarrolladores identificar el problema. Por favor, no la modifique."
+msgstr ""
+"La información que de abajo permitirá a los desarrolladores identificar el "
+"problema. Por favor, no la modifique."
 
 #: crashhandler.cpp:206
 msgid ""
@@ -1278,7 +1409,9 @@ msgid ""
 msgstr ""
 "¡%1 ha dado un error! Disculpe.\n"
 "\n"
-"¡Pero no todo está perdido! Quizá ya haya una actualización disponible que solucione el problema. Por favor, compruebe el repositorio de software de su distribución."
+"¡Pero no todo está perdido! Quizá ya haya una actualización disponible que "
+"solucione el problema. Por favor, compruebe el repositorio de software de su "
+"distribución."
 
 #: debugwindow.cpp:34
 msgid "Debug Window"
@@ -1328,11 +1461,11 @@ msgstr "Etiquet&a: "
 msgid "Filter all Baskets"
 msgstr "Filtrar todas las cestas"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(No etiquetada)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Etiquetada)"
 
@@ -1357,7 +1490,10 @@ msgid ""
 "modify the other anymore as they are now separate entities.</p>"
 msgstr ""
 "<p>El replicado de carpetas ya no es posible (vea <a href='http://basket.kde."
-"org/'>basket.kde.org</a> para más información). </p><p>La carpeta <b>%1</b> ha sido copiada para las necesidades de la cesta. Puede borrar esta carpeta o la cesta, o utilizar ambas. Pero recuerde que modificar una no modificará la otra, puesto que ahora son dos entidades separadas.</p>"
+"org/'>basket.kde.org</a> para más información). </p><p>La carpeta <b>%1</b> "
+"ha sido copiada para las necesidades de la cesta. Puede borrar esta carpeta "
+"o la cesta, o utilizar ambas. Pero recuerde que modificar una no modificará "
+"la otra, puesto que ahora son dos entidades separadas.</p>"
 
 #: formatimporter.cpp:134
 msgid "Folder Mirror Import"
@@ -1407,7 +1543,9 @@ msgstr "datos"
 
 #: htmlexporter.cpp:319
 msgid "Made with %1, a TDE tool to take notes and keep information at hand."
-msgstr "Creado con %1, una herramienta de TDE para tomar notas y mantener información al alcance de la mano."
+msgstr ""
+"Creado con %1, una herramienta de TDE para tomar notas y mantener "
+"información al alcance de la mano."
 
 #: kcolorcombo2.cpp:126 kcolorcombo2.cpp:602 kcolorcombo2.cpp:624
 #: tagsedit.cpp:470 variouswidgets.cpp:269
@@ -1418,35 +1556,35 @@ msgstr "(Predeterminado)"
 msgid "Other..."
 msgstr "Otro..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Lista de claves privadas"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Seleccione una clave privada:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "El listado de claves terminó inesperadamente."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Esa clave pública no está destinada a cifrado"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Algoritmo no soportado"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
@@ -1486,19 +1624,32 @@ msgstr "Sistema de ficheros"
 msgid "File Types"
 msgstr "Tipos de fichero"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Ficheros de icono (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Abrir"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
-msgstr "Enviar a los desarrolladores de la aplicación un comentario sobre algo que le gusta."
+msgstr ""
+"Enviar a los desarrolladores de la aplicación un comentario sobre algo que "
+"le gusta."
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
-msgstr "Enviar a los desarrolladores de la aplicación un comentario sobre algo que no le gusta."
+msgstr ""
+"Enviar a los desarrolladores de la aplicación un comentario sobre algo que "
+"no le gusta."
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
@@ -1506,45 +1657,50 @@ msgstr ""
 "Enviar a los desarrolladores de la aplicación un comentario sobre un "
 "comportamiento anómalo del programa."
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
-msgstr "Enviar a los desarrolladores de la aplicación un comentario sobre una nueva característica que le gustaría."
+msgstr ""
+"Enviar a los desarrolladores de la aplicación un comentario sobre una nueva "
+"característica que le gustaría."
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "Enviar un comentario a los de&sarrolladores"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Bienvenido a esta versión de prueba de %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Bienvenido a %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Para ayudarnos a mejorar, sus comentarios son importantes."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
 "or dislike and click Send."
-msgstr "Cada vez que encuentre algo de la aplicación que le encante o le frustre, por favor, pulse el emoticono apropiado bajo la barra de título de la ventana, describa brevemente lo que le gustó o le disgustó y pulse Enviar."
+msgstr ""
+"Cada vez que encuentre algo de la aplicación que le encante o le frustre, "
+"por favor, pulse el emoticono apropiado bajo la barra de título de la "
+"ventana, describa brevemente lo que le gustó o le disgustó y pulse Enviar."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
 msgstr ""
 "Cada vez que tenga un experiencia genial, por favor, pulse en la cara "
-"sonriente bajo la barra de título de la ventana. Describa brevemente lo "
-"que le gustó y pulse Enviar."
+"sonriente bajo la barra de título de la ventana. Describa brevemente lo que "
+"le gustó y pulse Enviar."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1553,14 +1709,17 @@ msgstr ""
 "enfadada debajo de la barra de título de la ventana. Describa brevemente lo "
 "que le disgustó y pulse Enviar."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
 "Send."
-msgstr "Siga la misma mecánica para informar rápidamente de un fallo: simplemente pulse en el icono del objeto roto en la esquina superior derecha de la ventana, descríbalo y pulse Enviar."
+msgstr ""
+"Siga la misma mecánica para informar rápidamente de un fallo: simplemente "
+"pulse en el icono del objeto roto en la esquina superior derecha de la "
+"ventana, descríbalo y pulse Enviar."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1570,7 +1729,7 @@ msgstr ""
 "icono del objeto rojo bajo la ventana de título de la ventana. Describa "
 "brevemente el comportamiento anómalo y pulse Enviar."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1578,15 +1737,18 @@ msgstr ""
 "Ejemplo:\n"
 "Ejemplos:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Me gustan</b> las nuevas imágenes. Muy refrescantes."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
-msgstr "<b>No me gusta</b> la página de bienvenida de este asistente. Consume demasiado tiempo."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+msgstr ""
+"<b>No me gusta</b> la página de bienvenida de este asistente. Consume "
+"demasiado tiempo."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1594,32 +1756,36 @@ msgstr ""
 "<b>La aplicacion tiene un comportamiento anómalo</b> cuando pulso en el "
 "botón Añadir. No ocurre nada."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 "<b>Me gustaría disponer de una nueva característica</b> que me permitiera "
 "enviar mi trabajo por correo electrónico."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Ayudar a mejorar esta aplicación"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Dirección de correo electrónico"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Por favor, introduzca su dirección de correo electrónico."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
 "corrections for you to test, etc."
-msgstr "Sólo será utilizada para contactar con usted en caso de que se necesite más información sobre sus comentarios, preguntarle cómo reproducir los errores de los cuales nos informa, enviarle correcciones del error para que las pruebe, etc."
+msgstr ""
+"Sólo será utilizada para contactar con usted en caso de que se necesite más "
+"información sobre sus comentarios, preguntarle cómo reproducir los errores "
+"de los cuales nos informa, enviarle correcciones del error para que las "
+"pruebe, etc."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1627,81 +1793,83 @@ msgstr ""
 "La dirección de correo electrónico es opcional. Si no facilita ninguna, sus "
 "comentarios serán enviados anónimamente."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Enviar un comentario a los desarrolladores"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Enviar a los desarrolladores de la aplicación un comentario sobre:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "A&lgo que le gusta"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Algo que le &disgusta"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Un &comportamiento anómalo de esta aplicación"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Una nueva &característica que desearía"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
-msgstr "Mostrar los botones de comentario bajo las barras de título de las &ventanas"
+msgstr ""
+"Mostrar los botones de comentario bajo las barras de título de las &ventanas"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Enviar el comentario"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "Dirección de correo &electrónico..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Por favor, describa brevemente su opinión sobre %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Por favor, escriba en inglés."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
-msgstr "Podría utilizar una <a href=\"%1\">herramienta de traducción en línea</a>."
+msgstr ""
+"Podría utilizar una <a href=\"%1\">herramienta de traducción en línea</a>."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
 msgstr ""
-"Para que los comentarios que envía sean más útiles para mejorar la aplicación, "
-"intente enviar la misma cantidad de comentarios positivos y negativos."
+"Para que los comentarios que envía sean más útiles para mejorar la "
+"aplicación, intente enviar la misma cantidad de comentarios positivos y "
+"negativos."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 "<b>No</b> pregunte por características nuevas: sus peticiones serán "
 "ignoradas."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Error al intentar enviar el informe.</p><p>Por favor, inténtelo de nuevo "
 "más tarde.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Error de transmisión"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1709,7 +1877,7 @@ msgstr ""
 "<p>Su comentario ha sido enviado con éxito. Ayudará a mejorar la aplicación."
 "</p><p>Gracias por su tiempo.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Comentario enviado"
 
@@ -1791,37 +1959,48 @@ msgid ""
 "you drop, go to the \"General\" page and uncheck \"Image or animation\" in "
 "the \"View Content of Added Files for the Following Types\" group.</p>"
 msgstr ""
-"<p>Es normal porque hay varios tipos de notas.<br>Esta opción sólo se aplica a las notas de fichero y de enlace local.<br>Y las imágenes que ve son notas de imagen, no notas de fichero.<br>Las notas de fichero son documentos genéricos, mientras que las notas de imagen son ilustraciones que puede dibujar.</p>"
-"<p>Cuando usted suelta ficheros en las cestas, %1 detecta su tipo y le muestra el contenido de estos ficheros.<br>Por ejemplo, cuando suelta ficheros de texto o imagen, se crean para ellos notas de texto o imagen."
-"<br>Los tipos de ficheros que %2 no entiende se muestran como notas de fichero genérico con sólo un icono o una previsualización del fichero y un nombre de fichero.</p>"
-"<p>Si no desea que la aplicación cree los diferentes tipos de nota dependiendo del contenido de los ficheros que suelta, vaya a la página «General» y desmarque «Imagen o animación» en el grupo «Ver contenido de los ficheros añadidos para los siguientes tipos».</p>"
+"<p>Es normal porque hay varios tipos de notas.<br>Esta opción sólo se aplica "
+"a las notas de fichero y de enlace local.<br>Y las imágenes que ve son notas "
+"de imagen, no notas de fichero.<br>Las notas de fichero son documentos "
+"genéricos, mientras que las notas de imagen son ilustraciones que puede "
+"dibujar.</p><p>Cuando usted suelta ficheros en las cestas, %1 detecta su "
+"tipo y le muestra el contenido de estos ficheros.<br>Por ejemplo, cuando "
+"suelta ficheros de texto o imagen, se crean para ellos notas de texto o "
+"imagen.<br>Los tipos de ficheros que %2 no entiende se muestran como notas "
+"de fichero genérico con sólo un icono o una previsualización del fichero y "
+"un nombre de fichero.</p><p>Si no desea que la aplicación cree los "
+"diferentes tipos de nota dependiendo del contenido de los ficheros que "
+"suelta, vaya a la página «General» y desmarque «Imagen o animación» en el "
+"grupo «Ver contenido de los ficheros añadidos para los siguientes tipos».</p>"
 
 #: linklabel.cpp:623
 msgid "Example"
 msgstr "Ejemplo"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Cesta"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>¿Desea realmente salir de %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
 "the application will be reloaded the next time you log in.</p>"
 msgstr ""
-"<p>Tenga en cuenta que no necesita salir de la aplicación antes de "
-"terminar su sesión de TDE. Si termina su sesión mientras la aplicación está todavía ejecutándose, se volverá a cargar automáticamente la próxima vez que inicie la sesión.</p>"
+"<p>Tenga en cuenta que no necesita salir de la aplicación antes de terminar "
+"su sesión de TDE. Si termina su sesión mientras la aplicación está todavía "
+"ejecutándose, se volverá a cargar automáticamente la próxima vez que inicie "
+"la sesión.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Confirmación de la salida"
 
@@ -1877,9 +2056,9 @@ msgid ""
 "sections with sub-baskets representing chapters or pages;</li><li>Making a "
 "group of baskets to export together (to eg. email them to people).</li></ul>"
 msgstr ""
-"<p>Crear cestas dentro de otras cestas para formar una jerarquía le permite ser más organizado. Puede por ejemplo:</p>"
-"<ul><li>Agrupar cestas por temática;</li>"
-"<li>Agrupar cestas en carpetas para diferentes proyectos;</li> "
+"<p>Crear cestas dentro de otras cestas para formar una jerarquía le permite "
+"ser más organizado. Puede por ejemplo:</p><ul><li>Agrupar cestas por "
+"temática;</li><li>Agrupar cestas en carpetas para diferentes proyectos;</li> "
 "<li>Hacer secciones con subcestas representando capítulos o páginas;</li> "
 "<li>Hacer grupos de cestas para exportarlas juntas (por ejemplo, para "
 "enviarlas por correo electrónico).</li></ul>"
@@ -1892,7 +2071,7 @@ msgstr "Forma libre"
 msgid "Mind map"
 msgstr "Mapa mental"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Imagen)"
 
@@ -1916,6 +2095,11 @@ msgstr "Animación"
 msgid "Sound"
 msgstr "Sonido"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Ficheros"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Enlace"
@@ -1924,7 +2108,7 @@ msgstr "Enlace"
 msgid "Launcher"
 msgstr "Lanzador"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Color"
 
@@ -1972,284 +2156,294 @@ msgstr "Editar este color"
 msgid "Edit this unknown object"
 msgstr "Editar este objeto desconocido"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Apertura del texto simple..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Apertura de textos simples..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Apertura del texto simple con..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Apertura de textos simples con..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Abrir el texto simple con:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Abrir los textos simples con:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Apertura del texto..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Apertura de textos..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Apertura del texto con..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Apertura de textos con..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Abrir este texto con:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Abrir estos textos con:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Tamaño"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 por %2 píxeles"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Apertura de la imagen..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Apertura de imágenes..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Apertura de la imagen con..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Apertura de las imágenes con..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Abrir la imagen con:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Abrir las imágenes con:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Pulse para ver a tamaño completo"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Apertura de la animación..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Apertura de las animaciones..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Apertura de la animación con..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Apertura de las animaciones con..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Abrir la animación con:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Abrir las animaciones con:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Tipo"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Abrir este fichero"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Apertura del fichero..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Apertura de los ficheros..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Apertura del fichero con..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Apertura de los ficheros con..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Abrir el fichero con:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Abrir los ficheros con:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Abrir este sonido"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Apertura del sonido..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Apertura de los sonidos..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Apertura del sonido con..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Apertura de los sonidos con..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Abrir el sonido con:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Abrir los sonidos con:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Destino"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Abrir este enlace"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "El enlace no tiene ninguna URL que abrir."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Apertura del destino del enlace..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Apertura de los destinos de los enlaces..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Apertura del destino del enlace con..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Apertura de los destinos de los enlaces con..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Abrir el destino del enlace con:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Abrir los destinos de los enlaces con:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(ejecutar en una terminal)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Comentario"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Orden"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Lanzar esta aplicación"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "El lanzador no tiene ninguna orden que ejecutar."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Lanzamiento de la aplicación..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Lanzamiento de las aplicaciones..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Rojo</i>: %1, <i>Verde</i>: %2, <i>Azul</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Tono</i>: %1, <i>Saturación</i>: %2, <i>Valor</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Nombre de color CSS"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Nombre de color CSS extendido"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Es un color Web"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Ninguno"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
 "Do you want to open it with an application that understand it?"
 msgstr ""
-"Las imágenes todavía no se pueden editar aquí (la próxima versión de Basket incluirá un editor de imágenes).\n"
+"Las imágenes todavía no se pueden editar aquí (la próxima versión de Basket "
+"incluirá un editor de imágenes).\n"
 "¿Desea abrirla con una aplicación que pueda hacerlo?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Edición de la nota de imagen"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2257,91 +2451,115 @@ msgstr ""
 "Esta animación no puede ser editada aquí.\n"
 "¿Desea abrirla con una aplicación que pueda hacerlo?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Edición de la nota de animación"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Edición de la nota de color"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
 "it."
 msgstr ""
 "El tipo de esta nota es desconocido y no puede ser editado aquí.\n"
-"Sin embargo, puede arrastrar o copiar esta nota a una aplicación que sea capaz de interpretarla."
+"Sin embargo, puede arrastrar o copiar esta nota a una aplicación que sea "
+"capaz de interpretarla."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Edición de nota desconocida"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Edición de la nota de enlace"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Auto"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Icono:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Destino:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Título:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Edición de la nota de lanzador"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Elija una orden a ejecutar:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "A&divinar"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "Or&den:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Nombre:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Tipo de letra:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Tamaño"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Negrita"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Cursiva"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Subrayado"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Alinear a la izquierda"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Centrado"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Alinear a la derecha"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Justificado"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2350,8 +2568,12 @@ msgid ""
 "developer or visit the <a href=\"http://basket.kde.org/dropdb.php\">BasKet "
 "Drop Database</a>.</p>"
 msgstr ""
-"<p>%1 no soporta el tipo de datos que ha arrastrado.<br>Sin embargo, se ha creado una nota genérica, que le permitirá arrastrar o copiar los datos a una aplicación que sea capaz de interpretarlos. </p>Si desea que Basket soporte estos datos, por favor contacte con el desarrollador o visite la <a href="
-"\"http://basket.kde.org/dropdb.php\">base de datos de tipos admitidos por BasKet </a>.</p>"
+"<p>%1 no soporta el tipo de datos que ha arrastrado.<br>Sin embargo, se ha "
+"creado una nota genérica, que le permitirá arrastrar o copiar los datos a "
+"una aplicación que sea capaz de interpretarlos. </p>Si desea que Basket "
+"soporte estos datos, por favor contacte con el desarrollador o visite la <a "
+"href=\"http://basket.kde.org/dropdb.php\">base de datos de tipos admitidos "
+"por BasKet </a>.</p>"
 
 #: notefactory.cpp:449
 msgid "Unsupported MIME Type(s)"
@@ -2385,8 +2607,7 @@ msgstr "Elegir el tamaño del icono que se va a importar como imagen:"
 msgid "Load File Content into a Note"
 msgstr "Cargar el contenido de un fichero en una nota"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Protección por contraseña"
@@ -2395,135 +2616,40 @@ msgstr "Protección por contraseña"
 msgid "No private key selected."
 msgstr "No se ha seleccionado ninguna clave privada."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Cesta"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportar"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importar"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Ir"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Nota"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "E&tiquetas"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Barra de formateo de texto"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&ltro:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "Si&n protección"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "&Proteger la cesta con una contraseña"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Proteger la cesta con una &clave privada:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "A la izquierda"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "A la derecha"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "&Posición del árbol de cestas:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Encima"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Debajo"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Posición de la barra de &filtrado:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
-msgstr "&Utilizar globos para informar de los resultados de las acciones globales"
+msgstr ""
+"&Utilizar globos para informar de los resultados de las acciones globales"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "¿Qué son las acciones globales?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2531,108 +2657,128 @@ msgid ""
 "wheel over the system tray icon to change the current basket. Or use the "
 "middle mouse button on that icon to paste the current selection."
 msgstr ""
-"Puede configurar accesos rápidos globales para realizar diversas acciones sin tener que mostrar la ventana principal. Por ejemplo, puede pegar el contenido del portapapeles, tomar un color de un punto de la pantalla, etc. "
-"Puede también utilizar la rueda de desplazamiento del ratón sobre la bandeja del sistema para cambiar la cesta actual, o utilizar el botón central del ratón sobre ese icono para pegar la selección actual."
+"Puede configurar accesos rápidos globales para realizar diversas acciones "
+"sin tener que mostrar la ventana principal. Por ejemplo, puede pegar el "
+"contenido del portapapeles, tomar un color de un punto de la pantalla, etc. "
+"Puede también utilizar la rueda de desplazamiento del ratón sobre la bandeja "
+"del sistema para cambiar la cesta actual, o utilizar el botón central del "
+"ratón sobre ese icono para pegar la selección actual."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
 msgstr ""
-"Cuando lo haga, %1 muestra un pequeño mensaje en forma de globo para informarle de que la acción se ha realizado correctamente. Puede "
+"Cuando lo haga, %1 muestra un pequeño mensaje en forma de globo para "
+"informarle de que la acción se ha realizado correctamente. Puede "
 "deshabilitar dicho globo."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
 "the main window."
-msgstr "Tenga en cuenta que dichos mensajes son lo suficientemente inteligentes como para no aparecer si la ventana principal está visible. Esto se debe a que usted ya ve el resultado de sus acciones en la ventana principal."
+msgstr ""
+"Tenga en cuenta que dichos mensajes son lo suficientemente inteligentes como "
+"para no aparecer si la ventana principal está visible. Esto se debe a que "
+"usted ya ve el resultado de sus acciones en la ventana principal."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Icono de la bandeja del sistema"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "Anclar en la ban&deja del sistema"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "Mo&strar el icono de la cesta actual en la bandeja del sistema"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
-msgstr "&Ocultar la ventana principal cuando el ratón esté fuera de ella durante"
+msgstr ""
+"&Ocultar la ventana principal cuando el ratón esté fuera de ella durante"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " décimas de segundo"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
-msgstr "&Mostrar la ventana principal cuando el ratón pase por encima del icono de la bandeja del sistema durante"
+msgstr ""
+"&Mostrar la ventana principal cuando el ratón pase por encima del icono de "
+"la bandeja del sistema durante"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Ani&mar los cambios en las cestas"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "Mo&strar los consejos en las cestas"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "Notas &grandes"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
-msgstr "&Transformar las líneas que empiecen por * o - en listas en los editores de texto"
+msgstr ""
+"&Transformar las líneas que empiecen por * o - en listas en los editores de "
+"texto"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Pe&dir confirmación antes de borrar notas"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "&Exportar las etiquetas en los textos"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "¿Cuándo se aplica esto?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
-msgstr "Se aplica cuando usted copia y pega, o arrastra y suelta notas a un editor de texto."
+msgstr ""
+"Se aplica cuando usted copia y pega, o arrastra y suelta notas a un editor "
+"de texto."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
-msgstr "Si está activada, esta propiedad le permite pegar las etiquetas como equivalentes textuales."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
+msgstr ""
+"Si está activada, esta propiedad le permite pegar las etiquetas como "
+"equivalentes textuales."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
 "empty checkbox and a checked box."
 msgstr ""
 "Por ejemplo, una lista de notas con las etiquetas <b>Por hacer</b> y "
-"<b>Hecho</b> se exportan como líneas precedidas por <b>[ ]</b> o <b>[x]</b>, representando una casilla vacía y una casilla marcada."
+"<b>Hecho</b> se exportan como líneas precedidas por <b>[ ]</b> o <b>[x]</b>, "
+"representando una casilla vacía y una casilla marcada."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
-msgstr "A&grupar una nota nueva cuando se pulse a la derecha de la linea de inserción"
+msgstr ""
+"A&grupar una nota nueva cuando se pulse a la derecha de la linea de inserción"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "¿Cómo agrupar una nota nueva?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2642,187 +2788,193 @@ msgstr ""
 "permite insertar notas en la posición del cursor, sino también permite "
 "agrupar una nota nueva con la que está bajo el cursor:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
 "<br>Click on the <b>right</b> to <b>group</b> a note, with the one <b>below "
 "or above</b>, depending on where your mouse is.</p>"
 msgstr ""
-"<p>Coloque su ratón entre dos notas, donde quiera añadir una nueva."
-"<br>Pulse a la <b>izquierda</b> de la marca central sobre la línea de "
-"inserción para <b>insertar</b> una nota.<br>Pulse a la <b>derecha</b> para "
-"<b>agrupar</b> una nota con la que está <b>debajo o encima</b>, dependiendo de la posición del cursor del ratón.</p>"
+"<p>Coloque su ratón entre dos notas, donde quiera añadir una nueva.<br>Pulse "
+"a la <b>izquierda</b> de la marca central sobre la línea de inserción para "
+"<b>insertar</b> una nota.<br>Pulse a la <b>derecha</b> para <b>agrupar</b> "
+"una nota con la que está <b>debajo o encima</b>, dependiendo de la posición "
+"del cursor del ratón.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "No hacer nada"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Pegar el contenido del portapapeles"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Insertar un lanzador"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Insertar un color desde la pantalla"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Cargar una nota desde un fichero"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Importar un lanzador del menú de TDE"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importar un icono"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "Mayú&sculas + botón central en cualquier sitio:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "en la posición del cursor del ratón"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
-msgstr "Bloquear a&utomáticamente las cestas protegidas cuando estén cerradas durante"
+msgstr ""
+"Bloquear a&utomáticamente las cestas protegidas cuando estén cerradas durante"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " minutos"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
-msgstr "Usar el agente GnuPG para las cestas protegidas con clave &privada/pública"
+msgstr ""
+"Usar el agente GnuPG para las cestas protegidas con clave &privada/pública"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Lugar de las nuevas notas:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "En la nota actual"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Tamaño de las &nuevas imágenes:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "po&r"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "píxeles"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Visualizar..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Ver el contenido de los ficheros añadidos para los siguientes tipos"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "Texto sim&ple"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "Página &HTML"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Imagen o animación"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Sonido"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Grabación del sonido de una conferencia"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Informe anual"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Carpeta personal"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Lanzar %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Sonidos"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Ficheros"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Enlaces &locales"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "E&nlaces de red"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "L&anzadores"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Abrir las notas de &texto con una aplicación personalizada:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Abrir las notas de texto con:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Abrir las notas de &imagen con una aplicación personalizada:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Abrir las notas de imagen con:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Abrir las notas de a&nimación con una aplicación personalizada:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Abrir las notas de animación con:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Abrir las notas de sonido con &una aplicación personalizada:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Abrir las notas de sonido con:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
-msgstr "<p>Si se marca esta opción, se utilizará la aplicación definida abajo para abrir este tipo de notas.</p><p>Si no, se empleará la aplicación que haya configurado en Konqueror.</p>"
+msgstr ""
+"<p>Si se marca esta opción, se utilizará la aplicación definida abajo para "
+"abrir este tipo de notas.</p><p>Si no, se empleará la aplicación que haya "
+"configurado en Konqueror.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2830,41 +2982,49 @@ msgstr ""
 "<p>Defina la aplicación a utilizar para abrir este tipo de notas en vez de "
 "la aplicación configurada en Konqueror.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "¿Cómo cambiar la aplicación empleada para abrir los enlaces web?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
-msgstr ""
-"<p>Los enlaces web se abren en diferentes aplicaciones, dependiendo del tipo de contenido del enlace (una página web, una imagen, un documento PDF...), como si fueran ficheros de su equipo.</p>"
-"<p>Aquí se explica cómo conseguir que todas las direcciones web se abran en su navegador web. Es útil si no está utilizando TDE (si utiliza GNOME o XFCE, por ejemplo).</p>"
-"<ul><li>Abra el Centro de control de TDE (si no está disponible, intente escribir «kcontrol» en una terminal de línea de órdenes);</li>"
-"<li>Vaya a la sección «Componentes de TDE» y después a «Selector de componentes»;</li>"
-"<li>Elija «Navegador web», marque «en el siguiente  navegador:» e introduzca el nombre de su navegador web (como «firefox» o «epiphany»).</li></ul>"
-"<p>Ahora, cuando pulse <i>cualquier</i> enlace que empiece con «http://...», se abrirá en su navegador web (como Mozilla "
-"Firefox, o Epiphany, o...).</p>"
-"<p>Para una configuración más precisa (como abrir sólo las páginas web en su navegador web), lea el segundo enlace de ayuda.</p>"
-
-#: settings.cpp:922
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
+msgstr ""
+"<p>Los enlaces web se abren en diferentes aplicaciones, dependiendo del tipo "
+"de contenido del enlace (una página web, una imagen, un documento PDF...), "
+"como si fueran ficheros de su equipo.</p><p>Aquí se explica cómo conseguir "
+"que todas las direcciones web se abran en su navegador web. Es útil si no "
+"está utilizando TDE (si utiliza GNOME o XFCE, por ejemplo).</p><ul><li>Abra "
+"el Centro de control de TDE (si no está disponible, intente escribir "
+"«kcontrol» en una terminal de línea de órdenes);</li><li>Vaya a la sección "
+"«Componentes de TDE» y después a «Selector de componentes»;</li><li>Elija "
+"«Navegador web», marque «en el siguiente  navegador:» e introduzca el nombre "
+"de su navegador web (como «firefox» o «epiphany»).</li></ul><p>Ahora, cuando "
+"pulse <i>cualquier</i> enlace que empiece con «http://...», se abrirá en su "
+"navegador web (como Mozilla Firefox, o Epiphany, o...).</p><p>Para una "
+"configuración más precisa (como abrir sólo las páginas web en su navegador "
+"web), lea el segundo enlace de ayuda.</p>"
+
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
-msgstr "¿Cómo cambiar las aplicaciones utilizadas para abrir los ficheros y enlaces?"
+msgstr ""
+"¿Cómo cambiar las aplicaciones utilizadas para abrir los ficheros y enlaces?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2873,20 +3033,28 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
-msgstr ""
-"<p>Aquí se explica cómo definir la aplicación que se empleará para cada tipo de fichero. Esto también se aplica a los enlaces web si elige no abrirlos sistemáticamente en un navegador web (vea el primer enlace de ayuda). Las opciones predeterminadas deberían ser lo suficientemente buenas, pero este consejo es útil si utiliza GNOME, XFCE u otro entorno que no sea TDE.</p>"
-"<p>Esto es un ejemplo de cómo abrir páginas HTML en su navegador web (y seguir usando las otras aplicaciones para otras direcciones o ficheros). Repita estos pasos para cada tipo de fichero que desee abrir con una aplicación específica.</p>"
-"<ul><li>Abra el Centro de control de TDE (si no está disponible, intente escribir «kcontrol» en un terminal de línea de órdenes);</li>"
-"<li>Vaya a la sección «Componentes de TDE» y después a «Asociaciones de fichero»; </li>"
-"<li>En el árbol, expanda «texto» y pulse en «html»;</li>"
-"<li>En la lista de aplicaciones, añada su navegador web como la primera entrada de la lista; </li>"
-"<li>Haga lo mismo para el tipo «application -> xhtml+xml».</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
+msgstr ""
+"<p>Aquí se explica cómo definir la aplicación que se empleará para cada tipo "
+"de fichero. Esto también se aplica a los enlaces web si elige no abrirlos "
+"sistemáticamente en un navegador web (vea el primer enlace de ayuda). Las "
+"opciones predeterminadas deberían ser lo suficientemente buenas, pero este "
+"consejo es útil si utiliza GNOME, XFCE u otro entorno que no sea TDE.</"
+"p><p>Esto es un ejemplo de cómo abrir páginas HTML en su navegador web (y "
+"seguir usando las otras aplicaciones para otras direcciones o ficheros). "
+"Repita estos pasos para cada tipo de fichero que desee abrir con una "
+"aplicación específica.</p><ul><li>Abra el Centro de control de TDE (si no "
+"está disponible, intente escribir «kcontrol» en un terminal de línea de "
+"órdenes);</li><li>Vaya a la sección «Componentes de TDE» y después a "
+"«Asociaciones de fichero»; </li><li>En el árbol, expanda «texto» y pulse en "
+"«html»;</li><li>En la lista de aplicaciones, añada su navegador web como la "
+"primera entrada de la lista; </li><li>Haga lo mismo para el tipo "
+"«application -> xhtml+xml».</li></ul>"
 
 #: softwareimporters.cpp:45
 msgid "Import Hierarchy"
@@ -2964,8 +3132,11 @@ msgid ""
 msgstr "Desde %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
-msgstr "No se puede importar ese fichero. O está corrupto, o no es un fichero de TuxCards."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
+msgstr ""
+"No se puede importar ese fichero. O está corrupto, o no es un fichero de "
+"TuxCards."
 
 #: softwareimporters.cpp:643
 msgid "Bad File Format"
@@ -2976,9 +3147,8 @@ msgid ""
 "A note is encrypted. The importer does not yet support encrypted notes. "
 "Please remove the encryption with TuxCards and re-import the file."
 msgstr ""
-"Una nota está cifrada. El importador no soporta aún notas cifradas. "
-"Por favor, elimine el cifrado con TuxCards y vuelva a importar el "
-"fichero."
+"Una nota está cifrada. El importador no soporta aún notas cifradas. Por "
+"favor, elimine el cifrado con TuxCards y vuelva a importar el fichero."
 
 #: softwareimporters.cpp:671
 msgid "Encrypted Notes not Supported Yet"
@@ -2990,8 +3160,9 @@ msgid ""
 "encrypted notes yet. Please remove the encryption with TuxCards and re-"
 "import the file.</font>"
 msgstr ""
-"<font color='red'><b>Nota cifrada.</b><br>El importador no soporta aún notas cifradas. Por favor, elimine el cifrado con TuxCards y vuelva "
-"a importar el fichero.</font>"
+"<font color='red'><b>Nota cifrada.</b><br>El importador no soporta aún notas "
+"cifradas. Por favor, elimine el cifrado con TuxCards y vuelva a importar el "
+"fichero.</font>"
 
 #: systemtray.cpp:140
 msgid ""
@@ -3111,6 +3282,11 @@ msgstr "Importante"
 msgid "Very Important"
 msgstr "Muy importante"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animación"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Idea"
@@ -3179,6 +3355,11 @@ msgstr "Mover hacia arriba (Ctrl+Mayúsculas+Arriba)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Mover hacia abajo (Ctrl+Mayúsculas+Abajo)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Borrar"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Etiqueta"
@@ -3247,7 +3428,9 @@ msgstr "Te&xto equivalente:"
 msgid ""
 "If filled, this property lets you paste this tag or this state as textual "
 "equivalent."
-msgstr "Si la rellena, esta propiedad le permite pegar esta etiqueta o este estado como equivalente textual."
+msgstr ""
+"Si la rellena, esta propiedad le permite pegar esta etiqueta o este estado "
+"como equivalente textual."
 
 #: tagsedit.cpp:496
 msgid "On ever&y line"
@@ -3261,7 +3444,9 @@ msgstr "¿Qué significa eso?"
 msgid ""
 "When a note has several lines, you can choose to export the tag or the state "
 "on the first line or on every line of the note."
-msgstr "Cuando una nota tiene varias líneas, puede elegir exportar la etiqueta o el estado sobre la primera línea o sobre cada línea de la nota."
+msgstr ""
+"Cuando una nota tiene varias líneas, puede elegir exportar la etiqueta o el "
+"estado sobre la primera línea o sobre cada línea de la nota."
 
 #: tagsedit.cpp:504
 msgid ""
@@ -3269,10 +3454,12 @@ msgid ""
 "line, while the tag of the bottom note is exported on every line of the note."
 msgstr ""
 "En el ejemplo anterior, la etiqueta de la nota superior sólo se exporta en "
-"la primera línea, mientras que la etiqueta de la nota inferior se exporta en todas las líneas de la nota."
+"la primera línea, mientras que la etiqueta de la nota inferior se exporta en "
+"todas las líneas de la nota."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 "Eliminar la etiqueta la borrará de todas las notas a las que esté asignada "
 "actualmente."
@@ -3337,3 +3524,111 @@ msgstr ""
 "Redimensione la ventana para escoger el tamaño de la imagen\n"
 "y ciérrela o pulse Escape para aceptar los cambios."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Cesta"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportar"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importar"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Ir"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Nota"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "E&tiquetas"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra de formateo de texto"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Barra de formateo de texto"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&ltro:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Abrir"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "Si&n protección"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "&Proteger la cesta con una contraseña"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Proteger la cesta con una &clave privada:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Por favor, escriba en inglés o francés."
diff --git a/po/fr.po b/po/fr.po
index 7d5b816..c9ef8c6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,23 +9,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: basket_fr\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-02-26 23:10+0100\n"
 "Last-Translator: Yann Verley <yann.verley@free.fr>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Sébastien Laoût"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -38,8 +39,8 @@ msgid ""
 "Organizing your notes has never been so easy.</p>"
 msgstr ""
 "<p><b>Prendre soin de vos idées.</b></p><p>Une application de prises de "
-"notes qui facilite la mise à plat de vos idées comme vous pensez, et de "
-"les retrouver rapidement plus tard. Organiser vos notes n'a jamais été aussi "
+"notes qui facilite la mise à plat de vos idées comme vous pensez, et de les "
+"retrouver rapidement plus tard. Organiser vos notes n'a jamais été aussi "
 "facile.</p>"
 
 #: aboutdata.cpp:34
@@ -47,14 +48,19 @@ msgid "BasKet Note Pads"
 msgstr "Blocs notes BasKet"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Auteur, mainteneur"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Cryptage des paniers, intégration dans Kontact, importateur KnowIt"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -63,32 +69,32 @@ msgstr ""
 "copier / coller HTML, info-bulle sur le nom des paniers, déposer sur le nom "
 "des paniers"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Icône"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Enregistrer en tant qu'archive de paniers"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Enregistrer en tant qu'archive de paniers. Veuillez patienter..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Ce fichier n'est pas une archive de paniers."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Erreur d'archive de paniers"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Ce fichier est corrompu. Il ne peut pas être ouvert."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -103,7 +109,7 @@ msgstr ""
 "être judicieux de l'enregistrer dans un autre fichier, pour préserver "
 "l'original."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
@@ -111,31 +117,31 @@ msgstr ""
 "Ce fichier a été créé avec une version récente de %1. Veuillez installer une "
 "nouvelle version pour pouvoir ouvrir ce fichier."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Sauvegarder et restaurer"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Dossier d'enregistrement"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Vos paniers sont actuellement stockés dans ce dossier : <br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&Déplacer dans un autre dossier..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Utiliser un autre dossier existant..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Pourquoi faire cela ?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -148,162 +154,185 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>Vous pouvez déplacer le dossier dans lequel %1 stocke vos paniers pour :</p><ul><li>Stocker "
-"vos paniers dans endroit visible de votre dossier personnel, comme ~/Notes or ~/"
-"Paniers, afin de pouvoir les sauvegarder manuellement lorsque vous le souhaitez.</li>"
-"<li>Stocker vos paniers sur un serveur pour les partager entre deux ordinateurs.<br>Dans ce cas, "
-"montez le dossier partagé dans le système de fichier local et demandez à %2 d'utiliser ce "
-"point de montage.<br>Attention : vous ne devez pas lancer %3 en même temps sur les deux "
-"ordinateurs, ou vous risquez de perdre des données lorsque que les deux applications seront désynchronisées."
-"</li></ul><p>Veuillez noter que vous ne devez pas changer le contenu de ce dossier manuellement "
-"(par exemple, ajouter un fichier dans un dossier d'un panier n'ajoutera pas ce fichier dans ce panier).</p>"
-
-#: backup.cpp:89
+"<p>Vous pouvez déplacer le dossier dans lequel %1 stocke vos paniers pour :</"
+"p><ul><li>Stocker vos paniers dans endroit visible de votre dossier "
+"personnel, comme ~/Notes or ~/Paniers, afin de pouvoir les sauvegarder "
+"manuellement lorsque vous le souhaitez.</li><li>Stocker vos paniers sur un "
+"serveur pour les partager entre deux ordinateurs.<br>Dans ce cas, montez le "
+"dossier partagé dans le système de fichier local et demandez à %2 d'utiliser "
+"ce point de montage.<br>Attention : vous ne devez pas lancer %3 en même "
+"temps sur les deux ordinateurs, ou vous risquez de perdre des données "
+"lorsque que les deux applications seront désynchronisées.</li></"
+"ul><p>Veuillez noter que vous ne devez pas changer le contenu de ce dossier "
+"manuellement (par exemple, ajouter un fichier dans un dossier d'un panier "
+"n'ajoutera pas ce fichier dans ce panier).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Sauvegardes"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Sauvegarder..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Restaurer une sauvegarde..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Dernière sauvegarde : jamais"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Dernière sauvegarde : %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Choix d'un dossier où déplacer les paniers"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "Le dossier <b>%1</b> n'est pas vide. Voulez-vous vraiment l'écraser ?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Écraser le dossier ?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "Écras&er"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Vos paniers ont été déplacés avec succès dans <b>%1</b>. %2 va être redémarré pour prendre en compte ces changements."
+msgstr ""
+"Vos paniers ont été déplacés avec succès dans <b>%1</b>. %2 va être "
+"redémarré pour prendre en compte ces changements."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Choix d'un dossier existant où enregistrer les paniers"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
-msgstr "Votre dossier d'enregistrement a été changé avec succès pour <b>%1</b>. %2 va être redémarré pour prendre en compte ces changements."
+msgstr ""
+"Votre dossier d'enregistrement a été changé avec succès pour <b>%1</b>. %2 "
+"va être redémarré pour prendre en compte ces changements."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Paniers_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Archive Tar compactée par Gzip"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Sauvegarder les paniers"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "Un fichier <b>%1</b> existe déjà. Voulez-vous vraiment l'écraser ?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Écraser le fichier ?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Sauvegarde des paniers. Veuillez patienter..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Ouvrir une archive de paniers"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "LISEZMOI.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Ceci est une copie de sécurité de vos paniers comme ils étaient avant le démarrage de la restauration de la sauvegarde %1."
+msgstr ""
+"Ceci est une copie de sécurité de vos paniers comme ils étaient avant le "
+"démarrage de la restauration de la sauvegarde %1."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
-msgstr "Si la restauration a été un succès et que vous avez restauré ce que vous vouliez restaurer, vous pouvez supprimer ce dossier."
+msgstr ""
+"Si la restauration a été un succès et que vous avez restauré ce que vous "
+"vouliez restaurer, vous pouvez supprimer ce dossier."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Si quelque chose s'est mal passé durant le processus de restauration, vous pouvez réutiliser ce dossier pour enregistrer vos paniers et rien ne sera perdu."
+msgstr ""
+"Si quelque chose s'est mal passé durant le processus de restauration, vous "
+"pouvez réutiliser ce dossier pour enregistrer vos paniers et rien ne sera "
+"perdu."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Choisissez \"Panier\" -> \"Sauvegarder et restaurer...\" -> \"Utiliser un autre dossier existant...\" et sélectionnez ce dossier."
+msgstr ""
+"Choisissez \"Panier\" -> \"Sauvegarder et restaurer...\" -> \"Utiliser un "
+"autre dossier existant...\" et sélectionnez ce dossier."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Restauration de <b>%1</b>. Veuillez patienter..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr "Si quelque chose se passe mal durant la restauration, lisez le fichier <b>%1</b>."
+msgstr ""
+"Si quelque chose se passe mal durant la restauration, lisez le fichier <b>"
+"%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Restaurer les paniers"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
-msgstr "Soit cette archive n'est pas une sauvegarde de paniers, soit elle est corrompue. Elle ne peut pas être importée. Vos anciens paniers ont été préservés à la place."
+msgstr ""
+"Soit cette archive n'est pas une sauvegarde de paniers, soit elle est "
+"corrompue. Elle ne peut pas être importée. Vos anciens paniers ont été "
+"préservés à la place."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Erreur de restauration"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Votre sauvegarde a été restaurée avec succès dans <b>%1</b>. %2 va être redémarré pour prendre en compte ces changements."
+msgstr ""
+"Votre sauvegarde a été restaurée avec succès dans <b>%1</b>. %2 va être "
+"redémarré pour prendre en compte ces changements."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -321,39 +350,40 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Paniers avant restauration (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "La nouvelle note ne correspond pas au filtre et est cachée."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Une nouvelle note ne correspond pas au filtre et est cachée."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
-msgstr "Certaines nouvelles notes ne correspondent pas au filtre et sont cachées."
+msgstr ""
+"Certaines nouvelles notes ne correspondent pas au filtre et sont cachées."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "Les nouvelles notes ne correspondent pas au filtre et sont cachées."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Grouper"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Insérer"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Déposé dans le panier <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -361,7 +391,7 @@ msgstr ""
 "Ce message ne devrait jamais apparaître. Si c'est le cas, cette application "
 "est boguée ! Merci de rapporter ce bogue au développeur."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -369,48 +399,48 @@ msgstr ""
 "Insérer une note ici\n"
 "Clic droit pour plus d'options"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Redimensionner ces colonnes"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Redimensionner ce groupe"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Redimensionner cette note"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Sélectionner ou déplacer cette note"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Sélectionner ou déplacer ce groupe"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Attribuer ou retirer des marques de cette note"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Marques attribuées</b> : %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Développer ce groupe"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Replier ce groupe"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -418,7 +448,7 @@ msgstr ""
 "Regrouper une note avec celle en dessous\n"
 "Clic droit pour plus d'options"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -426,46 +456,46 @@ msgstr ""
 "Regrouper une note avec celle au-dessus\n"
 "Clic droit pour plus d'options"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Ajouté"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Dernière modification"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b> : %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Cliquez sur la droite pour grouper au lieu d'insérer"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Cliquez sur la gauche pour insérer au lieu de grouper"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Déverrouiller"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Panier protégé par mot de passe."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Cliquez Déverrouiller pour le consulter."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "La cryptographie n'est pas supportée par<br>cette version de %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -473,27 +503,32 @@ msgstr ""
 "<small>Pour que les paniers restent déverrouillés, changez le temps<br>de "
 "verrouillage automatique dans les options de l'application.</small>"
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Tout supprimer"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Personnaliser..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtrer cette marque"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtrer cet &état"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Marques"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -502,7 +537,7 @@ msgstr ""
 "<qt>Voulez-vous réellement supprimer cette note ?</qt>\n"
 "<qt>Voulez-vous réellement supprimer ces <b>%n</b> notes ?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -510,7 +545,7 @@ msgstr ""
 "Supprimer une note\n"
 "Supprimer des notes"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -518,7 +553,7 @@ msgstr ""
 "Note copiée dans le presse-papiers.\n"
 "Notes copiées dans le presse-papiers."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -526,7 +561,7 @@ msgstr ""
 "Note coupée dans le presse-papiers.\n"
 "Notes coupées dans le presse-papiers."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -534,39 +569,44 @@ msgstr ""
 "Note copiée dans la sélection.\n"
 "Notes copiées dans la sélection."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Impossible d'ouvrir cette note."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Vous n'êtes pas autorisé à ouvrir ce fichier."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Enregistrer dans un fichier"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Veuillez saisir le mot de passe pour la clef privée suivante :"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Veuillez saisir le mot de passe pour le panier <i>%1</i> :"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Veuillez assigner un mot de passe au panier <i>%1</i> :"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Espace disque insuffisant pour enregistrer le panier"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Mauvaises permissions sur les fichiers du panier"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -574,7 +614,7 @@ msgstr ""
 "Veuillez supprimer des fichiers sur le disque <b>%1</b> afin de permettre à "
 "l'application de sauvegarder vos changements en toute sécurité."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -583,10 +623,38 @@ msgstr ""
 "vous avez les droits en écriture sur celui-ci, ainsi que sur les dossiers "
 "parents."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Erreur d'enregistrement"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Montrer / cacher la fenêtre principale"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"Montrer la &fenêtre principale lorsque la souris survole l'icône de "
+"notification pendant"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Ouvrir une archive de paniers"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Désolé, mais la création d'un dossier pour ce nouveau panier a échoué."
@@ -601,7 +669,8 @@ msgstr "Désolé, mais la copie du modèle pour ce nouveau panier a échoué."
 
 #: basketfactory.cpp:111
 msgid "Sorry, but the template customization for this new basket has failed."
-msgstr "Désolé, mais la personnalisation du modèle pour ce nouveau panier a échoué."
+msgstr ""
+"Désolé, mais la personnalisation du modèle pour ce nouveau panier a échoué."
 
 #: basketlistview.cpp:338
 msgid "%1+%2+"
@@ -619,10 +688,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Propriétés du panier"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Nom"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Image d'arrière-plan :"
@@ -711,25 +784,28 @@ msgstr "Indique s'il y a des changements qui n'ont pas encore été sauvegardés
 
 #: basketstatusbar.cpp:128
 msgid "Ctrl+drop: copy, Shift+drop: move, Shift+Ctrl+drop: link."
-msgstr "Ctrl+déposer : copier, Maj+déposer : déplacer, Maj+Ctrl+déposer : lier."
+msgstr ""
+"Ctrl+déposer : copier, Maj+déposer : déplacer, Maj+Ctrl+déposer : lier."
 
 #: basketstatusbar.cpp:148
 msgid "<p>This basket is <b>locked</b>.<br>Click to unlock it.</p>"
-msgstr "<p>Ce panier est <b>verrouillé</b>.<br>Cliquez pour le déverrouiller.</p>"
+msgstr ""
+"<p>Ce panier est <b>verrouillé</b>.<br>Cliquez pour le déverrouiller.</p>"
 
 #: basketstatusbar.cpp:153
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
-msgstr "<p>Ce panier est <b>déverrouillé</b>.<br>Cliquez pour le verrouiller.</p>"
+msgstr ""
+"<p>Ce panier est <b>déverrouillé</b>.<br>Cliquez pour le verrouiller.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Général"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Montrer / cacher la fenêtre principale"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
@@ -737,11 +813,11 @@ msgstr ""
 "Vous permet de montrer la fenêtre principale si elle était cachée, et de la "
 "cacher si elle était affichée."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Coller le contenu du presse-papiers dans le panier courant"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
@@ -749,21 +825,21 @@ msgstr ""
 "Vous permet de coller le contenu du presse-papiers dans le panier courant "
 "sans avoir à ouvrir la fenêtre principale."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Montrer le nom du panier courant"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr ""
 "Vous permet de connaître quel est le panier courant sans ouvrir la fenêtre "
 "principale."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Coller la sélection dans le panier courant"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
@@ -771,11 +847,11 @@ msgstr ""
 "Vous permet de coller la sélection dans le panier courant sans avoir à "
 "ouvrir la fenêtre principale."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Crée un nouveau panier"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -786,11 +862,11 @@ msgstr ""
 "pour ajouter un objet, coller le contenu du presse-papiers ou coller la "
 "sélection dans le panier courant)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Aller au panier précédent"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
@@ -798,11 +874,11 @@ msgstr ""
 "Vous permet de changer le panier courant pour le précédent sans avoir à "
 "ouvrir la fenêtre principale."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Aller au panier suivant"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -810,19 +886,21 @@ msgstr ""
 "Vous permet de changer le panier courant pour le suivant sans avoir à ouvrir "
 "la fenêtre principale."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Insérer une note texte"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
-msgstr "Ajouter un texte au panier courant sans avoir à ouvrir la fenêtre principale."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
+msgstr ""
+"Ajouter un texte au panier courant sans avoir à ouvrir la fenêtre principale."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Insérer une note image"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
@@ -830,19 +908,21 @@ msgstr ""
 "Ajouter une image au panier courant sans avoir à ouvrir la fenêtre "
 "principale."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Insérer une note lien"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Ajouter un lien au panier courant sans avoir à ouvrir la fenêtre principale."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Ajouter un lien au panier courant sans avoir à ouvrir la fenêtre principale."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Insérer une note couleur"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
@@ -850,11 +930,11 @@ msgstr ""
 "Ajouter une couleur au panier courant sans avoir à ouvrir la fenêtre "
 "principale."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Puiser une couleur sur l'écran"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -862,11 +942,11 @@ msgstr ""
 "Ajouter une couleur puisée sur un pixel à l'écran dans le panier courant "
 "sans avoir à ouvrir la fenêtre principale."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Capturer une zone de l'écran"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -874,15 +954,11 @@ msgstr ""
 "Capturer une zone de l'écran en tant qu'image dans le panier courant sans "
 "avoir à ouvrir la fenêtre principale."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Paniers"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Veuillez écrire en anglais ou en français."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -895,243 +971,249 @@ msgstr ""
 "d'autres. Vous pouvez naviguer entre eux en cliquant sur un panier pour "
 "l'ouvrir, ou les réorganiser en utilisant le glisser / déposer."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Archive de paniers..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Cacher la fenêtre"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "&Page Web HTML..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "&Fichier texte..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Sauvegarder et restaurer..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "Suppri&mer"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Sélectionner toutes les notes"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Tout &désélectionner"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Désélectionne toutes les notes sélectionnées"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "In&verser la sélection"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Inverse la sélection des notes"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Éditer..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Ouvrir"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Ouvrir &avec..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Enregistrer dans un fichier..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Grouper"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "Dég&rouper"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Déplacer en &haut"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Déplacer au-&dessus"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Déplacer en desso&us"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Déplacer en &bas"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Texte"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "&Lien"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Image"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Couleur"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "L&anceur"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importer un lanceur depuis le menu &TDE..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&porter une icône..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Charger depuis un &fichier..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "C&ouleur sur l'écran"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Capturer une &zone de l'écran"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Nouveau panier..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Nouveau &sous-panier..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Nouveau panier &voisin..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Nouveau"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Propriétés du panier"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "S&upprimer"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "&Mot de passe..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "&Verrouiller"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtrer"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtrer tous les &paniers"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "Vider le filt&re"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Panier précédent"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "Panier &suivant"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Replier ce panier"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Développer ce panier"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Configurer les raccourcis clavier &globaux..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "Paniers de &bienvenue"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Conversion des notes au format texte brut"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
-msgstr "Conversion des notes au format texte brut en notes au format texte enrichi..."
+msgstr ""
+"Conversion des notes au format texte brut en notes au format texte enrichi..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Pas de note"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1140,7 +1222,7 @@ msgstr ""
 "%n note\n"
 "%n notes"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1149,15 +1231,15 @@ msgstr ""
 "%n sélectionnée\n"
 "%n sélectionnées"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "toutes correspondent"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "pas de filtre"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1166,29 +1248,31 @@ msgstr ""
 "%n correspondance\n"
 "%n correspondances"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Une couleur puisée dans le panier <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
-msgstr "Les notes au format texte brut ont été converties en notes au format texte enrichi."
+msgstr ""
+"Les notes au format texte brut ont été converties en notes au format texte "
+"enrichi."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Conversion terminée"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Il n'y a pas de notes au format texte brut à convertir."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1207,45 +1291,46 @@ msgstr ""
 "l'application est bien installée mais que vous aviez une version précédente, "
 "essayez de supprimer le fichier %5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Ressource non trouvée"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Impossible d'ajouter une note."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Une zone de l'écran capturée dans le panier <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Supprimer le panier"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Supprimer seulement ce panier"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Supprimer la note avec ses fils"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr ""
 "<qt>Voulez-vous réellement supprimer le panier <b>%1</b> et son contenu ?</"
 "qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Supprimer le panier"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Supprimer le panier"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
@@ -1253,43 +1338,43 @@ msgstr ""
 "<qt><b>%1</b> a les paniers fils suivants.<br>Voulez-vous les supprimer "
 "aussi ?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Supprimer les paniers fils"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "&Supprimer les paniers fils"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Archives de paniers"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Contenu du presse-papiers collé dans le panier <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Sélection collée dans le panier <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Aucune note n'a été ajoutée."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Le panier <i>%1</i> est verrouillé"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Verrouillé)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Attribuer une nouvelle marque..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Tout supprimer"
 
@@ -1382,11 +1467,11 @@ msgstr "Marqu&e : "
 msgid "Filter all Baskets"
 msgstr "Filtrer tous les paniers"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Non marqué)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Marqué)"
 
@@ -1411,8 +1496,8 @@ msgid ""
 "modify the other anymore as they are now separate entities.</p>"
 msgstr ""
 "<p>Le reflet de dossier n'est plus possible (voyez <a href='http://basket."
-"kde.org/'>basket.kde.org</a> pour plus d'informations).</p><p>Le dossier <b>%"
-"1</b> a été copié pour les besoins du panier. Vous pouvez soit supprimer ce "
+"kde.org/'>basket.kde.org</a> pour plus d'informations).</p><p>Le dossier <b>"
+"%1</b> a été copié pour les besoins du panier. Vous pouvez soit supprimer ce "
 "dossier ou le panier, ou utiliser les deux. Mais souvenez-vous qu'en "
 "modifiant l'un des deux, l'autre ne sera plus modifié car ils sont "
 "maintenant deux entités séparées.</p>"
@@ -1465,7 +1550,9 @@ msgstr "données"
 
 #: htmlexporter.cpp:319
 msgid "Made with %1, a TDE tool to take notes and keep information at hand."
-msgstr "Fait avec %1, un outil TDE pour prendre des notes et garder ses informations sous la main."
+msgstr ""
+"Fait avec %1, un outil TDE pour prendre des notes et garder ses informations "
+"sous la main."
 
 #: kcolorcombo2.cpp:126 kcolorcombo2.cpp:602 kcolorcombo2.cpp:624
 #: tagsedit.cpp:470 variouswidgets.cpp:269
@@ -1476,35 +1563,35 @@ msgstr "(Par défaut)"
 msgid "Other..."
 msgstr "Autre..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Liste des clefs publiques"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "E-mail"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Choisissez une clef secrète :"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "La liste des clefs privées est incomplète."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Cette clef publique n'est pas destinée pour le cryptage"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Algorithme non supporté"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
@@ -1544,23 +1631,32 @@ msgstr "Système de fichiers"
 msgid "File Types"
 msgstr "Types de fichiers"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Fichiers d'icônes (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Ouvrir"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr ""
 "Envoyer un commentaire aux développeurs de l'application à propos de quelque "
 "chose que vous aimez."
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 "Envoyer un commentaire aux développeurs de l'application à propos de quelque "
 "chose que vous n'aimez pas."
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
@@ -1568,31 +1664,31 @@ msgstr ""
 "Envoyer un commentaire aux développeurs de l'application à propos d'un "
 "mauvais comportement de l'application."
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 "Envoyer un commentaire aux développeurs de l'application à propos d'une "
 "nouvelle fonctionnalité que vous désirez."
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "&Envoyer un commentaire aux développeurs"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Bienvenue dans cette version de test de %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Bienvenue dans %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Pour nous aider à l'améliorer, vos remarques sont importantes."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1600,19 +1696,19 @@ msgid ""
 msgstr ""
 "Chaque fois que vous appréciez quelque chose ou que vous êtes frustré par "
 "l'application, merci de cliquez sur l'émoticône appropriée sous la barre de "
-"titre de la fenêtre, décrivez rapidement ce que vous aimez ou pas et cliquez sur "
-"Envoyer."
+"titre de la fenêtre, décrivez rapidement ce que vous aimez ou pas et cliquez "
+"sur Envoyer."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
 msgstr ""
-"Chaque fois que vous appréciez quelque chose, merci de cliquez sur l'émoticône "
-"appropriée sous la barre de titre de la fenêtre, décrivez rapidement ce que "
-"vous aimez et cliquez sur Envoyer."
+"Chaque fois que vous appréciez quelque chose, merci de cliquez sur "
+"l'émoticône appropriée sous la barre de titre de la fenêtre, décrivez "
+"rapidement ce que vous aimez et cliquez sur Envoyer."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1621,7 +1717,7 @@ msgstr ""
 "l'émoticône appropriée sous la barre de titre de la fenêtre, décrivez "
 "rapidement ce que vous n'aimez pas et cliquez sur Envoyer."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1631,17 +1727,17 @@ msgstr ""
 "simplement sur l'icône d'objet cassé en haut à droite de la fenêtre, "
 "décrivez-le et cliquez sur Envoyer."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
 "and click Send."
 msgstr ""
-"Chaque fois que vous découvrez un bogue dans l'application, merci de cliquez sur "
-"l'objet cassé sous la barre de titre de la fenêtre, décrivez-le rapidement et "
-"cliquez sur Envoyer."
+"Chaque fois que vous découvrez un bogue dans l'application, merci de cliquez "
+"sur l'objet cassé sous la barre de titre de la fenêtre, décrivez-le "
+"rapidement et cliquez sur Envoyer."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1649,17 +1745,18 @@ msgstr ""
 "Exemple :\n"
 "Exemples :"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>J'aime</b> les nouvelles images. Très rafraîchissant."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
-"<b>Je n'aime pas</b> la page de bienvenue de cet assistant. Elle fait perdre trop "
-"de temps."
+"<b>Je n'aime pas</b> la page de bienvenue de cet assistant. Elle fait perdre "
+"trop de temps."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1667,25 +1764,25 @@ msgstr ""
 "<b>L'application a un mauvais comportement</b> en cliquant sur le bouton "
 "Ajouter. Rien ne se passe."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 "<b>Je désire une nouvelle fonctionnalité</b> me permettant d'envoyer mon "
 "travail par e-mail."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Aider à l'amélioration de cette application"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Adresse e-mail"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Veuillez saisir votre adresse e-mail."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1696,7 +1793,7 @@ msgstr ""
 "reproduire les bogues que vous reportez, vous envoyer des corrections de "
 "bogue pour que vous les testiez, etc."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1704,59 +1801,59 @@ msgstr ""
 "L'adresse e-mail est optionnelle. Si vous n'en fournissez pas, vos "
 "commentaires seront envoyés anonymement."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Envoyer un commentaire aux développeurs"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Envoyer un commentaire aux développeurs de l'application à propos de :"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Quelque chose que vous ai&mez"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Quelque chose que vous n'aimez &pas"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Un ma&uvais comportement de l'application"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Une &nouvelle fonctionnalité que vous désirez"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr ""
 "Afficher les &boutons de commentaire en dessous des barres de titre des "
 "fenêtres"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Envoyer le commentaire"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "Adresse &e-mail..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Veuillez décrire brièvement votre opinion sur %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Veuillez écrire en anglais."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
-msgstr "Vous pouvez utiliser un <a href=\"%1\">outil de traduction en ligne</a>."
+msgstr ""
+"Vous pouvez utiliser un <a href=\"%1\">outil de traduction en ligne</a>."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1765,23 +1862,23 @@ msgstr ""
 "de cette application, essayez d'envoyer la même quantité de commentaires "
 "positifs et négatifs."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 "Ne demandez <b>pas</b> de nouvelles fonctionnalités : vos requêtes seront "
 "ignorées."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Une erreur s'est produite lors de l'envoi du rapport.</p><p>Merci de "
 "réessayer plus tard.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Erreur de transmission"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1789,7 +1886,7 @@ msgstr ""
 "<p>Votre commentaire a été envoyé avec succès. Il permettra d'aider à "
 "améliorer cette application.</p><p>Merci pour votre temps.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Commentaire envoyé"
 
@@ -1872,37 +1969,37 @@ msgid ""
 "the \"View Content of Added Files for the Following Types\" group.</p>"
 msgstr ""
 "<p>Ceci est normal car il y a plusieurs types de notes.<br>Cette option "
-"s'applique seulement aux notes fichiers et liens locaux.<br>Et les images que "
-"vous voyez sont des notes images, pas des notes fichiers.<br>Les notes "
+"s'applique seulement aux notes fichiers et liens locaux.<br>Et les images "
+"que vous voyez sont des notes images, pas des notes fichiers.<br>Les notes "
 "fichiers sont des documents génériques, tandis que les notes images sont des "
 "images sur lesquelles vous pouvez dessiner.</p><p>Lorsque vous déposez des "
 "fichiers dans des paniers, %1 détecte leur type et vous montre le contenu de "
 "ces fichiers.<br>Par exemple, lorsque vous déposez des fichiers images ou "
 "textes, des notes images ou textes sont créés pour ceux-ci.<br> Pour les "
-"types de fichiers que %2 ne comprend pas, ils sont montrés en tant que "
-"notes fichiers génériques avec juste une icône ou un aperçu et un nom de "
-"fichier.</p><p>Si vous ne voulez pas que l'application crée des notes en "
-"fonction du contenu des fichiers que vous déposez, ouvrez la page \"Général"
-"\" et décochez \"Image ou animation\" dans le groupe \"Voir le contenu des "
+"types de fichiers que %2 ne comprend pas, ils sont montrés en tant que notes "
+"fichiers génériques avec juste une icône ou un aperçu et un nom de fichier.</"
+"p><p>Si vous ne voulez pas que l'application crée des notes en fonction du "
+"contenu des fichiers que vous déposez, ouvrez la page \"Général\" et "
+"décochez \"Image ou animation\" dans le groupe \"Voir le contenu des "
 "fichiers ajoutés pour les types suivants\".</p>"
 
 #: linklabel.cpp:623
 msgid "Example"
 msgstr "Exemple"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Réduire"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Panier"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Voulez-vous réellement quitter %1 ?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1913,7 +2010,7 @@ msgstr ""
 "s'exécute encore, l'application sera redémarrée la prochaine fois que vous "
 "démarrerez votre session.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Confirmer pour quitter"
 
@@ -1985,7 +2082,7 @@ msgstr "Libre"
 msgid "Mind map"
 msgstr "Carte mentale"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Image)"
 
@@ -2009,6 +2106,11 @@ msgstr "Animation"
 msgid "Sound"
 msgstr "Son"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Fichiers"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Lien"
@@ -2017,7 +2119,7 @@ msgstr "Lien"
 msgid "Launcher"
 msgstr "Lanceur"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Couleur"
 
@@ -2065,271 +2167,280 @@ msgstr "Éditer cette couleur"
 msgid "Edit this unknown object"
 msgstr "Éditer cet objet inconnu"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Ouverture du texte brut..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Ouverture des textes bruts..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Ouverture du texte brut avec..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Ouverture des textes bruts avec..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Ouvrir le texte brut avec :"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Ouvrir les textes bruts avec :"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Ouverture du texte..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Ouverture des textes..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Ouverture du texte avec..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Ouverture des textes avec..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Ouvrir ce texte avec :"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Ouvrir ces textes avec :"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Taille"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 par %2 pixels"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Ouverture de l'image..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Ouverture des images..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Ouverture de l'image avec..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Ouverture des images avec..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Ouvrir l'image avec :"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Ouvrir les images avec :"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Cliquez pour voir en taille réelle"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Ouverture de l'animation..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Ouverture des animations..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Ouverture de l'animation avec..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Ouverture des animations avec..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Ouvrir l'animation avec :"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Ouvrir les animations avec :"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Type"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Ouvrir ce fichier"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Ouverture du fichier..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Ouverture des fichiers..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Ouverture du fichier avec..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Ouverture des fichiers avec..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Ouvrir le fichier avec :"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Ouvrir les fichiers avec :"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Ouvrir ce son"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Ouverture du son..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Ouverture des sons..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Ouverture du son avec..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Ouverture des sons avec..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Ouvrir le son avec :"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Ouvrir les sons avec :"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Cible"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Ouvrir ce lien"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Le lien n'a pas d'URL à ouvrir."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Ouverture de la cible du lien..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Ouverture de la cible des liens..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Ouverture de la cible du lien avec..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Ouverture de la cible des liens avec..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Ouvrir la cible du lien avec :"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Ouvrir de la cible des liens avec :"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(exécuter dans un terminal)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Commentaire"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Commande"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Lancer cette application"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Le lanceur n'a pas de commande à exécuter."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Lancement de l'application..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Lancement des applications..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RVB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Rouge</i> : %1, <i>Vert</i> : %2, <i>Bleu</i> : %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "TSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Teinte</i> : %1, <i>Saturation</i> : %2, <i>Valeur</i> : %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Nom de couleur CSS"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Nom de couleur CSS étendu"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Est une couleur Web"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Aucun"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2339,11 +2450,11 @@ msgstr ""
 "Blocs notes BasKet inclura un éditeur d'image).\n"
 "Voulez-vous ouvrir une application qui comprend cet objet ?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Édition de la note image"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2351,15 +2462,15 @@ msgstr ""
 "Les images animées ne peuvent pas être éditées ici.\n"
 "Voulez-vous ouvrir une application qui comprend cet objet ?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Édition de la note animation"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Édition de la note couleur"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2369,74 +2480,97 @@ msgstr ""
 "Vous pouvez par contre glisser ou copier cette note dans une application qui "
 "la comprend."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Édition de la note inconnue"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Édition de la note lien"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Auto"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Icône :"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Cible :"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Titre :"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Édition de la note lanceur"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Choisissez une commande à exécuter :"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Deviner"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "&Commande :"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Nom :"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Police :"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Taille"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Gras"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "I&talique"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Souligné"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Aligner à gauche"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Centrer"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Aligner à droite"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Justifier"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2484,8 +2618,7 @@ msgstr "Choisissez la taille de l'icône à importer en tant qu'image :"
 msgid "Load File Content into a Note"
 msgstr "Charger le contenu d'un fichier dans une note"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Protection par mot de passe"
@@ -2494,135 +2627,39 @@ msgstr "Protection par mot de passe"
 msgid "No private key selected."
 msgstr "Aucune clef privée sélectionnée."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Panier"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Exporter"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importer"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "A&ller"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Note"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Marques"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Mise en forme de texte"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "&Filtre :"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Pas de protection"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Protéger par &mot de passe"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+M"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Protéger par &clef privée :"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+C"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "À gauche"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "À droite"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "&Position de l'arborescence des paniers :"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "En haut"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "En bas"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Position de la &barre de filtrage :"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "&Utiliser des bulles pour rapporter le résultat des actions globales"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Que sont les actions globales ?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2633,12 +2670,11 @@ msgstr ""
 "Vous pouvez configurer des raccourcis claviers globaux pour faire quelques "
 "actions sans avoir à afficher la fenêtre principale. Par exemple, vous "
 "pouvez coller le contenu du presse-papiers, récupérer une couleur sur "
-"l'écran, etc. Vous pouvez aussi utiliser la molette de la souris sur "
-"l'icône de notification pour changer le panier courant ; ou utiliser le "
-"bouton du milieu de la souris sur cette icône pour coller la sélection "
-"courante."
+"l'écran, etc. Vous pouvez aussi utiliser la molette de la souris sur l'icône "
+"de notification pour changer le panier courant ; ou utiliser le bouton du "
+"milieu de la souris sur cette icône pour coller la sélection courante."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2646,7 +2682,7 @@ msgstr ""
 "En faisant cela, %1 affiche une petite bulle pour vous informer que l'action "
 "s'est bien déroulée. Vous pouvez désactiver cette bulle."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2656,67 +2692,67 @@ msgstr ""
 "fenêtre principale est visible. C'est parce que vous voyez déjà le résultat "
 "de vos actions dans la fenêtre principale."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Icône de notification"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "&Incruster dans la boîte à miniatures"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "&Montrer l'icône du panier courant dans l'icône de notification"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "&Cacher la fenêtre principale quand la souris sort pendant"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " dixièmes de secondes"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr ""
 "Montrer la &fenêtre principale lorsque la souris survole l'icône de "
 "notification pendant"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Ani&mer les changements dans les paniers"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "Montr&er les info-bulles dans les paniers"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "&Grosses notes"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Comportement"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr ""
 "&Transformer les lignes commençant par * ou - en des listes dans les "
 "éditeurs de texte"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "&Demander confirmation avant de supprimer des notes"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "E&xporter les marques dans les textes"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Quand cela s'applique-t-il ?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2724,13 +2760,14 @@ msgstr ""
 "Cela s'applique lorsque vous copiez / collez, ou glissez / déposez des notes "
 "dans un éditeur de texte."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "Si cette propriété est activée, elle vous permet de coller les marques en "
 "tant qu'équivalents texte."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2740,15 +2777,16 @@ msgstr ""
 "b> est exportée en tant que lignes précédées de <b>[ ]</b> ou <b>[x]</b>, "
 "représentant des boîtes à cocher."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
-msgstr "&Grouper une nouvelle note en cliquant sur la droite de la ligne d'insertion"
+msgstr ""
+"&Grouper une nouvelle note en cliquant sur la droite de la ligne d'insertion"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Comment grouper une nouvelle note ?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2759,7 +2797,7 @@ msgstr ""
 "mais elle vous permet aussi de grouper une nouvelle note avec celle sous le "
 "curseur de la souris :</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2772,168 +2810,169 @@ msgstr ""
 "sur la <b>droite</b> pour <b>grouper</b> une note, avec celle <b>du dessus "
 "ou du dessous</b>, en fonction de la position du curseur de la souris.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Coller le presse-papiers"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Insérer un lanceur"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Puiser une couleur sur l'écran"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Charger une note depuis un fichier"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Importer un lanceur depuis le menu TDE"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importer une icône"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Maj+clic-milieu n'importe où :"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "à la position du curseur de la souris"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "&Verrouiller automatiquement les paniers fermés pendant"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " minutes"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
-msgstr "Utiliser l'agent GnuPG pour les paniers prot&égés par clef privée / publique"
+msgstr ""
+"Utiliser l'agent GnuPG pour les paniers prot&égés par clef privée / publique"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Place des nouvelles notes :"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "À la note courante"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Taille des &nouvelles images :"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "pa&r"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pixels"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Visualiser..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Voir le contenu des fichiers ajoutés pour les types suivants"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "&Texte brut"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&Page HTML"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "Image ou &animation"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Son"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Enregistrement audio de la conférence"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Rapport annuel"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Dossier personnel"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Lancer %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Sons"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Fichiers"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Liens locau&x"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "Lie&ns réseaux"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "L&anceurs"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Ouvrir les notes &textes avec une application personnalisée :"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Ouvrir les notes textes avec :"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Ouvrir les notes &images avec une application personnalisée :"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Ouvrir les notes images avec :"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Ouvrir les notes &animations avec une application personnalisée :"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Ouvrir les notes animations avec :"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Ouvrir les notes &sons avec une application personnalisée :"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Ouvrir les notes sons avec :"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2943,7 +2982,7 @@ msgstr ""
 "type de note.</p><p>Sinon, l'application configurée dans Konqueror sera "
 "utilisée.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2951,26 +2990,27 @@ msgstr ""
 "<p>Définir l'application à utiliser pour ouvrir ce type de note au lieu de "
 "celle configurée dans Konqueror.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Comment changer l'application utilisée pour ouvrir les liens Web ?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Lorsque vous ouvrez des liens Web, ils sont ouverts dans différentes "
 "applications, en fonction du contenu du lien (une page Web, une image, un "
@@ -2978,24 +3018,24 @@ msgstr ""
 "p><p>Voici comment faire si vous voulez que toutes les adresses Web soient "
 "ouvertes dans votre navigateur Web. C'est utile si vous n'utilisez pas TDE "
 "(si vous utilisez GNOME ou XFCE, par exemple...).</p><ul><li>Ouvrez le "
-"centre de configuration de TDE (si ce n'est pas disponible, essayez de saisir "
-"\"kcontrol\" dans un terminal) ;</li><li>Allez dans la section \"Composants "
-"de TDE\" puis \"Sélecteur de composants\" ;</li><li>Choisissez \"Navigateur "
-"Web\", cochez \"dans le navigateur suivant :\" et entrez le nom de votre "
-"navigateur Web (comme \"firefox\" ou \"epiphany\").</li></ul><p>Maintenant, "
-"lorsque vous cliquerez sur <i>n'importe quel</i> lien qui commence par "
-"\"http://...\", il sera ouvert dans votre navigateur Web (comme Mozilla "
-"Firefox ou Epiphany, ou...).</p><p>Pour une configuration mieux dosée (comme "
-"ouvrir uniquement les pages Web dans votre navigateur Web), lisez le second "
-"lien d'aide.</p>"
-
-#: settings.cpp:922
+"centre de configuration de TDE (si ce n'est pas disponible, essayez de "
+"saisir \"kcontrol\" dans un terminal) ;</li><li>Allez dans la section "
+"\"Composants de TDE\" puis \"Sélecteur de composants\" ;</li><li>Choisissez "
+"\"Navigateur Web\", cochez \"dans le navigateur suivant :\" et entrez le nom "
+"de votre navigateur Web (comme \"firefox\" ou \"epiphany\").</li></"
+"ul><p>Maintenant, lorsque vous cliquerez sur <i>n'importe quel</i> lien qui "
+"commence par \"http://...\", il sera ouvert dans votre navigateur Web (comme "
+"Mozilla Firefox ou Epiphany, ou...).</p><p>Pour une configuration mieux "
+"dosée (comme ouvrir uniquement les pages Web dans votre navigateur Web), "
+"lisez le second lien d'aide.</p>"
+
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr ""
 "Comment changer les applications utilisées pour ouvrir les fichiers et les "
 "liens ?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -3004,12 +3044,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Voici comment définir l'application à utiliser pour chaque type de "
 "fichier. Cela s'applique aussi aux liens Web si vous choisissez de ne pas "
@@ -3018,15 +3058,15 @@ msgstr ""
 "cette astuce est utile si vous utilisez GNOME, XFCE, ou un autre "
 "environnement que TDE.</p><p>Ceci est un exemple montrant comment ouvrir une "
 "adresse de page HTML dans votre navigateur Web (et continuer d'utiliser les "
-"autres applications pour les autres adresses ou fichiers). Répétez ces étapes "
-"pour chaque type de fichier que vous voulez ouvrir dans une application "
-"spécifique.</p><ul><li>Ouvrez le centre de configuration de TDE (si ce n'est "
-"pas disponible, essayez de taper \"kcontrol\" dans un terminal) ;</"
-"li><li>Allez dans la section \"Composants de TDE\" puis \"Associations de "
-"fichiers\" ;</li><li>Dans l'arbre, développez \"text\" et cliquez \"html\" ;"
-"</li><li>Dans la liste des applications, ajoutez votre navigateur Web en "
-"tant que première entrée ;</li><li>Faites la même chose pour le type "
-"\"application -> xhtml+xml\".</li></ul>"
+"autres applications pour les autres adresses ou fichiers). Répétez ces "
+"étapes pour chaque type de fichier que vous voulez ouvrir dans une "
+"application spécifique.</p><ul><li>Ouvrez le centre de configuration de TDE "
+"(si ce n'est pas disponible, essayez de taper \"kcontrol\" dans un "
+"terminal) ;</li><li>Allez dans la section \"Composants de TDE\" puis "
+"\"Associations de fichiers\" ;</li><li>Dans l'arbre, développez \"text\" et "
+"cliquez \"html\" ;</li><li>Dans la liste des applications, ajoutez votre "
+"navigateur Web en tant que première entrée ;</li><li>Faites la même chose "
+"pour le type \"application -> xhtml+xml\".</li></ul>"
 
 #: softwareimporters.cpp:45
 msgid "Import Hierarchy"
@@ -3038,7 +3078,8 @@ msgstr "Comment importer les notes ?"
 
 #: softwareimporters.cpp:52
 msgid "&Keep original hierarchy (all notes in separate baskets)"
-msgstr "&Garder la hiérarchie originale (toutes les notes dans des dossiers séparés)"
+msgstr ""
+"&Garder la hiérarchie originale (toutes les notes dans des dossiers séparés)"
 
 #: softwareimporters.cpp:53
 msgid "&First level notes in separate baskets"
@@ -3104,7 +3145,8 @@ msgid ""
 msgstr "Depuis %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 "Impossible d'importer ce fichier. Il corrompu, ou ce n'est peut-être pas un "
 "fichier TuxCards."
@@ -3254,6 +3296,11 @@ msgstr "Important"
 msgid "Very Important"
 msgstr "Très important"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animation"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Idée"
@@ -3322,6 +3369,11 @@ msgstr "Déplacer au-dessus (Ctrl+Maj+Haut)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Déplacer en dessous (Ctrl+Maj+Bas)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "Suppri&mer"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Marque"
@@ -3420,7 +3472,8 @@ msgstr ""
 "exportée sur chaque ligne de la note."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr "Supprimer cette marque l'enlèvera de chaque note où elle est assignée."
 
 #: tagsedit.cpp:902
@@ -3435,7 +3488,8 @@ msgstr "Supprimer la marque"
 msgid ""
 "Deleting the state will remove the tag from every note the state is "
 "currently assigned to."
-msgstr "Supprimer cet état enlèvera la marque de chaque note où cet état est assigné."
+msgstr ""
+"Supprimer cet état enlèvera la marque de chaque note où cet état est assigné."
 
 #: tagsedit.cpp:909
 msgid "Confirm Delete State"
@@ -3481,3 +3535,111 @@ msgstr ""
 "Redimensionnez la fenêtre pour sélectionner la taille de l'image\n"
 "et fermez la ou pressez Entrée pour valider."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Panier"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Exporter"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importer"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "A&ller"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Note"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Marques"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Mise en forme de texte"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Mise en forme de texte"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "&Filtre :"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Ouvrir"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Pas de protection"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Protéger par &mot de passe"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+M"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Protéger par &clef privée :"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+C"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Veuillez écrire en anglais ou en français."
diff --git a/po/it.po b/po/it.po
index 3e639ab..0a1cbf2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,22 +4,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-01-31 20:31+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: italian <kde-i18n-it@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Luigi Toscano"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -41,14 +42,19 @@ msgid "BasKet Note Pads"
 msgstr "Blocco appunti BasKet"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Autore, responsabile"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Cifratura dati, integrazione in Kontact, importazione da KnowIt"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -57,32 +63,32 @@ msgstr ""
 "incolla su HTML, suggerimenti con il nome del canestro, trascinamento sul "
 "nome del canestro"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Icona"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Salva come archivio basket"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Salvataggio come archivio basket in corso. Attendere prego..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Questo file non è un archivio basket."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Errore nell'archivio basket"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Questo file è danneggiato. Non può essere aperto."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -96,7 +102,7 @@ msgstr ""
 "versioni. Quando salvi il file tieni in considerazione la possibilità di "
 "salvarne uno nuovo per preservare quello originale."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
@@ -104,31 +110,31 @@ msgstr ""
 "Questo file è stato creato con una versione recente di %1. Per piacere, "
 "aggiorna ad una versione più recente se vuoi aprire questo file."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Salva e ripristina"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Salva cartella"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Il canestro è attualmente memorizzato nella cartella:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "S&posta in un'altra cartella..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Usa un'altra cartella esistente..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Perché fare questo?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -141,55 +147,56 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>Puoi spostare la cartella dove %1 memorizza i tuoi canestri per:</p><ul><li>Memorizzare "
-"i canestri in una posizione visibile della tua cartella home, come ~/Note o ~/Canestri, "
-"in modo da effettuarne una copia manualmente all'occorrenza.</li><li>Memorizzare i "
-"canestri su un server per condividerli tra due computer.<br>In questo caso, monta la "
-"cartella condivisa nel file system locale e chiedi a %2 di utilizzare quel punto di "
-"montaggio.<br>Attenzione: non dovresti eseguire %3 contemporaneamente sui due computer, "
-"o potresti perdere dei dati quando le due applicazioni sono non sincronizzate.</li></ul><p>Ricorda "
-"che non dovresti cambiare manualmente il contenuto di quella cartella (ad esempio "
-"l'aggiunta di un file in una cartella di un canestro non causerà l'aggiunta di "
-"quel file al canestro).</p>"
-
-#: backup.cpp:89
+"<p>Puoi spostare la cartella dove %1 memorizza i tuoi canestri per:</"
+"p><ul><li>Memorizzare i canestri in una posizione visibile della tua "
+"cartella home, come ~/Note o ~/Canestri, in modo da effettuarne una copia "
+"manualmente all'occorrenza.</li><li>Memorizzare i canestri su un server per "
+"condividerli tra due computer.<br>In questo caso, monta la cartella "
+"condivisa nel file system locale e chiedi a %2 di utilizzare quel punto di "
+"montaggio.<br>Attenzione: non dovresti eseguire %3 contemporaneamente sui "
+"due computer, o potresti perdere dei dati quando le due applicazioni sono "
+"non sincronizzate.</li></ul><p>Ricorda che non dovresti cambiare manualmente "
+"il contenuto di quella cartella (ad esempio l'aggiunta di un file in una "
+"cartella di un canestro non causerà l'aggiunta di quel file al canestro).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Copie di sicurezza"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Salva..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Ripristina salvataggio..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Ultima copia effettuata: mai"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Ultima copia effettuata: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Scegli la cartella in cui spostare i canestri"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "La cartella <b>%1</b> non è vuota. Vuoi veramente sostituirla?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Sostituisci la cartella?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "S&ostituisci"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -197,83 +204,85 @@ msgstr ""
 "Il canestro è stato spostato correttamente in <b>%1</b>. %2 sta per essere "
 "riavviato per tenere in considerazione questo cambiamento."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Scegli una cartella esistente per memorizzare i canestri"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
 msgstr ""
-"La cartella di salvataggio dei canestri è stata modificata con successo in <b>%1</b>. "
-"%2 sta per essere riavviato per tenere in considerazione questo cambiamento."
+"La cartella di salvataggio dei canestri è stata modificata con successo in "
+"<b>%1</b>. %2 sta per essere riavviato per tenere in considerazione questo "
+"cambiamento."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Canestri_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Archivi tar compressi con gzip"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Tutti i file"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Salvataggio canestri"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "Il file <b>%1</b> esiste già. Vuoi veramente sostituirlo?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Sostituisci il file?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Salvataggio canestri in corso. Attendere prego..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Apri archivio basket"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "LEGGIMI.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
 msgstr ""
-"Questa è la copia di sicurezza dei tuoi canestri esattamente come erano di iniziare "
-"il ripristino dell'archivio %1."
+"Questa è la copia di sicurezza dei tuoi canestri esattamente come erano di "
+"iniziare il ripristino dell'archivio %1."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr ""
-"Se la procedura di ripristino è andata a buon fine ed hai ripristinato ciò che volevi "
-"ripristinare, puoi rimuovere questa cartella."
+"Se la procedura di ripristino è andata a buon fine ed hai ripristinato ciò "
+"che volevi ripristinare, puoi rimuovere questa cartella."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
 msgstr ""
-"Se qualcosa è andato storto durante la procedura di ripristino puoi riutilizzare "
-"questa cartella per memorizzare i tuoi canestri e niente andrà perso."
+"Se qualcosa è andato storto durante la procedura di ripristino puoi "
+"riutilizzare questa cartella per memorizzare i tuoi canestri e niente andrà "
+"perso."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
@@ -281,11 +290,11 @@ msgstr ""
 "Scegli \"Canestro\"->\"Salva e ripristina...\"->\"Usa un'altra cartella "
 "esistente...\" e seleziona quella cartella."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Ripristino di <b>%1</b> in corso. Attendere prego..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
@@ -293,11 +302,11 @@ msgstr ""
 "Se qualcosa dovesse andar male durante la procedura di ripristino, leggi il "
 "file <b>%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Ripristina canestri"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
@@ -305,17 +314,17 @@ msgstr ""
 "Questo archivio non è una copia di sicurezza di canestri, oppure è rovinato. "
 "Non può essere importato. I canestri preesistenti sono stati preservati."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Errore di ripristino"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr ""
-"La copia di sicurezza è stata ripristinata correttamente in <b>%1</b>. %2 sta "
-"per essere riavviato per tenere in considerazione questo cambiamento."
+"La copia di sicurezza è stata ripristinata correttamente in <b>%1</b>. %2 "
+"sta per essere riavviato per tenere in considerazione questo cambiamento."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -333,39 +342,41 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Canestri prima del ripristino (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "La nuova nota non corrisponde al criterio di ricerca ed è nascosta."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Una nota nuova non corrisponde al criterio di ricerca ed è nascosta."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
-msgstr "Alcune note nuove non corrispondono al criterio di ricerca e sono nascoste."
+msgstr ""
+"Alcune note nuove non corrispondono al criterio di ricerca e sono nascoste."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
-msgstr "Le nuove note non corrispondono al criterio di ricerca e sono nascoste."
+msgstr ""
+"Le nuove note non corrispondono al criterio di ricerca e sono nascoste."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Raggruppa"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Inserisci"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Trascinato sul canestro <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -373,7 +384,7 @@ msgstr ""
 "Questo messaggio non dovrebbe mai comparire. Se è questo il caso, il "
 "programma contiene degli errori! Segnala l'errore allo sviluppatore."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -381,48 +392,48 @@ msgstr ""
 "Inserisci qui una nota\n"
 "Fai clic con il pulsante destro per ulteriori opzioni"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Ridimensiona quelle colonne"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Ridimensiona questo gruppo"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Ridimensiona questa nota"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Seleziona o sposta questa nota"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Seleziona o sposta questo gruppo"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Assegna o rimuovi etichette a questa nota"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Etichette assegnate</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Espandi questo gruppo"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Chiudi questo gruppo"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -430,7 +441,7 @@ msgstr ""
 "Raggruppa la nota con quella sottostante\n"
 "Fai clic con il pulsante destro per ulteriori opzioni"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -438,46 +449,46 @@ msgstr ""
 "Raggruppa la nota con quella sovrastante\n"
 "Fai clic con il pulsante destro per ulteriori opzioni"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Aggiunto in data"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Ultima modifica"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Fai clic a destra per raggruppare invece di inserire"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Fai clic a sinistra per inserire invece di raggruppare"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "S&blocca"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Canestro protetto da password."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Premi Sblocca per accedere."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Cifratura non supportata da<br/>questa versione di %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -485,27 +496,32 @@ msgstr ""
 "Per far sì che il canestro resti sbloccato, cambia la durata<br>del "
 "bloccaggio automatico nelle impostazioni dell'applicazione."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Caricamento..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Rimuovi tutte"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "Pe&rsonalizza..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtra secondo questa etichetta"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtra secondo questo &stato"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Etichette"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -514,7 +530,7 @@ msgstr ""
 "<qt>Vuoi veramente cancellare questa nota?</qt>\n"
 "<qt>Vuoi veramente cancellare queste <b>%n</b> note?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -522,7 +538,7 @@ msgstr ""
 "Elimina nota\n"
 "Elimina note"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -530,7 +546,7 @@ msgstr ""
 "Nota copiata negli appunti.\n"
 "Note copiate negli appunti."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -538,7 +554,7 @@ msgstr ""
 "Taglia nota e metti negli appunti.\n"
 "Taglia note e metti negli appunti."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -546,39 +562,44 @@ msgstr ""
 "Nota copiata nella selezione.\n"
 "Note copiata nella selezione."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Impossibile aprire la nota."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Non sei autorizzato ad aprire questo file."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Salva su file"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Inserisci password della seguente chiave privata:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Inserisci password del canestro <b>%1</b>:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Assegna una password al canestro <b>%1</b>:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Spazio su disco insufficiente per salvare i dati di Basket"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Permessi errati per il file del canestro"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -586,7 +607,7 @@ msgstr ""
 "Rimuovi il file <b>%1</b> dal disco per far sì che l'applicazione possa "
 "salvare in modo sicuro i tuoi cambiamenti."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -594,13 +615,42 @@ msgstr ""
 "I permessi di accesso a <b>%1</b> non sono corretti. Controlla di avere i "
 "permessi di scrittura sul file e sulle cartelle superiori."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Errore nel salvataggio"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Mostra/nascondi la finestra principale"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"&Mostra la finestra principale quando il mouse resta sopra il vassoio di "
+"sistema per"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Apri archivio basket"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
-msgstr "Spiacente, ma la creazione della cartella per il nuovo canestro è fallita."
+msgstr ""
+"Spiacente, ma la creazione della cartella per il nuovo canestro è fallita."
 
 #: basketfactory.cpp:60 basketfactory.cpp:90 basketfactory.cpp:111
 msgid "Basket Creation Failed"
@@ -634,10 +684,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Proprietà del canestro"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Nome"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Immagine di sfondo:"
@@ -704,8 +758,8 @@ msgstr ""
 "principale è attiva. Le scorciatorie globali sono valide ovunque, anche se "
 "la finestra è nascosta.</p><p><strong>Mostra Vs Passa a</strong>:"
 "<br>L'ultima opzione rende attivo questo canestro senza aprire la finestra "
-"principale. È utile in aggiunta alla scorciatoria globale configurabile, "
-"ad esempio per incollare il contenuto degli appunti o la selezione nel canestro "
+"principale. È utile in aggiunta alla scorciatoria globale configurabile, ad "
+"esempio per incollare il contenuto degli appunti o la selezione nel canestro "
 "corrente da qualsiasi parte.</p>"
 
 #: basketproperties.cpp:149
@@ -726,7 +780,8 @@ msgstr "Mostra se ci sono modifiche che non sono state ancora salvate."
 
 #: basketstatusbar.cpp:128
 msgid "Ctrl+drop: copy, Shift+drop: move, Shift+Ctrl+drop: link."
-msgstr "Ctrl+rilascia: copia, Shift+rilascia: sposta, Shift+Ctrl+rilascia: collega."
+msgstr ""
+"Ctrl+rilascia: copia, Shift+rilascia: sposta, Shift+Ctrl+rilascia: collega."
 
 #: basketstatusbar.cpp:148
 msgid "<p>This basket is <b>locked</b>.<br>Click to unlock it.</p>"
@@ -736,15 +791,15 @@ msgstr "<p>Questo canestro è <b>bloccato</b>.<br>Fai clic per sbloccarlo.</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Questo canestro è <b>sbloccato</b>.<br>Fai clic per bloccarlo.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Generale"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Mostra/nascondi la finestra principale"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
@@ -752,11 +807,11 @@ msgstr ""
 "Consente di mostrare la finestra principale se è nascosta, e nasconderla se "
 "è visibile."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Incolla il contenuto degli appunti nel canestro corrente"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
@@ -764,21 +819,21 @@ msgstr ""
 "Ti permette di incollare il contenuto degli appunti nel canestro corrente "
 "senza dover aprire la finestra principale."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Mostra il nome del canestro corrente"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr ""
 "Ti permette di conoscere il nome del canestro corrente senza dover aprire la "
 "finestra principale."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Incolla la selezione nel canestro corrente"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
@@ -786,11 +841,11 @@ msgstr ""
 "Ti permette di incollare la selezione degli appunti nel canestro corrente "
 "senza dover aprire la finestra principale."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Crea un nuovo canestro"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -801,11 +856,11 @@ msgstr ""
 "nota, incollare il contenuto degli appunti o della selezione nel nuovo "
 "canestro)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Vai al canestro precedente"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
@@ -813,11 +868,11 @@ msgstr ""
 "Ti permette di passare al canestro precedente senza dover aprire la finestra "
 "principale."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Vai al canestro successivo"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -825,21 +880,22 @@ msgstr ""
 "Ti permette di passare al canestro successivo senza dover aprire la finestra "
 "principale."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Inserisci nota di testo"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr ""
 "Inserisci una nota di testo nel canestro corrente senza dover aprire la "
 "finestra principale."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Inserisci nota di tipo immagine"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
@@ -847,21 +903,22 @@ msgstr ""
 "Inserisci una nota di tipo immagine nel canestro corrente senza dover aprire "
 "la finestra principale."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Inserisci nota di tipo collegamento"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
 msgstr ""
 "Inserisci una nota di tipo collegamento nel canestro corrente senza dover "
 "aprire la finestra principale."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Inserisci nota di tipo colore"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
@@ -869,11 +926,11 @@ msgstr ""
 "Inserisci una nota di tipo colore nel canestro corrente senza dover aprire "
 "la finestra principale."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Seleziona colore dallo schermo"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -881,11 +938,11 @@ msgstr ""
 "Inserisci una nota di colore, prelevato da un pixel dello schermo, nel "
 "canestro corrente senza dover aprire la finestra principale."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Cattura zona di schermo"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -893,15 +950,11 @@ msgstr ""
 "Cattura una zona di schermo come immagine nel canestro corrente senza dover "
 "aprire la finestra principale."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Canestri"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Per favore, scrivi in inglese o in francese."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -914,243 +967,248 @@ msgstr ""
 "selezionando un canestro per aprirlo, o riorganizzarli trascinandoli in una "
 "diversa posizione."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "Archivio &basket..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Nascondi la finestra"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "Pagina &HTML..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "Note ade&sive"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "&File di testo..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Salva e ripristina..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Elimina"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Seleziona tutte le note"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Deselezio&na tutto"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Deseleziona tutte le note selezionate"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Inverti la selezione"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Inverti la selezione di note corrente"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Modifica..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Apri"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "A&pri con..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Salva su file..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "Ra&ggruppa"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "Sepa&ra"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Sposta in ci&ma"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Sposta in &alto"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Sposta in &basso"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Sposta in &fondo"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Testo"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "Co&llegamento"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Immagine"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Colore"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "Esec&utore"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importa Esecutore dal menu &TDE..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&porta icona..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Carica da &file..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "C&olore da schermo"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Cattura &zona di schermo"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Nuovo canestro..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Nuovo &sottocanestro..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Nuovo canestro allo stesso li&vello..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Nuovo"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Proprietà del canestro"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Rimuovi"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Pass&word..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "B&locca"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtro"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtra tutti i &canestri"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "Annulla filt&ro"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "Canestro &precedente"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "Ca&nestro successivo"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "C&hiudi canestro"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Espandi canestro"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Configura scorciatoie &globali..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "Canestri di &benvenuto"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Conversione delle note in testo semplice"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Conversione delle note di testo semplice in testo arricchito..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Bloccato"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Nessuna nota"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1159,7 +1217,7 @@ msgstr ""
 "%n nota\n"
 "%n note"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1168,15 +1226,15 @@ msgstr ""
 "%n selezionata\n"
 "%n selezionate"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "corrispondono tutte"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "nessun filtro"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1185,29 +1243,29 @@ msgstr ""
 "%n corrisponde\n"
 "%n corrispondono"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Selezionato colore nel basket <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Le note di testo semplice sono state convertite in note arricchite."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Conversione terminata"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Non ci sono note di testo semplice da convertire."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1218,51 +1276,53 @@ msgid ""
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
 "<p><b>Sembra che il file basketui.rc non esista o sia troppo vecchio.<br>%1 "
-"non può funzionare senza e si fermerà.</b></p><p>Per favore, controlla la tua "
-"installazione di %2.</p><p>Se non hai i privilegi amministrativi per "
-"installare l'applicazione a livello di sistema puoi copiare il file basketui.rc "
-"dall'archivio di installazione nella cartella <a href='file://%3'>%4</a>."
+"non può funzionare senza e si fermerà.</b></p><p>Per favore, controlla la "
+"tua installazione di %2.</p><p>Se non hai i privilegi amministrativi per "
+"installare l'applicazione a livello di sistema puoi copiare il file basketui."
+"rc dall'archivio di installazione nella cartella <a href='file://%3'>%4</a>."
 "</p><p>Come ultima risorsa, se sei sicuro che l'applicazione è installata "
 "correttamente ma se in precedenza hai installato ed usato una versione non "
 "definitiva, prova a rimuovere il file %5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Risorsa non trovata"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Impossibile aggiungere la nota."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Catturata zona di schermo nel canestro <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Cancella canestro"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Cancella solo quel canestro"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Cancella con tutti quelli contenuti"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
-msgstr "<qt>Vuoi veramente rimuovere il canestro <b>%1</b> ed il suo contenuto?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+msgstr ""
+"<qt>Vuoi veramente rimuovere il canestro <b>%1</b> ed il suo contenuto?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Rimuovi canestro"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Rimuovi canestro"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
@@ -1270,43 +1330,43 @@ msgstr ""
 "<qt><b>%1</b> contiene i seguenti canestri.<br>Vuoi rimuovere anche questi?</"
 "qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Rimuovi sottocanestri"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "&Rimuovi sottocanestri"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Archivi basket"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Il contenuto degli appunti è stato incollato nel canestro <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Il contenuto della selezione è stato incollato nel canestro <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Nessuna nota è stata aggiunta."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Il canestro <i>%1</i> è bloccato"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(bloccato)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Assegna nuova etichetta..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Rimuovi tutte"
 
@@ -1398,11 +1458,11 @@ msgstr "Etichett&a: "
 msgid "Filter all Baskets"
 msgstr "Filtra tutti i canestri"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(non etichettato)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(etichettato)"
 
@@ -1494,35 +1554,35 @@ msgstr "(predefinito)"
 msgid "Other..."
 msgstr "Altro..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Elenco delle chiavi private"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Indirizzo di posta elettronica"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Scegli una chiave segreta:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Lista chiavi troncata in modo inaspettato."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "La chiave pubblica non è adatta alla cifratura"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Algoritmo non supportato"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Password errata."
 
@@ -1562,19 +1622,28 @@ msgstr "Filesystem"
 msgid "File Types"
 msgstr "Tipi di file"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|File icone (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Apri"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr "Manda un commento agli sviluppatori su qualcosa che ti piace"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr "Manda un commento agli sviluppatori su qualcosa che non ti piace "
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
@@ -1582,31 +1651,31 @@ msgstr ""
 "Manda un commento agli sviluppatori su un comportamento non corretto del "
 "programma"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 "Manda un commento agli sviluppatori su una nuova funzionalità che vorresti "
 "nel programma"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "Invia un commento agli &sviluppatori"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Benvenuto nella versione di test di %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Benvenuto in %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Per aiutarci a migliorarlo, i tuoi commenti sono importanti."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1616,7 +1685,7 @@ msgstr ""
 "faccina appropriata sotto la barra del titolo della finestra, descrivi in "
 "sintesi quello che ti piace o non ti piace e fai clic su Invia."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1625,7 +1694,7 @@ msgstr ""
 "sorridente sotto la barra del titolo della finestra, descrivi in sintesi "
 "quello che ti piace e fai clic su Invia."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1634,7 +1703,7 @@ msgstr ""
 "scontenta sotto la barra del titolo della finestra, descrivi in sintesi "
 "quello che non ti piace e fai clic su Invia."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1644,7 +1713,7 @@ msgstr ""
 "fai clic sull'icona che rappresenta un'oggetto rotto nell'angolo in alto a "
 "destra della finestra, descrivilo e fai clic su Invia."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1654,7 +1723,7 @@ msgstr ""
 "rappresenta un'oggetto rotto sotto la barra del titolo della finestra, "
 "descrivi il comportamento errato e fai clic su Invia."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1662,17 +1731,18 @@ msgstr ""
 "Esempio:\n"
 "Esempi:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Mi piace</b> la nuova grafica. Molto piacevole."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 "<b>Non mi piace</b> la pagina di benvenuto di quell'assistente. Fa perdere "
 "troppo tempo."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1680,25 +1750,25 @@ msgstr ""
 "<b>L'applicazione si comporta in modo errato</b> quando si fa clic sul "
 "pulsante Aggiungi. Non accade nulla."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 "<b>Desidero una nuova funzionalità</b> che mi consenta di spedire il mio "
 "lavoro via posta elettronica."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Aiuta a migliorare il programma"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Indirizzo di posta elettronica"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Per favore inserisci il tuo indirizzo di posta elettronica."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1708,7 +1778,7 @@ msgstr ""
 "ulteriori informazioni sul tuo commento, per chiederti di riprodurre i bug "
 "che hai segnalato, per inviarti correzioni da provare, ecc."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1716,57 +1786,57 @@ msgstr ""
 "L'indirizzo di posta elettronica è opzionale. Se non ne fornisci alcuno, i "
 "tuoi commenti verranno spediti in modo anonimo."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Invia un commento agli sviluppatori"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Invia un commento agli sviluppatori su:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Qualcosa che ti &piace"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Qualcosa che &non ti piace"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Un &comportamento non corretto del programma"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Una nuova &funzionalità che vorresti nel programma"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
-msgstr "Mostra i &pulsanti di commento sotto le barre del titolo della finestra"
+msgstr ""
+"Mostra i &pulsanti di commento sotto le barre del titolo della finestra"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Invia commento"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "Indirizzo di posta &elettronica..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Per favore inserisci una breve descrizione."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Per favore, scrivi in inglese."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr "Potresti usare uno <a href=\"%1\">strumento di traduzione online</a>."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1775,23 +1845,23 @@ msgstr ""
 "programma, cerca di inviare lo stesso quantitativo di commenti positivi e "
 "negativi."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 "<b>Non</b> chiedere di nuove funzionalità: le tue richieste verranno "
 "ignorate."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Si è verificato un errore durante la spedizione della segnalazione.</"
 "p><p>Riprova più tardi.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Errore di trasferimento"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1799,7 +1869,7 @@ msgstr ""
 "<p>Il commento è stato inviato con successo. Ci aiuterà a migliorare il "
 "programma.</p><p>Grazie per il tempo che hai speso.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Commento inviato"
 
@@ -1900,19 +1970,19 @@ msgstr ""
 msgid "Example"
 msgstr "Esempio"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimizza"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Basket"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Vuoi veramente uscire da %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1923,7 +1993,7 @@ msgstr ""
 "ancora in esecuzione, questo sarà caricato nuovamente quando accederai al "
 "sistema.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Conferma chiusura"
 
@@ -1994,7 +2064,7 @@ msgstr "Senza vincoli"
 msgid "Mind map"
 msgstr "Mappa mentale"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Immagine)"
 
@@ -2018,6 +2088,11 @@ msgstr "Animazione"
 msgid "Sound"
 msgstr "Suono"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&File"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Collegamento"
@@ -2026,7 +2101,7 @@ msgstr "Collegamento"
 msgid "Launcher"
 msgstr "Esecutore"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Colore"
 
@@ -2074,271 +2149,280 @@ msgstr "Modifica colore"
 msgid "Edit this unknown object"
 msgstr "Modifica oggetto sconosciuto"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Apertura di testo semplice..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Apertura di testo semplice..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Apertura di testi semplici con..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Apertura di testi semplici con..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Apri testo semplice con:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Apri testi semplici con:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Apertura testo..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Apertura testi..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Apertura testo con..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Apertura testi con..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Apri testo con:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Apri testi con:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Dimensione"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 per %2 pixel"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Apertura immagine..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Apertura immagini..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Apertura immagine con..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Apertura immagini con..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Apri immagine con:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Apri immagini con:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Fai clic per visualizzare a dimensione intera"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Apertura animazione..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Apertura animazioni..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Apertura animazione con..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Apertura animazioni con..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Apri animazione con:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Apri animazioni con:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Tipo"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Apri file"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Apertura file..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Apertura file..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Apertura file con..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Apertura file con..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Apri file con:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Apri file con:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Apri suono"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Apertura suono..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Apertura suoni..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Apertura suono con..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Apertura suoni con..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Apri suono con:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Apri suoni con:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Destinazione"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Apri collegamento"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Al collegamento non è associata alcuna URL."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Apertura collegamento..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Apertura collegamenti..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Apertura collegamento con..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Apertura collegamenti con..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Apri collegamento con:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Apri collegamenti con:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(esegui in un terminale)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Commento"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Comando"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Esegui questa applicazione"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Nessun comando associato all'esecutore."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Esecuzione applicazione..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Esecuzione applicazioni..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Rosso</i>: %1, <i>verde</i>: %2, <i>blu</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Tinta</i>: %1, <i>saturazione</i>: %2, <i>valore</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Nome del colore (CSS)"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Nome del colore (CSS esteso)"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "È un colore web"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Nessuno"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2348,11 +2432,11 @@ msgstr ""
 "di Blocco appunti BasKet includerà un editor di immagini).\n"
 "Vuoi aprirla con un programma in grado di modificarla?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Modifica nota di tipo immagine"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2360,15 +2444,15 @@ msgstr ""
 "L'animazione non può essere modificata da questo programma.\n"
 "Vuoi aprirla con un programma in grado di modificarla?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Modifica nota di tipo animazione"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Modifica nota di tipo colore"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2378,74 +2462,97 @@ msgstr ""
 "modificata qui.\n"
 "Puoi comunque trascinarla in un'applicazione in grado di gestirne il tipo."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Modifica nota di tipo sconosciuto"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Modifica nota di tipo collegamento"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Auto"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Icona:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Destinazione:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Titolo:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Modifica nota di tipo esecuzione"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Scegli il comando da eseguire:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Deduci"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "Coman&do:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "Ca&rattere:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Dimensione"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Grassetto"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "Cors&ivo"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Allineato a sinistra"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Centrato"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Allineato a destra"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Giustificato"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2492,8 +2599,7 @@ msgstr "Scegli la dimensione dell'icona da importare come immagine:"
 msgid "Load File Content into a Note"
 msgstr "Carica il contenuto del file in una nota"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Proteggi con password"
@@ -2502,135 +2608,39 @@ msgstr "Proteggi con password"
 msgid "No private key selected."
 msgstr "Nessuna chiave privata selezionata."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Canestro"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Esporta"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importa"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Vai"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Nota"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "E&tichette"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Barra degli strumenti di formattazione del testo"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&ltro:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Nessuna protezione"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Proteggi il canestro con &password"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Proteggi il canestro con c&hiave privata:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+H"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "A sinistra"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "A destra"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "Posizione dell'al&bero dei canestri:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "In alto"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "In basso"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Posizione della barra dei &filtri:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "&Usa i fumetti per informare dei risultati delle azioni globali"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Cosa sono le azioni globali?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2645,7 +2655,7 @@ msgstr ""
 "sistema per cambiare il canestro corrente. O utilizzare il pulsante centrale "
 "del mouse su quell'icona per incollare la selezione corrente."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2653,7 +2663,7 @@ msgstr ""
 "In questo caso, %1 mostrerà un piccolo fumetto per informarti che l'azione è "
 "stata completata correttamente. Puoi disabilitare il fumetto."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2663,65 +2673,68 @@ msgstr ""
 "finestra principale è visibile. Questo perché hai già potuto vedere il "
 "risultato delle tue azioni nella finestra principale."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Icona nel vassoio di sistema"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "&Aggiungi nel vassoio di sistema"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
-msgstr "Mo&stra l'icona del canestro corrente come icona nel vassoio di sistema"
+msgstr ""
+"Mo&stra l'icona del canestro corrente come icona nel vassoio di sistema"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
-msgstr "&Nascondi la finestra principale quando il mouse rimane fuori da essa per"
+msgstr ""
+"&Nascondi la finestra principale quando il mouse rimane fuori da essa per"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " decimi di secondo"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr ""
 "&Mostra la finestra principale quando il mouse resta sopra il vassoio di "
 "sistema per"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Ani&ma i cambiamenti nei canestri"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "Mo&stra suggerimenti per i canestri"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "Note &grandi"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
-msgstr "&Trasforma le righe che cominciano per * o - in liste negli editor di testo"
+msgstr ""
+"&Trasforma le righe che cominciano per * o - in liste negli editor di testo"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Chiedi conferma &prima di eliminare le note"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "&Esporta etichette come testo"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Quando questo si applica?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2729,13 +2742,14 @@ msgstr ""
 "Si applica quando copi e incolli, o trascini delle note in un editor di "
 "testo."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "Se abilitata, questa proprietà ti consente di incollare gli equivalenti "
 "testuali delle etichette."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2745,15 +2759,16 @@ msgstr ""
 "sarà esportata come una serie di righe precedute da <b>[ ]</b> o <b>[x]</b> "
 "che rappresentano rispettivamente una casella vuota ed una marcata."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
-msgstr "Ra&ggruppa una nuova nota facendo clic a destra della riga di inserimento"
+msgstr ""
+"Ra&ggruppa una nuova nota facendo clic a destra della riga di inserimento"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Come raggruppare una nuova nota?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2763,7 +2778,7 @@ msgstr ""
 "solo di inserire note in corrispondenza della posizione del cursore, ma "
 "anche di raggruppare una nuova nota con quella sotto il cursore:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2771,183 +2786,183 @@ msgid ""
 "or above</b>, depending on where your mouse is.</p>"
 msgstr ""
 "<p>Posiziona il mouse tra le note, dove ne vuoi aggiungere una nuova.<br>Fa "
-"clic a <b>sinistra</b> del segnaposto centrale nella riga di inserimento "
-"per <b>inserire</b> una nota.<br>Fai clic a <b>destra</b> per "
-"<b>raggruppare</b> una nota con la nota <b>sottostante o sovrastante</b> in "
-"base alla posizione del mouse.</p>"
+"clic a <b>sinistra</b> del segnaposto centrale nella riga di inserimento per "
+"<b>inserire</b> una nota.<br>Fai clic a <b>destra</b> per <b>raggruppare</b> "
+"una nota con la nota <b>sottostante o sovrastante</b> in base alla posizione "
+"del mouse.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Non fare nulla"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Incolla dagli appunti"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Inserisci nota di esecuzione"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Inserisci colore dallo schermo"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Carica nota da file"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Importa esecutore dal menu TDE"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importa icona"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+pulsante centrale del mouse ovunque:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "alla posizione del cursore"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "Blocca a&utomaticamente i canestri protetti se chiusi da"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " minuti"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "Usa GnuPG Agent per i canestri protetti con chiave &privata/pubblica"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Posizione delle nuove note:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Alla nota corrente"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Dime&nsione nuove immagini:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&per"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pixel"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Visualizza..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Visualizza il contenuto dei file aggiunti per i seguenti tipi"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "Testo sem&plice"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "Pagina &HTML"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Immagine o animazione"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Suono"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Audio della conferenza"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Resoconto annuale"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Cartella home"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Esegui %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Suoni"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&File"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Collegamenti &locali"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "Collegame&nti di rete"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "Esec&utori"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Apri note di &testo con un'applicazione personalizzata:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Apri note di testo con:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Apri note di tipo &immagine con un'applicazione personalizzata:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Apri note di tipo immagine con:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Apri note di tipo a&nimazione con un'applicazione personalizzata:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Apri note di tipo animazione con:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Apri note di tipo &suono con un'applicazione personalizzata:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Apri note di tipo suono con:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
 msgstr ""
-"<p>Se marcata, l'applicazione impostata di seguito verrà utilizzata per aprire "
-"quel tipo di nota.</p><p>Altrimenti verrà utilizzata l'applicazione che hai "
-"configurato in Konqueror.</p>"
+"<p>Se marcata, l'applicazione impostata di seguito verrà utilizzata per "
+"aprire quel tipo di nota.</p><p>Altrimenti verrà utilizzata l'applicazione "
+"che hai configurato in Konqueror.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2955,26 +2970,27 @@ msgstr ""
 "<p>Definisci l'applicazione da utilizzare per aprire quel tipo di nota al "
 "posto dell'applicazione configurata in Konqueror.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Come modificare l'applicazione usata per aprire collegamenti Web?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Aprendo dei collegamenti Web, questi verranno aperti con differenti "
 "applicazioni in base al contenuto del collegamento (una pagina Web, "
@@ -2992,11 +3008,11 @@ msgstr ""
 "una configurazione più accurata (come aprire solo le pagine Web nel "
 "browser), leggere il secondo collegamento di aiuto.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Come modificare le applicazioni usate per aprire file e collegamenti?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -3005,12 +3021,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Di seguito le istruzioni per impostare l'applicazione da utilizzare per "
 "ogni tipo di file. Si applica anche ai collegamenti web se scegli di non "
@@ -3104,7 +3120,8 @@ msgid ""
 msgstr "Da %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 "Impossibile importare il file specificato. Potrebbe essere rovinato o non "
 "essere un file TuxCards."
@@ -3253,6 +3270,11 @@ msgstr "Importante"
 msgid "Very Important"
 msgstr "Molto importante"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animazione"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Idea"
@@ -3321,6 +3343,11 @@ msgstr "Sposta in alto (Ctrl+Shift+Freccia su)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Sposta in basso (Ctrl+Shift+Freccia giù)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Elimina"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Etichetta"
@@ -3414,12 +3441,13 @@ msgid ""
 "In the example above, the tag of the top note is only exported on the first "
 "line, while the tag of the bottom note is exported on every line of the note."
 msgstr ""
-"Nell'esempio riportato precedente l'etichetta della nota superiore è esportata "
-"solo nella prima riga, mentre l'etichetta della nota inferiore è esportata "
-"su ogni riga della nota."
+"Nell'esempio riportato precedente l'etichetta della nota superiore è "
+"esportata solo nella prima riga, mentre l'etichetta della nota inferiore è "
+"esportata su ogni riga della nota."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 "Cancellando l'etichetta ne verranno rimosse tutte le occorrenze dalle note a "
 "cui è stata assegnata."
@@ -3484,3 +3512,111 @@ msgstr ""
 "Ridimensiona la finestra per selezionare la dimensione dell'immagine\n"
 "e chiudila o premi Esc per rendere definitivi i cambiamenti."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Canestro"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Esporta"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importa"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Vai"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Nota"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "E&tichette"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra degli strumenti di formattazione del testo"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Barra degli strumenti di formattazione del testo"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&ltro:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Apri"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Nessuna protezione"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Proteggi il canestro con &password"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Proteggi il canestro con c&hiave privata:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+H"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Per favore, scrivi in inglese o in francese."
diff --git a/po/ja.po b/po/ja.po
index 94263f1..9c8d7ef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,23 +4,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: basket-ja\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-04-25 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Yukiko Bando"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -41,14 +42,19 @@ msgid "BasKet Note Pads"
 msgstr "BasKet メモパッド"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "作者、メンテナ"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "バスケットの暗号化、Kontact への統合、KnowIt からのインポート"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -56,32 +62,32 @@ msgstr ""
 "バスケットの自動ロック、状態保存アイコン、HTML コピー/貼り付け、バスケット名"
 "のツールチップ、バスケット名にドロップ"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "アイコン"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "バスケットアーカイブとして保存"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "バスケットアーカイブとして保存しています。お待ちください..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "このファイルはバスケットアーカイブではありません。"
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "バスケットアーカイブのエラー"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "このファイルは壊れています。開けません。"
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -95,7 +101,7 @@ msgstr ""
 "イルを保存するときは、元のデータを保持するために、別のファイルに保存するよう"
 "にしてください。"
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
@@ -103,31 +109,31 @@ msgstr ""
 "このファイルは最近のバージョンの %1で作成されています。ファイルを開くために"
 "は、新しいバージョンにアップグレードする必要があります。"
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "バックアップと復元"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "保存フォルダ"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "あなたのバスケットは現在このフォルダに保存されています:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "他のフォルダに移動(&M)..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "他の既存のフォルダを使う(&U)..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "何のために？"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -151,44 +157,44 @@ msgstr ""
 "ださい (バスケットの保存フォルダに直接ファイルを追加しても、バスケットには追"
 "加されません)。</p>"
 
-#: backup.cpp:89
+#: backup.cpp:91
 msgid "Backups"
 msgstr "バックアップ"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "バックアップ(&B)..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "バックアップを復元(&R)..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "前回のバックアップ: なし"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "前回のバックアップ: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "バスケットを移動するフォルダを選択"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "フォルダ <b>%1</b> は空ではありません。上書きしますか？"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "フォルダを上書きしますか？"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "上書き(&O)"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -196,11 +202,11 @@ msgstr ""
 "バスケットを <b>%1</b> に移動しました。この変更を適用するために %2を再起動し"
 "ます。"
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "バスケットを保存する既存のフォルダを選択"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
@@ -208,60 +214,60 @@ msgstr ""
 "バスケットの保存フォルダを <b>%1</b> に変更しました。この変更を適用するため"
 "に %2を再起動します。"
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Baskets_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Gzip によって圧縮された TAR アーカイブ"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "バスケットをバックアップ"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "ファイル <b>%1</b> は既に存在します。本当に上書きしますか？"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "ファイルを上書きしますか？"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "バスケットをバックアップしています。お待ちください..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "バスケットアーカイブを開く"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "README.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
 msgstr "これはバックアップ %1 の復元を開始する前のバスケットのコピーです。"
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr ""
 "すべてが期待どおりに復元された場合、このフォルダは削除してかまいません。"
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
@@ -269,7 +275,7 @@ msgstr ""
 "復元中に何か問題が発生した場合は、このフォルダを再利用することで、何も失わず"
 "に復元前のバスケットに戻すことができます。"
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
@@ -277,21 +283,21 @@ msgstr ""
 "メニューから「バスケット」->「バックアップと復元...」->「他の既存のフォルダを"
 "使う」を選択し、このフォルダを指定してください。"
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "<b>%1</b> を復元しています。お待ちください..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
 msgstr "復元中に何か問題が発生した場合は、<b>%1</b> ファイルをお読みください。"
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "バスケットを復元"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
@@ -299,11 +305,11 @@ msgstr ""
 "このアーカイブは壊れているか、バスケットのバックアップではありません。イン"
 "ポートできません。元のバスケットを保持しました。"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "復元エラー"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -327,39 +333,39 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "復元前のバスケット (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "新しいメモはフィルタにマッチしないので表示されていません。"
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "新しいメモのひとつがフィルタにマッチしないので表示されていません。"
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr "新しいメモのいくつかがフィルタにマッチしないので表示されていません。"
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "新しいメモはフィルタにマッチしないので表示されていません。"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "グループ化"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "挿入"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "バスケット「%1」にドロップしました"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -367,7 +373,7 @@ msgstr ""
 "このメッセージは出てはならないものです。出たとしたら、このプログラムはバギー"
 "です! 開発者にバグを報告してください。"
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -375,48 +381,48 @@ msgstr ""
 "ここにメモを挿入\n"
 "右クリックでオプションを表示"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "列のサイズを変更"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "このグループのサイズを変更"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "このメモのサイズを変更"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "このメモを選択または移動"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "このグループを選択または移動"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "このメモにタグを追加または削除"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>タグ</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1、%2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "このグループを展開"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "このグループをたたむ"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -424,7 +430,7 @@ msgstr ""
 "メモを下のものとグループ化\n"
 "右クリックでオプションを表示"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -432,46 +438,46 @@ msgstr ""
 "メモを上のものとグループ化\n"
 "右クリックでオプションを表示"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "追加"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "最終更新"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "単なる挿入ではなくグループ化するには右側をクリック"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "グループ化せずに挿入するには左側をクリック"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "ロック解除(&U)"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "バスケットはパスワードで保護されています。"
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "アクセスするには「ロック解除」を押してください。"
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "暗号化はこのバージョンの %1 では<br/>サポートしていません。"
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -479,90 +485,100 @@ msgstr ""
 "バスケットがロックされないようにするには、設定ダイアログの<br>「バスケット」"
 "のページで自動ロックの時間を変更してください。"
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "すべて削除(&R)"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "カスタマイズ(&C)..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "このタグでフィルタ(&F)"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "この状態でフィルタ(&S)"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "タグ"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
 "<qt>Do you really want to delete those <b>%n</b> notes?</qt>"
 msgstr "<qt>本当にこれら <b>%n</b> 個のメモを削除しますか？</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
 msgstr "メモを削除"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
 msgstr "メモをクリップボードにコピーしました。"
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
 msgstr "メモをクリップボードに切り取りました。"
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
 msgstr "メモを選択にコピーしました。"
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "このメモを開けません。"
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "このファイルを開く権限がありません。"
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "ファイルに保存"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "以下の秘密鍵のパスワードを入力してください:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "バスケット「%1」のパスワードを入力してください:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "バスケット「%1」のパスワードを設定してください:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "バスケットのデータを保存するディスク容量が足りません"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "不正なバスケットファイルの許可属性"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -570,7 +586,7 @@ msgstr ""
 "アプリケーションが安全にあなたの変更を保存できるように、ディスク <b>%1</b> 上"
 "のファイルを削除してください。"
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -578,10 +594,36 @@ msgstr ""
 "ファイル <b>%1</b> の許可属性が正しくありません。そのファイルと親フォルダに対"
 "して書き込み権限があるか確認してください。"
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "保存エラー"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "メインウィンドウを表示/隠す"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "マウスが次の時間アイコンの上にあったらメインウィンドウを表示する(&M)"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "バスケットアーカイブを開く"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr ""
@@ -619,10 +661,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "バスケットのプロパティ"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "名前"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "背景画像(&I):"
@@ -724,15 +770,15 @@ msgstr ""
 "<p>このバスケットはロック解除されています。<br>ロックするにはクリックしてくだ"
 "さい。</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "General"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "メインウィンドウを表示/隠す"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
@@ -740,41 +786,41 @@ msgstr ""
 "メインウィンドウが非表示になっている場合は表示し、表示されている場合は隠しま"
 "す。"
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "クリップボードの内容を現在のバスケットに貼り付け"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
 msgstr ""
 "メインウィンドウを開かずにクリップボードの内容を貼り付けることができます。"
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "現在のバスケット名を表示"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "メインウィンドウを開かずに現在のバスケットがわかります。"
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "選択を現在のバスケットに貼り付け"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
 msgstr ""
 "メインウィンドウを開かずにクリップボードの選択を貼り付けることができます。"
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "新しいバスケットを作成"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -784,42 +830,42 @@ msgstr ""
 "他のグローバルショートカットを使って、そのバスケットにメモを追加したりクリッ"
 "プボードの内容や選択したものを貼り付けることができます。"
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "前のバスケットへ移動"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
 msgstr "メインウィンドウを開かずに前のバスケットに切り替えることができます。"
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "次のバスケットへ移動"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
 msgstr "メインウィンドウを開かずに次のバスケットに切り替えることができます。"
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "テキストメモを挿入"
 
-#: bnpview.cpp:265
+#: bnpview.cpp:308
 msgid ""
 "Add a text note to the current basket without having to open the main window."
 msgstr ""
 "メインウィンドウを開かずに現在のバスケットにテキストメモを追加することができ"
 "ます。"
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "画像メモを挿入"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
@@ -827,33 +873,33 @@ msgstr ""
 "メインウィンドウを開かずに現在のバスケットに画像メモを追加することができま"
 "す。"
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "リンクメモを挿入"
 
-#: bnpview.cpp:273
+#: bnpview.cpp:316
 msgid ""
 "Add a link note to the current basket without having to open the main window."
 msgstr ""
 "メインウィンドウを開かずに現在のバスケットにリンクメモを追加することができま"
 "す。"
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "色メモを挿入"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
 msgstr ""
 "メインウィンドウを開かずに現在のバスケットに色メモを追加することができます。"
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "スクリーンから色を採取"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -861,11 +907,11 @@ msgstr ""
 "メインウィンドウを開かずに現在のバスケットにスクリーン上の 1 ピクセルから採取"
 "した色をメモとして追加することができます。"
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "スクリーンの領域を取り込む"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -873,15 +919,11 @@ msgstr ""
 "メインウィンドウを開かずに現在のバスケットにスクリーンの領域を画像として取り"
 "込むことができます。"
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "バスケット"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "英語またはフランス語でお願いします。"
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -894,294 +936,299 @@ msgstr ""
 "スケットを切り替えるには、バスケットの上でクリックして開きます。バスケットは"
 "「ドラッグ&ドロップ」を使って再編成することができます。"
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "バスケットアーカイブ(&B)..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "ウィンドウを隠す(&H)"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "HTML ウェブページ(&H)..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "テキストファイル(&F)..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "バックアップと復元(&B)..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "削除(&E)"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "すべてのメモを選択"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "すべて選択解除(&N)"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "すべてのメモの選択を解除"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "選択反転(&I)"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "現在のメモの選択状態を反転"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "編集(&E)..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "開く(&O)"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "アプリケーションで開く(&W)..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "ファイルに保存(&S)..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "グループ化(&G)"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "グループ解除(&N)"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "一番上に移動(&T)"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "上に移動(&U)"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "下に移動(&D)"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "一番下に移動(&B)"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "テキスト(&T)"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "リンク(&L)"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "画像(&I)"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "色(&C)"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "ランチャー(&A)"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "TDE メニューからランチャーをインポート(&K)..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "アイコンをインポート(&P)..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "ファイルから読み込む(&F)..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "スクリーンから色を採取(&O)"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "スクリーンの領域を取り込む(&Z)"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "新しいバスケットを作成(&N)..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "新しい子バスケットを作成(&S)..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "新しい兄弟バスケットを作成(&B)..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "新規(&N)"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "バスケットのプロパティ"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "削除(&R)"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "パスワード保護(&W)..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "ロック(&L)"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "フィルタ(&F)"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "すべてのバスケットをフィルタ(&B)"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "フィルタをリセット(&R)"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "前のバスケット(&P)"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "次のバスケット(&N)"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "バスケットをたたむ(&F)"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "バスケットを展開(&E)"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "グローバルショートカットを設定(&G)..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "BasKet へようこそ(&W)"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "プレーンテキストメモの変換"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "プレーンテキストのメモをリッチテキストメモに変換..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "ロック中"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "メモはありません"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
 "%n notes"
 msgstr "%n 件のメモ"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
 "%n selected"
 msgstr "%n 件選択"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "すべてマッチ"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "フィルタなし"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr "%n 件マッチ"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1、%2、%3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "バスケット「%1」に色を採取しました"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "プレーンテキストのメモをリッチテキストに変換しました。"
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "変換完了"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "変換するプレーンテキストメモがありません。"
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1194,49 +1241,49 @@ msgstr ""
 "<p>ファイル basketui.rc が存在しないか、古すぎるようです。<br>%1 はそれがない"
 "と実行できないので中止します。</p><p>%2 のインストールを確認してください。</"
 "p><p>システム全体にアプリケーションをインストールする管理者権限がない場合は、"
-"ファイル basketui.rc をインストールのアーカイブからフォルダ <a href='file://%"
-"3'>%4</a> にコピーすることができます。</p><p>アプリケーションは正しくインス"
+"ファイル basketui.rc をインストールのアーカイブからフォルダ <a href='file://"
+"%3'>%4</a> にコピーすることができます。</p><p>アプリケーションは正しくインス"
 "トールされているけれども、以前にプレビューバージョンをインストールしていた場"
 "合は、最後の手段として、ファイル %5basketui.rc を削除してみてください。</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "リソースが見つかりません"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "メモを追加できません。"
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "スクリーンの領域をバスケット「%1」に取り込みました"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "バスケットを削除"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "このバスケットのみ削除"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "メモとその子を削除"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
+#: bnpview.cpp:1703 bnpview.cpp:1709
 msgid ""
 "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>本当にバスケット「%1」とその内容を削除しますか？</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "バスケットを削除"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "バスケットを削除(&R)"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
@@ -1244,43 +1291,43 @@ msgstr ""
 "<qt>「%1」には以下の子バスケットがあります。<br>それらも同時に削除しますか？"
 "</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "子バスケットを削除"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "子バスケットを削除(&R)"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "バスケットアーカイブ"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "クリップボードの内容をバスケット「%1」に貼り付けました"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "選択をバスケット「%1」に貼り付けました"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "追加されたメモはありません。"
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "バスケット「%1」はロックされています"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(ロック中)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "新しいタグを付ける(&A)..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "すべて削除(&R)"
 
@@ -1373,11 +1420,11 @@ msgstr "タグ(&A): "
 msgid "Filter all Baskets"
 msgstr "すべてのバスケットをフィルタ"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(タグなし)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(タグあり)"
 
@@ -1466,35 +1513,35 @@ msgstr "(デフォルト)"
 msgid "Other..."
 msgstr "その他..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "秘密鍵のリスト"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Eメール"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "秘密鍵を選択:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "鍵のリストは完全ではありません。"
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "その公開鍵は暗号化用ではありません"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "サポートされていないアルゴリズム"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "不正なパスワード。"
 
@@ -1534,47 +1581,56 @@ msgstr "ファイルシステム"
 msgid "File Types"
 msgstr "ファイルタイプ"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|アイコンファイル (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "開く(&O)"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr "気に入った点について開発者にコメントを送る"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr "気に入らない点について開発者にコメントを送る"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr "アプリケーションの誤った挙動について開発者にコメントを送る"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr "希望する新しい機能について開発者にコメントを送る"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "開発者にコメントを送る(&S)"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "%1のテストバージョンへようこそ。"
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "%1へようこそ。"
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "あなたのコメントはアプリケーションの改良に役立ちます。"
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1584,7 +1640,7 @@ msgstr ""
 "下にある感情を表す顔のアイコンをクリックし、気に入った点または気に入らない点"
 "を簡単に書いて送信ボタンを押してください。"
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1592,7 +1648,7 @@ msgstr ""
 "素晴らしいと思ったときは、ウィンドウのタイトルバーの下にある笑顔のアイコンを"
 "クリックし、気に入った点を簡単に書いて送信ボタンを押してください。"
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1600,7 +1656,7 @@ msgstr ""
 "いらいらしたときは、ウィンドウのタイトルバーの下にあるしかめ面のアイコンをク"
 "リックし、気に入らない点を簡単に書いて送信ボタンを押してください。"
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1609,7 +1665,7 @@ msgstr ""
 "バグを報告して頂く場合も同様です。ウィンドウの右上にある壊れたオブジェクトの"
 "アイコンをクリックし、バグの内容を書いて送信ボタンを押してください。"
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1619,26 +1675,26 @@ msgstr ""
 "れたオブジェクトのアイコンをクリックし、誤った挙動の説明を簡単に書いて送信ボ"
 "タンを押してください。"
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr "例:"
 
 # DO NOT TRANSLATE: This is an example of how to write reports.
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>I like</b> the new artwork. Very refreshing."
 
 # DO NOT TRANSLATE: This is an example of how to write reports.
-#: likeback.cpp:469
+#: likeback.cpp:470
 msgid ""
 "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 
 # DO NOT TRANSLATE: This is an example of how to write reports.
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1647,23 +1703,23 @@ msgstr ""
 "button. Nothing happens."
 
 # DO NOT TRANSLATE: This is an example of how to write reports.
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr "<b>I desire a new feature</b> allowing me to send my work by email."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "アプリケーションの改良に協力"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "メールアドレス"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "あなたのメールアドレスを入力してください。"
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1673,7 +1729,7 @@ msgstr ""
 "現方法を尋ねたり、バグの修正を送ってテストして頂くといった場合にのみ使用しま"
 "す。"
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1681,57 +1737,56 @@ msgstr ""
 "メールアドレスは必須ではありません。入力がなければコメントは匿名で送信されま"
 "す。"
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "開発者にコメントを送る"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "アプリケーションの開発者に送るコメントの内容:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "気に入った点(&L)"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "気に入らない点(&D)"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "アプリケーションの誤った挙動(&B)"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "希望する新しい機能(&F)"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "ウィンドウのタイトルバーの下にコメントボタンを表示する(&W)"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "コメントを送信(&S)"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "メールアドレス(&E)..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "%1に関するあなたの意見を簡単に書いてください。"
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "英語でお願いします。"
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr "<a href=\"%1\">オンライン翻訳ツール</a>が利用できるかもしれません。"
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1739,21 +1794,21 @@ msgstr ""
 "あなたのコメントをこのアプリケーションの改良により役立たせるために、肯定的な"
 "意見と否定的な意見を同じくらい送ってください。"
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr "新しい機能は要求しないでください: あなたの要望は無視されます。"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>報告の送信中にエラーが発生しました。</p><p>後でもう一度試してください。</"
 "p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "転送エラー"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1761,7 +1816,7 @@ msgstr ""
 "<p>あなたのコメントを送信しました。アプリケーションの改良に役立ちます。</"
 "p><p>ご協力ありがとうございました。</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "コメントを送信しました"
 
@@ -1859,19 +1914,19 @@ msgstr ""
 msgid "Example"
 msgstr "例"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "最小化"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "バスケット"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>本当に %1を終了しますか？</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1881,7 +1936,7 @@ msgstr ""
 "セッション終了時に実行されていたアプリケーションは次回ログイン時に再び起動さ"
 "れます。</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "終了の確認"
 
@@ -1952,7 +2007,7 @@ msgstr "自由"
 msgid "Mind map"
 msgstr "マインドマップ"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(画像)"
 
@@ -1976,6 +2031,11 @@ msgstr "アニメーション"
 msgid "Sound"
 msgstr "サウンド"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "ファイル(&F)"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "リンク"
@@ -1984,7 +2044,7 @@ msgstr "リンク"
 msgid "Launcher"
 msgstr "ランチャー"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "色"
 
@@ -2032,271 +2092,280 @@ msgstr "この色を編集"
 msgid "Edit this unknown object"
 msgstr "この不明なオブジェクトを編集"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "プレーンテキストを開きます..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "プレーンテキストを開きます..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "プレーンテキストをアプリケーションで開きます..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "プレーンテキストをアプリケーションで開きます..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "プレーンテキストを以下で開く:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "プレーンテキストを以下で開く:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "テキストを開きます..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "テキストを開きます..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "テキストをアプリケーションで開きます..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "テキストをアプリケーションで開きます..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "テキストを以下で開く:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "テキストを以下で開く:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "サイズ"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 x %2 ピクセル"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "画像を開きます..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "画像を開きます..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "画像をアプリケーションで開きます..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "画像をアプリケーションで開きます..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "画像を以下で開く:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "画像を以下で開く:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "クリックして実際のサイズで表示"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "アニメーションを開きます..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "アニメーションを開きます..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "アニメーションをアプリケーションで開きます..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "アニメーションをアプリケーションで開きます..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "アニメーションを以下で開く:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "アニメーションを以下で開く:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "タイプ"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "このファイルを開く"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "ファイルを開きます..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "ファイルを開きます..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "ファイルをアプリケーションで開きます..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "ファイルをアプリケーションで開きます..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "ファイルを以下で開く:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "ファイルを以下で開く:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "このサウンドを再生"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "サウンドを再生します..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "サウンドを再生します..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "サウンドをアプリケーションで再生します..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "サウンドをアプリケーションで再生します..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "サウンドを以下で再生:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "サウンドを以下で再生:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "リンク先"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "このリンクを開く"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "このリンクには開く URL がありません。"
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "リンク先を開きます..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "リンク先を開きます..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "リンク先をアプリケーションで開きます..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "リンク先をアプリケーションで開きます..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "リンク先を以下で開く:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "リンク先を以下で開く:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 (端末で実行)"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "コメント"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "コマンド"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "このアプリケーションを起動"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "このランチャーには実行するコマンドがありません。"
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "アプリケーションを起動..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "アプリケーションを起動..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "赤 (%1) 緑 (%2) 青 (%3) "
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "色相 (%1) 彩度 (%2) 明度 (%3) "
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "CSS 色名"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "CSS 拡張色名"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "ウェブ色"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "なし"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2306,11 +2375,11 @@ msgstr ""
 "Basket ノートパッドの次のバージョンには画像エディタが含まれます。\n"
 "編集できる他のアプリケーションで開きますか？"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "画像メモを編集"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2318,15 +2387,15 @@ msgstr ""
 "アニメーション画像をここで編集することはできません。\n"
 "編集できる他のアプリケーションで開きますか？"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "アニメーションメモを編集"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "色メモを編集"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2335,74 +2404,97 @@ msgstr ""
 "このメモはタイプが不明なため、ここで編集することはできませんが、\n"
 "メモを認識する他のアプリケーションにドラッグまたはコピーできます。"
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "不明なメモを編集"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "リンクメモを編集"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "自動"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "アイコン(&I):"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "リンク先(&R):"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "タイトル(&T):"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "ランチャーメモを編集"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "実行するコマンドを選択:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "推測(&G)"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "コマンド(&D):"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "名前(&N):"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "フォント(&F):"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "サイズ"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "ボールド"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "イタリック(&T)"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "下線"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "左揃え"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "中央揃え"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "右揃え"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "左右両端揃え"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2449,8 +2541,7 @@ msgstr "画像としてインポートするアイコンのサイズを選択:"
 msgid "Load File Content into a Note"
 msgstr "ファイルの内容をメモに読み込む"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "パスワード保護"
@@ -2459,135 +2550,39 @@ msgstr "パスワード保護"
 msgid "No private key selected."
 msgstr "秘密鍵が選択されていません。"
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "バスケット(&B)"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "エクスポート(&E)"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "インポート(&I)"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "移動(&G)"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "メモ(&N)"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "タグ(&T)"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "書式ツールバー"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "フィルタ(&L):"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "保護しない(&N)"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "バスケットをパスワードで保護する(&P)"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "バスケットを秘密鍵で保護する(&K):"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "左"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "右"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "バスケットツリーの位置(&B):"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "上"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "下"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "フィルタバーの位置(&F):"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "グローバルアクションの結果をバルーンを使って通知する(&U)"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "グローバルアクションって何？"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2602,7 +2597,7 @@ msgstr ""
 "す。また、そのアイコンをマウスの中ボタンでクリックすることによって、現在選択"
 "されているものをそのバスケットに貼り付けることもできます。"
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2611,7 +2606,7 @@ msgstr ""
 "めに小さなバルーンメッセージをポップアップします。このバルーンは設定で無効に"
 "することができます。"
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2621,63 +2616,63 @@ msgstr ""
 "なっています。なぜなら、あなたが実行したアクションの結果が既にメインウィンド"
 "ウに表示されているからです。"
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "システムトレイアイコン"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "システムトレイにドッキング(&D)"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "現在のバスケットのアイコンをシステムトレイに表示する(&S)"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "マウスが離れた後、次の時間が経過したらメインウィンドウを隠す(&H)"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "/10 秒"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "マウスが次の時間アイコンの上にあったらメインウィンドウを表示する(&M)"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "バスケット内の変更をアニメーション表示する(&M)"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "バスケット内でツールチップを表示する(&S)"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "大きなメモ(&B)"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "挙動"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr "* または - で始まる行をテキストエディタでリストに変換する(&T)"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "メモを削除する前に確認する(&D)"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "タグをテキストとしてエクスポートする(&E)"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "これが適用されるのは..."
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2685,14 +2680,14 @@ msgstr ""
 "これはメモをテキストエディタに「コピー&ペースト」または「ドラッグ&ドロップ」"
 "したときに適用されます。"
 
-#: settings.cpp:541
+#: settings.cpp:544
 msgid ""
 "If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "このオプションを有効にすると、タグをテキストに置き換えて貼り付けることができ"
 "ます。"
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2702,15 +2697,15 @@ msgstr ""
 "<b>[ ]</b> または <b>[x]</b> が付きます。これはそれぞれ、チェックマークが入っ"
 "ていないボックスと入っているボックスを表します。"
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "挿入ラインの右側をクリックしたときは新しいメモをグループ化する(&G)"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "新しいメモをグループ化するには..."
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2719,7 +2714,7 @@ msgstr ""
 "<p>このオプションを有効にすると、カーソル位置にメモを挿入するだけでなく、同時"
 "にカーソルの下にある既存のメモとグループ化できるようになります。</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2732,168 +2727,168 @@ msgstr ""
 "します。新しいメモは、マウスの位置によって、上または下のメモとグループ化され"
 "ます。</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "何もしない"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "クリップボードを貼り付け"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "ランチャーメモを挿入"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "スクリーンから色を挿入"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "ファイルからメモを読み込む"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "TDE メニューからランチャーをインポート"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "アイコンをインポート"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift キーを押しながらバスケット内を中クリック:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "(カーソル位置に)"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "保護されたバスケットが次の時間閉じられていたら自動的にロックする(&U)"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " 分"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "秘密鍵/公開鍵で保護されたバスケットに GnuPG エージェントを使う(&P)"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "新しいメモの場所(&P):"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "現在のメモ"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "新しい画像サイズ(&N):"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&x"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "ピクセル"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "視覚化(&V)..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "以下のファイルが追加されたらファイルの内容を表示する"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "プレーンテキスト(&P)"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "HTML ページ(&H)"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "画像とアニメーション(&I)"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "サウンド(&S)"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "会議の録音"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "年次報告"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "ホームフォルダ"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "%1を起動"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "サウンド(&S)"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "ファイル(&F)"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "ローカルリンク(&L)"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "ネットワークリンク(&N)"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "ランチャー(&H)"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "テキストメモを開くアプリケーションを指定する(&T):"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "テキストメモを開くアプリケーション:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "画像メモを開くアプリケーションを指定する(&I):"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "画像メモを開くアプリケーション:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "アニメーションメモを開くアプリケーションを指定する(&N):"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "アニメーションメモを開くアプリケーション:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "サウンドメモを開くアプリケーションを指定する(&U):"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "サウンドメモを開くアプリケーション:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2903,7 +2898,7 @@ msgstr ""
 "きます。</p><p>チェックしなかった場合は、Konqueror で設定されているアプリケー"
 "ションを使用します。</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2911,26 +2906,27 @@ msgstr ""
 "<p>このタイプのメモを開くときに Konquerur で設定されているアプリケーションの"
 "代わりに使用するアプリケーションを指定します。</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "ウェブリンクを開くアプリケーションを変更するには..."
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>コンピュータ上のファイルと同様に、ウェブリンクはその内容 (ウェブページ、画"
 "像、PDF ドキュメント...) によって異なるアプリケーションで開かれます。</p><p>"
@@ -2946,11 +2942,11 @@ msgstr ""
 "p><p>ウェブページだけを指定したブラウザで開くようにする、といったより高度な設"
 "定については、次のリンクのヘルプをお読みください。</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "ファイルとリンクを開くアプリケーションを変更するには..."
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2959,12 +2955,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>ファイルタイプ別に使用するアプリケーションを設定する方法をご説明します。こ"
 "れは、すべてのウェブリンクを常にウェブブラウザで開くように設定していない場合 "
@@ -3206,6 +3202,11 @@ msgstr "重要"
 msgid "Very Important"
 msgstr "非常に重要"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "アニメーション"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "アイデア"
@@ -3274,6 +3275,11 @@ msgstr "上に移動 (Ctrl+Shift+Up)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "下に移動 (Ctrl+Shift+Down)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "削除(&E)"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "タグ"
@@ -3438,3 +3444,112 @@ msgstr ""
 "画像のサイズを選択してください。\n"
 "ウィンドウを閉じるか Escape を\n"
 "押すと、変更が適用されます。"
+
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "バスケット(&B)"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "エクスポート(&E)"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "インポート(&I)"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "移動(&G)"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "メモ(&N)"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "タグ(&T)"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "書式ツールバー"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "書式ツールバー"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "フィルタ(&L):"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "開く(&O)"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "保護しない(&N)"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "バスケットをパスワードで保護する(&P)"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "バスケットを秘密鍵で保護する(&K):"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "英語またはフランス語でお願いします。"
diff --git a/po/nl.po b/po/nl.po
index cabd960..f6083ef 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,22 +6,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: basket\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2004-04-06 10:17+0200\n"
 "Last-Translator: Jasper van der Marel <jasper.van.der.marel@wanadoo.nl>\n"
 "Language-Team: Nederlands <Kde-i18n-nl@kde.org>\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.3.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Jasper van der Marel "
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -40,46 +41,50 @@ msgid "BasKet Note Pads"
 msgstr "Basket eigenschappen"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+msgid "Maintainer"
 msgstr ""
 
 #: aboutdata.cpp:45
-msgid "Basket encryption, Kontact integration, KnowIt importer"
+msgid "Original Author"
 msgstr ""
 
 #: aboutdata.cpp:49
+msgid "Basket encryption, Kontact integration, KnowIt importer"
+msgstr ""
+
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
 msgstr ""
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 #, fuzzy
 msgid "Icon"
 msgstr "&Pictogram :"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr ""
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr ""
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr ""
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr ""
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr ""
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -88,40 +93,40 @@ msgid ""
 "original one."
 msgstr ""
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
 msgstr ""
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr ""
 
-#: backup.cpp:65
+#: backup.cpp:67
 #, fuzzy
 msgid "Save Folder"
 msgstr "Laden van een bestan&d "
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr ""
 
-#: backup.cpp:69
+#: backup.cpp:71
 #, fuzzy
 msgid "&Move to Another Folder..."
 msgstr "Laden van een bestan&d "
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr ""
 
-#: backup.cpp:71
+#: backup.cpp:73
 #, fuzzy
 msgid "Why to do that?"
 msgstr "Naar selectie kopirëen"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -135,152 +140,152 @@ msgid ""
 "to the basket).</p>"
 msgstr ""
 
-#: backup.cpp:89
+#: backup.cpp:91
 msgid "Backups"
 msgstr ""
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr ""
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr ""
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr ""
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr ""
 
-#: backup.cpp:124
+#: backup.cpp:126
 #, fuzzy
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Een nieuwe basket maken"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr ""
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr ""
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr ""
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr ""
 
-#: backup.cpp:155
+#: backup.cpp:157
 #, fuzzy
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Een nieuwe basket maken"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
 msgstr ""
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr ""
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr ""
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr ""
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 #, fuzzy
 msgid "Backup Baskets"
 msgstr "Basket ont-/vergrendelen"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr ""
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr ""
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr ""
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr ""
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr ""
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
 msgstr ""
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr ""
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
 msgstr ""
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
 msgstr ""
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr ""
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
 msgstr ""
 
-#: backup.cpp:257
+#: backup.cpp:259
 #, fuzzy
 msgid "Restore Baskets"
 msgstr "Nieuwe basket"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr ""
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr ""
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -302,261 +307,297 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr ""
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr ""
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr ""
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr ""
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr ""
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr ""
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr ""
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 #, fuzzy
 msgid "Dropped to basket <i>%1</i>"
 msgstr "(%1) naar basket <i>%2</i> overgebracht"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
 msgstr ""
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
 msgstr ""
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr ""
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr ""
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 #, fuzzy
 msgid "Resize this note"
 msgstr "Bevestig verwijderen"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 #, fuzzy
 msgid "Select or move this note"
 msgstr "Bevestig verwijderen"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr ""
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 #, fuzzy
 msgid "Assign or remove tags from this note"
 msgstr "Bevestig verwijderen"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr ""
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr ""
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr ""
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr ""
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
 msgstr ""
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
 msgstr ""
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr ""
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr ""
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr ""
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr ""
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr ""
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 #, fuzzy
 msgid "&Unlock"
 msgstr "\"%1\" &vergrendelen"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr ""
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr ""
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr ""
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
 msgstr ""
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr ""
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "Nieuwe basket"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 #, fuzzy
 msgid "&Customize..."
 msgstr "&Voorbeeld...."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr ""
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr ""
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 #, fuzzy
 msgid "Tags"
 msgstr "Doel bewaren"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, fuzzy, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
 "<qt>Do you really want to delete those <b>%n</b> notes?</qt>"
 msgstr "<qt>Echt  <b>%1</b>' verwijderen ?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
 msgstr ""
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 #, fuzzy
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
 msgstr "Naar klembord kopirëen "
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 #, fuzzy
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
 msgstr "Naar klembord kopirëen "
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 #, fuzzy
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
 msgstr "Naar selectie kopirëen"
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 #, fuzzy
 msgid "Unable to open this note."
 msgstr "Bevestig verwijderen"
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr ""
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 #, fuzzy
 msgid "Save to File"
 msgstr "Laden van een bestan&d "
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr ""
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 #, fuzzy
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Klembordinhoud (%1) geplakt naar basket <i>%2</i>"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 #, fuzzy
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Selectie (%1) geplakt naar basket <i>%2</i>"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr ""
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr ""
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
 msgstr ""
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
 msgstr ""
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr ""
 
+#: basket_options.h:30
+msgid "Show the debug window"
+msgstr "Toon debug venster"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"Hoofdvenster verbergen bij het sluiten van het venster (in plaats van de "
+"toepassing af te sluiten)"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+msgid "Open basket archive or template"
+msgstr ""
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr ""
@@ -591,11 +632,16 @@ msgstr ""
 msgid "Basket Properties"
 msgstr "Basket eigenschappen"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 #, fuzzy
 msgid "Name"
 msgstr "&Naam :"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+#, fuzzy
+msgid "Appearance"
+msgstr "&Uiterlijk :"
+
 #: basketproperties.cpp:76
 #, fuzzy
 msgid "Background &image:"
@@ -686,29 +732,29 @@ msgstr ""
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr ""
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 #, fuzzy
 msgid "General"
 msgstr "Gecentreerd"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 #, fuzzy
 msgid "Show/hide main window"
 msgstr "Hoofdvenster tonen/verbergen"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 #, fuzzy
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr "Hoofdvenster tonen wanneer verborgen, verbergen wanneer zichtbaar."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 #, fuzzy
 msgid "Paste clipboard contents in current basket"
 msgstr "Klembordinhoud plakkenn in de huidige basket"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 #, fuzzy
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
@@ -717,22 +763,22 @@ msgstr ""
 "Klembordinhoud plakken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr ""
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 #, fuzzy
 msgid "Allows you to know basket is current without opening the main window."
 msgstr ""
 "Klembordinhoud plakken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Selectie plakken in de huidige basket"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 #, fuzzy
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
@@ -740,11 +786,11 @@ msgid ""
 msgstr ""
 "Selectie plakken in de huidige basket zonder het hoofdvenster te openen."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Een nieuwe basket maken"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 #, fuzzy
 msgid ""
 "Allows you to create a new basket without having to open the main window "
@@ -755,33 +801,33 @@ msgstr ""
 "globale snelkoppelingen worden gebruikt op een item toe te voegen, de "
 "klembordinhoud of een selectie te plakken in deze nieuwe basket)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Naar eerdere basket gaan"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 #, fuzzy
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
 msgstr "Naar een eerdere basket gaan zonder het hoofdvenster te openen."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Naar volgende basket gaan"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 #, fuzzy
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
 msgstr "Naar een volgende basket gaan zonder het hoofdvenster te openen."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr ""
 
-#: bnpview.cpp:265
+#: bnpview.cpp:308
 #, fuzzy
 msgid ""
 "Add a text note to the current basket without having to open the main window."
@@ -789,11 +835,11 @@ msgstr ""
 "Een nieuwe item aanmaken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr ""
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 #, fuzzy
 msgid ""
 "Add an image note to the current basket without having to open the main "
@@ -802,11 +848,11 @@ msgstr ""
 "Een nieuwe item aanmaken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr ""
 
-#: bnpview.cpp:273
+#: bnpview.cpp:316
 #, fuzzy
 msgid ""
 "Add a link note to the current basket without having to open the main window."
@@ -814,11 +860,11 @@ msgstr ""
 "Een nieuwe item aanmaken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr ""
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 #, fuzzy
 msgid ""
 "Add a color note to the current basket without having to open the main "
@@ -827,11 +873,11 @@ msgstr ""
 "Een nieuwe item aanmaken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr ""
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 #, fuzzy
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
@@ -840,11 +886,11 @@ msgstr ""
 "Een nieuwe item aanmaken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr ""
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 #, fuzzy
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
@@ -853,16 +899,12 @@ msgstr ""
 "Een nieuwe item aanmaken in de huidige basket zonder het hoofdvenster te "
 "openen."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 #, fuzzy
 msgid "Baskets"
 msgstr "BasKet"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr ""
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -870,324 +912,329 @@ msgid ""
 "clicking a basket to open it, or reorganize them using drag and drop."
 msgstr ""
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 #, fuzzy
 msgid "&Basket Archive..."
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 #, fuzzy
 msgid "&Hide Window"
 msgstr "Hoofdvenster &verbergen"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr ""
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 #, fuzzy
 msgid "K&Notes"
 msgstr "Item toevoegen"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr ""
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr ""
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr ""
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr ""
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 #, fuzzy
 msgid "&Tomboy"
 msgstr "maal"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 #, fuzzy
 msgid "Text &File..."
 msgstr "Laden van een bestan&d "
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr ""
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr ""
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr ""
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr ""
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr ""
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr ""
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr ""
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr ""
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 #, fuzzy
 msgid "&Open"
 msgstr "&Openen %1"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 #, fuzzy
 msgid "Open &With..."
 msgstr "Openen &met...%1"
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 #, fuzzy
 msgid "&Save to File..."
 msgstr "Laden van een bestan&d "
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr ""
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr ""
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr ""
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr ""
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr ""
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 #, fuzzy
 msgid "Move on &Bottom"
 msgstr "Onderaan"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Tekst"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 #, fuzzy
 msgid "&Link"
 msgstr "Verwijzing"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 #, fuzzy
 msgid "&Image"
 msgstr "Afbeelding"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 #, fuzzy
 msgid "&Color"
 msgstr "Kleur"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr ""
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr ""
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 #, fuzzy
 msgid "Im&port Icon..."
 msgstr "Een pictogram im&porteren van"
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 #, fuzzy
 msgid "Load From &File..."
 msgstr "Laden van een bestan&d "
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr ""
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr ""
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 #, fuzzy
 msgid "&New Basket..."
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 #, fuzzy
 msgid "New &Sub-Basket..."
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 #, fuzzy
 msgid "New Si&bling Basket..."
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 #, fuzzy
 msgid "&New"
 msgstr "&Nieuwe basket..."
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Basket eigenschappen"
+
+#: bnpview.cpp:581
 #, fuzzy
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr ""
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 #, fuzzy
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr ""
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 #, fuzzy
 msgid "Filter all &Baskets"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr ""
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 #, fuzzy
 msgid "&Previous Basket"
 msgstr "Naar eerdere basket gaan"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 #, fuzzy
 msgid "&Next Basket"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 #, fuzzy
 msgid "&Fold Basket"
 msgstr "BasKet"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 #, fuzzy
 msgid "&Expand Basket"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 #, fuzzy
 msgid "Configure &Global Shortcuts..."
 msgstr "&Globale snelkoppelingen instellen..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 #, fuzzy
 msgid "&Welcome Baskets"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr ""
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr ""
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr ""
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 #, fuzzy
 msgid "No notes"
 msgstr "Item toevoegen"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
 "%n notes"
 msgstr ""
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
 "%n selected"
 msgstr ""
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr ""
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 #, fuzzy
 msgid "no filter"
 msgstr "Item toevoegen"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr ""
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr ""
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 #, fuzzy
 msgid "Picked color to basket <i>%1</i>"
 msgstr "(%1) naar basket <i>%2</i> overgebracht"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr ""
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr ""
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr ""
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1198,97 +1245,97 @@ msgid ""
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr ""
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr ""
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 #, fuzzy
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "(%1) naar basket <i>%2</i> overgebracht"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 #, fuzzy
 msgid "Delete Basket"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 #, fuzzy
 msgid "Delete Only that Basket"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr ""
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
+#: bnpview.cpp:1703 bnpview.cpp:1709
 #, fuzzy
 msgid ""
 "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>Echt  <b>%1</b>' verwijderen ?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 #, fuzzy
 msgid "Remove Basket"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 #, fuzzy
 msgid "&Remove Basket"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
 msgstr ""
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 #, fuzzy
 msgid "Remove Children Baskets"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 #, fuzzy
 msgid "&Remove Children Baskets"
 msgstr "Nieuwe basket"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 #, fuzzy
 msgid "Basket Archives"
 msgstr "Basket eigenschappen"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 #, fuzzy
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Klembordinhoud (%1) geplakt naar basket <i>%2</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 #, fuzzy
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Selectie (%1) geplakt naar basket <i>%2</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr ""
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr ""
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr ""
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr ""
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 #, fuzzy
 msgid "&Remove All"
 msgstr "Nieuwe basket"
@@ -1371,11 +1418,11 @@ msgstr "Doel bewaren"
 msgid "Filter all Baskets"
 msgstr "Nieuwe basket"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr ""
 
-#: filter.cpp:150
+#: filter.cpp:152
 #, fuzzy
 msgid "(Tagged)"
 msgstr "Afbeelding"
@@ -1460,36 +1507,36 @@ msgstr ""
 msgid "Other..."
 msgstr ""
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr ""
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr ""
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr ""
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 #, fuzzy
 msgid "Choose a secret key:"
 msgstr "Een nieuwe basket maken"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr ""
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr ""
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr ""
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr ""
 
@@ -1533,204 +1580,212 @@ msgstr "Bestands&naam :"
 msgid "File Types"
 msgstr ""
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr ""
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Openen %1"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr ""
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr ""
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr ""
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr ""
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr ""
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr ""
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
 "or dislike and click Send."
 msgstr ""
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
 msgstr ""
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
 msgstr ""
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
 "Send."
 msgstr ""
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
 "and click Send."
 msgstr ""
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr ""
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr ""
 
-#: likeback.cpp:469
+#: likeback.cpp:470
 msgid ""
 "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
 msgstr ""
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr ""
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr ""
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr ""
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
 "corrections for you to test, etc."
 msgstr ""
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
 msgstr ""
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr ""
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr ""
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr ""
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr ""
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr ""
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr ""
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr ""
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr ""
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr ""
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr ""
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr ""
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr ""
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
 msgstr ""
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr ""
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
 msgstr ""
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr ""
 
@@ -1824,28 +1879,28 @@ msgstr ""
 msgid "Example"
 msgstr ""
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr ""
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 #, fuzzy
 msgid "Basket"
 msgstr "BasKet"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 #, fuzzy
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "Basket echt afsluiten ?"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
 "the application will be reloaded the next time you log in.</p>"
 msgstr ""
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 #, fuzzy
 msgid "Quit Confirm"
 msgstr "Afsluiten bevestigen"
@@ -1914,7 +1969,7 @@ msgstr ""
 msgid "Mind map"
 msgstr ""
 
-#: note.cpp:2818
+#: note.cpp:2830
 #, fuzzy
 msgid "(Image)"
 msgstr "Afbeelding"
@@ -1941,6 +1996,10 @@ msgstr "Aan&tekeningen :"
 msgid "Sound"
 msgstr ""
 
+#: notecontent.cpp:178 systemtray.cpp:83
+msgid "File"
+msgstr ""
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Verwijzing"
@@ -1949,7 +2008,7 @@ msgstr "Verwijzing"
 msgid "Launcher"
 msgstr ""
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Kleur"
 
@@ -2000,423 +2059,453 @@ msgstr ""
 msgid "Edit this unknown object"
 msgstr "Koppeling naar &toepassing"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 #, fuzzy
 msgid "Opening plain text..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 #, fuzzy
 msgid "Opening plain texts..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 #, fuzzy
 msgid "Opening plain text with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 #, fuzzy
 msgid "Opening plain texts with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 #, fuzzy
 msgid "Open plain text with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 #, fuzzy
 msgid "Open plain texts with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 #, fuzzy
 msgid "Opening text..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 #, fuzzy
 msgid "Opening texts..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 #, fuzzy
 msgid "Opening text with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 #, fuzzy
 msgid "Opening texts with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 #, fuzzy
 msgid "Open text with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 #, fuzzy
 msgid "Open texts with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr ""
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1  maal '%2  pixels"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 #, fuzzy
 msgid "Opening image..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 #, fuzzy
 msgid "Opening images..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 #, fuzzy
 msgid "Opening image with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 #, fuzzy
 msgid "Opening images with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 #, fuzzy
 msgid "Open image with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 #, fuzzy
 msgid "Open images with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr ""
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 #, fuzzy
 msgid "Opening animation..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 #, fuzzy
 msgid "Opening animations..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 #, fuzzy
 msgid "Opening animation with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 #, fuzzy
 msgid "Opening animations with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr ""
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr ""
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr ""
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 #, fuzzy
 msgid "Open this file"
 msgstr "Naar volgende basket gaan"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 #, fuzzy
 msgid "Opening file..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 #, fuzzy
 msgid "Opening files..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 #, fuzzy
 msgid "Opening file with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 #, fuzzy
 msgid "Opening files with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 #, fuzzy
 msgid "Open file with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 #, fuzzy
 msgid "Open files with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 #, fuzzy
 msgid "Open this sound"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 #, fuzzy
 msgid "Opening sound..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 #, fuzzy
 msgid "Opening sounds..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 #, fuzzy
 msgid "Opening sound with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 #, fuzzy
 msgid "Opening sounds with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 #, fuzzy
 msgid "Open sound with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 #, fuzzy
 msgid "Open sounds with:"
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 #, fuzzy
 msgid "Target"
 msgstr "Doel bewaren"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 #, fuzzy
 msgid "Open this link"
 msgstr "Naar volgende basket gaan"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr ""
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 #, fuzzy
 msgid "Opening link target..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 #, fuzzy
 msgid "Opening link targets..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 #, fuzzy
 msgid "Opening link target with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 #, fuzzy
 msgid "Opening link targets with..."
 msgstr "Openen &met...%1"
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr ""
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr ""
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr ""
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr ""
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr ""
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr ""
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr ""
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr ""
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr ""
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr ""
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr ""
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr ""
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr ""
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr ""
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr ""
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr ""
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+msgid "No"
+msgstr ""
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
 "Do you want to open it with an application that understand it?"
 msgstr ""
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 #, fuzzy
 msgid "Edit Image Note"
 msgstr "Item en eigenschappen bewerken"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
 msgstr ""
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 #, fuzzy
 msgid "Edit Animation Note"
 msgstr "Aan&tekeningen :"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr ""
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
 "it."
 msgstr ""
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 #, fuzzy
 msgid "Edit Unknown Note"
 msgstr "Aan&tekeningen :"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 #, fuzzy
 msgid "Edit Link Note"
 msgstr "Aan&tekeningen :"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Automatisch"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 #, fuzzy
 msgid "&Icon:"
 msgstr "&Pictogram :"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 #, fuzzy
 msgid "Ta&rget:"
 msgstr "Doel bewaren"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 #, fuzzy
 msgid "&Title:"
 msgstr "&Titel :"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 #, fuzzy
 msgid "Edit Launcher Note"
 msgstr "Koppeling naar &toepassing"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr ""
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr ""
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr ""
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 #, fuzzy
 msgid "&Name:"
 msgstr "&Naam :"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Pictogram :"
+
+#: noteedit.cpp:815
+msgid "Font Size"
+msgstr ""
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Vet"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Schuin"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Onderlijnd"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr ""
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Gecentreerd"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 #, fuzzy
 msgid "Align Right"
 msgstr "Rechts"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 #, fuzzy
 msgid "Justified"
 msgstr "Uitgevuld"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2458,8 +2547,7 @@ msgstr ""
 msgid "Load File Content into a Note"
 msgstr ""
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr ""
@@ -2468,140 +2556,44 @@ msgstr ""
 msgid "No private key selected."
 msgstr ""
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, fuzzy, no-c-format
-msgid "&Basket"
-msgstr "BasKet"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr ""
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr ""
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr ""
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, fuzzy, no-c-format
-msgid "&Note"
-msgstr "Item toevoegen"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, fuzzy, no-c-format
-msgid "&Tags"
-msgstr "Doel bewaren"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr ""
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr ""
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, fuzzy, no-c-format
-msgid "Fi&lter:"
-msgstr "Bestands&naam :"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr ""
-
-#: settings.cpp:367
+#: settings.cpp:370
 #, fuzzy
 msgid "On left"
 msgstr "Bovenaan"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr ""
 
-#: settings.cpp:369
+#: settings.cpp:372
 #, fuzzy
 msgid "&Basket tree position:"
 msgstr "Items neer&zetten op muispositie"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 #, fuzzy
 msgid "On top"
 msgstr "Bovenaan"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 #, fuzzy
 msgid "On bottom"
 msgstr "Onderaan"
 
-#: settings.cpp:378
+#: settings.cpp:381
 #, fuzzy
 msgid "&Filter bar position:"
 msgstr "Items neer&zetten op muispositie"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr ""
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr ""
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2610,123 +2602,123 @@ msgid ""
 "middle mouse button on that icon to paste the current selection."
 msgstr ""
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
 msgstr ""
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
 "the main window."
 msgstr ""
 
-#: settings.cpp:402
+#: settings.cpp:405
 #, fuzzy
 msgid "System Tray Icon"
 msgstr "Systeemvak pictogram"
 
-#: settings.cpp:407
+#: settings.cpp:410
 #, fuzzy
 msgid "&Dock in system tray"
 msgstr "Programma in systeemvak tonen"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr ""
 
-#: settings.cpp:426
+#: settings.cpp:429
 #, fuzzy
 msgid "&Hide main window when mouse leaves it for"
 msgstr ""
 "Hoofdvenster verbergen bij het sluiten van het venster (in plaats van de "
 "toepassing af te sluiten)"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "Tienden van seconden"
 
-#: settings.cpp:437
+#: settings.cpp:440
 #, fuzzy
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr ""
 "Hoofdvenster verbergen bij het sluiten van het venster (in plaats van de "
 "toepassing af te sluiten)"
 
-#: settings.cpp:511
+#: settings.cpp:514
 #, fuzzy
 msgid "Ani&mate changes in baskets"
 msgstr "Een nieuwe basket maken"
 
-#: settings.cpp:514
+#: settings.cpp:517
 #, fuzzy
 msgid "&Show tooltips in baskets"
 msgstr ""
 "Tooltips onmiddelijk laten zien (inclusief alle aantekeningen bij "
 "objecten...)"
 
-#: settings.cpp:517
+#: settings.cpp:520
 #, fuzzy
 msgid "&Big notes"
 msgstr "Item toevoegen"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr ""
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr ""
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr ""
 
-#: settings.cpp:533
+#: settings.cpp:536
 #, fuzzy
 msgid "&Export tags in texts"
 msgstr "Koppeling naar &toepassing"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr ""
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
 msgstr ""
 
-#: settings.cpp:541
+#: settings.cpp:544
 msgid ""
 "If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
 "empty checkbox and a checked box."
 msgstr ""
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr ""
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr ""
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
 "with the one under the cursor:</p>"
 msgstr ""
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2734,219 +2726,219 @@ msgid ""
 "or above</b>, depending on where your mouse is.</p>"
 msgstr ""
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr ""
 
-#: settings.cpp:575
+#: settings.cpp:578
 #, fuzzy
 msgid "Paste clipboard"
 msgstr "Naar klembord kopirëen "
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr ""
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr ""
 
-#: settings.cpp:582
+#: settings.cpp:585
 #, fuzzy
 msgid "Load note from file"
 msgstr "Laden van een bestan&d "
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr ""
 
-#: settings.cpp:584
+#: settings.cpp:587
 #, fuzzy
 msgid "Import icon"
 msgstr "Een pictogram im&porteren van"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr ""
 
-#: settings.cpp:588
+#: settings.cpp:591
 #, fuzzy
 msgid "at cursor position"
 msgstr "Items neer&zetten op muispositie"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr ""
 
-#: settings.cpp:603
+#: settings.cpp:606
 #, fuzzy
 msgid " minutes"
 msgstr "Item toevoegen"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr ""
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr ""
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr ""
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr ""
 
-#: settings.cpp:718
+#: settings.cpp:721
 #, fuzzy
 msgid "&by"
 msgstr "maal"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pixels"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Voorbeeld...."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr ""
 
-#: settings.cpp:732
+#: settings.cpp:735
 #, fuzzy
 msgid "&Plain text"
 msgstr "Opgemaakte tekst (HTML)"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr ""
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr ""
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr ""
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr ""
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr ""
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr ""
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, fuzzy, c-format
 msgid "Launch %1"
 msgstr "BasKet"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr ""
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr ""
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr ""
 
-#: settings.cpp:802
+#: settings.cpp:805
 #, fuzzy
 msgid "&Network Links"
 msgstr "Uiterlijk van &netwerk verwijzingen :"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr ""
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:841
+#: settings.cpp:844
 #, fuzzy
 msgid "Open text notes with:"
 msgstr "Openen &met...%1"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:849
+#: settings.cpp:852
 #, fuzzy
 msgid "Open image notes with:"
 msgstr "Openen &met...%1"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:857
+#: settings.cpp:860
 #, fuzzy
 msgid "Open animation notes with:"
 msgstr "Openen &met...%1"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:865
+#: settings.cpp:868
 #, fuzzy
 msgid "Open sound notes with:"
 msgstr "Openen &met...%1"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
 msgstr ""
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
 msgstr ""
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr ""
 
-#: settings.cpp:904
+#: settings.cpp:907
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
-msgstr ""
-
-#: settings.cpp:922
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
+msgstr ""
+
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr ""
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2955,12 +2947,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 
 #: softwareimporters.cpp:45
@@ -3193,6 +3185,11 @@ msgstr ""
 msgid "Very Important"
 msgstr ""
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Aan&tekeningen :"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr ""
@@ -3263,6 +3260,11 @@ msgstr ""
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr ""
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "Nieuwe basket"
+
 #: tagsedit.cpp:375
 #, fuzzy
 msgid "Tag"
@@ -3436,6 +3438,112 @@ msgid ""
 "and close it or press Escape to accept changes."
 msgstr ""
 
+#: basket_part.rc:5 basketui.rc:5
+#, fuzzy, no-c-format
+msgid "&Basket"
+msgstr "BasKet"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr ""
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr ""
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr ""
+
+#: basket_part.rc:58 basketui.rc:61
+#, fuzzy, no-c-format
+msgid "&Note"
+msgstr "Item toevoegen"
+
+#: basket_part.rc:73 basketui.rc:76
+#, fuzzy, no-c-format
+msgid "&Tags"
+msgstr "Doel bewaren"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr ""
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr ""
+
+#: kicondialogui.ui:105
+#, fuzzy, no-c-format
+msgid "Fi&lter:"
+msgstr "Bestands&naam :"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Openen %1"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr ""
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr ""
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr ""
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr ""
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr ""
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr ""
+
 #, fuzzy
 #~ msgid "I dislike..."
 #~ msgstr "&Voorbeeld...."
@@ -3445,10 +3553,6 @@ msgstr ""
 #~ msgstr "&Voorbeeld...."
 
 #, fuzzy
-#~ msgid "Remo&ve"
-#~ msgstr "Nieuwe basket"
-
-#, fuzzy
 #~ msgid ""
 #~ "Add a rich text note to the current basket without having to open main "
 #~ "window."
@@ -3488,15 +3592,6 @@ msgstr ""
 #~ msgid "Open rich text notes with:"
 #~ msgstr "Openen &met...%1"
 
-#~ msgid "Show the debug window"
-#~ msgstr "Toon debug venster"
-
-#, fuzzy
-#~ msgid "Hide the main window in the system tray icon on startup"
-#~ msgstr ""
-#~ "Hoofdvenster verbergen bij het sluiten van het venster (in plaats van de "
-#~ "toepassing af te sluiten)"
-
 #, fuzzy
 #~ msgid "C&hange..."
 #~ msgstr "&Bladeren..."
@@ -3745,10 +3840,6 @@ msgstr ""
 #~ msgstr "Nieuwe basket..."
 
 #, fuzzy
-#~ msgid "A&ppearance:"
-#~ msgstr "&Uiterlijk :"
-
-#, fuzzy
 #~ msgid "Icon name: %1"
 #~ msgstr "&Pictogram :"
 
diff --git a/po/nn.po b/po/nn.po
index 842359c..00e8946 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,23 +4,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-01-22 20:19+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Karl Ove Hufthammer"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -32,7 +33,8 @@ msgid ""
 "makes it easy to record ideas as you think, and quickly find them later. "
 "Organizing your notes has never been so easy.</p>"
 msgstr ""
-"<p><b>Ta vare på tankane dine.</b></p><p>Eit notatprogram som gjer det enkelt å skriva ned idéar og finna dei att seinare. Det har aldri vore "
+"<p><b>Ta vare på tankane dine.</b></p><p>Eit notatprogram som gjer det "
+"enkelt å skriva ned idéar og finna dei att seinare. Det har aldri vore "
 "lettare å halda orden i sysakene.</p>"
 
 #: aboutdata.cpp:34
@@ -40,14 +42,19 @@ msgid "BasKet Note Pads"
 msgstr "Korgnotat"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Forfattar og vedlikeheldar."
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Krypteringsstøtte, Kontakt-integrering og KnowIt-import."
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -55,71 +62,79 @@ msgstr ""
 "Automatisk låsing, lagrestatusikon, kopiering og innliming av HTML, "
 "verktøytips for korgnamn og dra-og-slepp-støtte."
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Ikon."
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Lagra som korgarkiv"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Lagrar som korgarkiv. Vent litt …"
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Denne fila er ikkje eit korgarkiv."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Korgarkivfeil"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Fila er øydelagd, og kan ikkje opnast."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
 "missing because they are of a type only available in new versions. When "
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
-msgstr "Denne fila vart lagra i ein nyare versjon av %1 enn du brukar. Fila kan opnast, men det er ikkje sikkert all informasjonen i ho vert tilgjengeleg. Det kan for eksempel vera at nokre notat manglar på grunn av at dei er av ein type som berre er tilgjengeleg i nye versjonar. Når du skal lagra fila, bør du vurdera å lagra ho under eit anna filnamn, slik at originalen ikkje går tapt."
+msgstr ""
+"Denne fila vart lagra i ein nyare versjon av %1 enn du brukar. Fila kan "
+"opnast, men det er ikkje sikkert all informasjonen i ho vert tilgjengeleg. "
+"Det kan for eksempel vera at nokre notat manglar på grunn av at dei er av "
+"ein type som berre er tilgjengeleg i nye versjonar. Når du skal lagra fila, "
+"bør du vurdera å lagra ho under eit anna filnamn, slik at originalen ikkje "
+"går tapt."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
-msgstr "Denne fila vart lagra i ein nyare versjon av %1 enn du brukar. Du må oppgradera til den nye versjonen for å kunna opna fila."
+msgstr ""
+"Denne fila vart lagra i ein nyare versjon av %1 enn du brukar. Du må "
+"oppgradera til den nye versjonen for å kunna opna fila."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Reservekopiar og gjenoppretting"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Lagringsmappe"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Korgene dine vert no lagra i mappa:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&Flytt til ei anna mappe …"
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Bruk ei gammal mappe …"
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Korfor gjera dette?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -132,155 +147,180 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>Du kan flytta mappa der %1 lagrar korgene dine, av forskjellige grunnar:</p><ul><li>Lagra korgene i ein synleg plass i heimemappa, som for eksempel «~/Dokument/Notat/» eller «~/Korger».</li><li>Lagra korgene på ein tenar for å dela dei mellom fleire maskiner.<br>I dette tilfellet må du montera den delte fila til det lokale filsystemet, og be %2 brukar dette monteringspunktet.<br>Åtvaring: Ikkje finn på å køyra %3 samtidig på begge maskinene, då dette kan føra til tap av data."
-"</li></ul><p>Hugs at du ikkje må endra innhaldet i den mappa manuelt. (Viss du for eksempel legg til ei fil i ei korgmappe, vert ikkje denne lagt til korga.)</p>"
-
-#: backup.cpp:89
+"<p>Du kan flytta mappa der %1 lagrar korgene dine, av forskjellige grunnar:</"
+"p><ul><li>Lagra korgene i ein synleg plass i heimemappa, som for eksempel «~/"
+"Dokument/Notat/» eller «~/Korger».</li><li>Lagra korgene på ein tenar for å "
+"dela dei mellom fleire maskiner.<br>I dette tilfellet må du montera den "
+"delte fila til det lokale filsystemet, og be %2 brukar dette "
+"monteringspunktet.<br>Åtvaring: Ikkje finn på å køyra %3 samtidig på begge "
+"maskinene, då dette kan føra til tap av data.</li></ul><p>Hugs at du ikkje "
+"må endra innhaldet i den mappa manuelt. (Viss du for eksempel legg til ei "
+"fil i ei korgmappe, vert ikkje denne lagt til korga.)</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Reservekopiar"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Ta reservekopi …"
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Gjenopprett frå reservekopi …"
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Siste reservekopi: aldri"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Siste reservekopi: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Vel mappa du vil flytta korgene til"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "Mappa <b>%1</b> er ikkje tom. Ønskjer du å overskriva ho?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Vil du overskriva mappa?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "&Overskriv"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Korgene er no flytte til <b>%1</b>. %2 vert starta på nytt for at desse endringane skal trå i kraft."
+msgstr ""
+"Korgene er no flytte til <b>%1</b>. %2 vert starta på nytt for at desse "
+"endringane skal trå i kraft."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Vel ei gammal mappe til å lagra korgene i"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
-msgstr "Lagringsmappa er no flytt til <b>%1</b>. %2 vert starta på nytt for at desse endringane skal trå i kraft."
+msgstr ""
+"Lagringsmappa er no flytt til <b>%1</b>. %2 vert starta på nytt for at desse "
+"endringane skal trå i kraft."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Korger_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Tar-arkiv komprimert med Gzip"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Alle filer"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Reservekopiering"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
-msgstr "Fila <b>%1</b> finst allereie. Er du sikker på at du vil skriva over ho?"
+msgstr ""
+"Fila <b>%1</b> finst allereie. Er du sikker på at du vil skriva over ho?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Skriva over?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Lagrar reservekopi av korger. Vent litt …"
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Opna korgarkiv"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "LESMEG.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Dette er ein reservekopi av korgene dine slik dei var før du begynte å gjenoppretta frå reservekopien %1."
+msgstr ""
+"Dette er ein reservekopi av korgene dine slik dei var før du begynte å "
+"gjenoppretta frå reservekopien %1."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr "Viss gjenopprettinga gjekk bra, kan du fjerna denne mappa."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Viss noko gjekk galt under gjenopprettinga, kan du bruka denne mappa til å lagra korgene dine i, slik at ingenting går tapt."
+msgstr ""
+"Viss noko gjekk galt under gjenopprettinga, kan du bruka denne mappa til å "
+"lagra korgene dine i, slik at ingenting går tapt."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Vel «Korg | Reservekopiar og gjenoppretting | Bruk ei gammal mappe» og vel den mappa."
+msgstr ""
+"Vel «Korg | Reservekopiar og gjenoppretting | Bruk ei gammal mappe» og vel "
+"den mappa."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Gjenopprettar <b>%1</b>. Vent litt …"
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr "Viss noko går galt under gjenopprettingsprosessen, bør du lesa fila <b>%1</b>."
+msgstr ""
+"Viss noko går galt under gjenopprettingsprosessen, bør du lesa fila <b>%1</"
+"b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Gjenopprett korger"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
-msgstr "Dette arkivet er anten ikkje ein reservekopi av korger, eller så er det øydelagt. Du kan derfor ikkje opna arkivet, og dei gamle korgene dine er framleis gjeldande."
+msgstr ""
+"Dette arkivet er anten ikkje ein reservekopi av korger, eller så er det "
+"øydelagt. Du kan derfor ikkje opna arkivet, og dei gamle korgene dine er "
+"framleis gjeldande."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Gjenopprettingsfeil"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Reservekopien din har blitt gjenoppretta til <b>%1</b>. %2 vert no starta på nytt for at desse endringane skal trå i kraft."
+msgstr ""
+"Reservekopien din har blitt gjenoppretta til <b>%1</b>. %2 vert no starta på "
+"nytt for at desse endringane skal trå i kraft."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -298,39 +338,43 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Korger før gjenoppretting (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
-msgstr "Det nye notatet er ikkje i samsvar med filteret, og vert derfor skjult."
+msgstr ""
+"Det nye notatet er ikkje i samsvar med filteret, og vert derfor skjult."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
-msgstr "Eit nytt notatet er ikkje i samsvar med filteret, og vert derfor skjult."
+msgstr ""
+"Eit nytt notatet er ikkje i samsvar med filteret, og vert derfor skjult."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
-msgstr "Nokre nye notat er ikkje i samsvar med filteret, og vert derfor skjulte."
+msgstr ""
+"Nokre nye notat er ikkje i samsvar med filteret, og vert derfor skjulte."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
-msgstr "Dei nye notata er ikkje i samsvar med filteret, og vert derfor skjulte."
+msgstr ""
+"Dei nye notata er ikkje i samsvar med filteret, og vert derfor skjulte."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Grupper"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Set inn"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "La i korga <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -338,7 +382,7 @@ msgstr ""
 "Denne meldinga skal aldri visast. Viss ho vert vist, er det ein feil i "
 "programmet. Meld derfor frå til utviklaren."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -346,48 +390,48 @@ msgstr ""
 "Sett inn notat her.\n"
 "Høgreklikk for fleire val."
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Endra storleik på kolonnane."
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Endra storleik på gruppa."
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Endra storleik på notatet."
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Merk eller flytt dette notatet."
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Merk eller flytt denne gruppa."
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Legg til eller fjern merke­lappar på dette notatet."
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Merkelappar</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Utvida gruppa."
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Slå saman gruppa."
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -395,7 +439,7 @@ msgstr ""
 "Grupper med notatet nedanfor.\n"
 "Høgreklikk for fleire val."
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -403,46 +447,46 @@ msgstr ""
 "Grupper med notatet ovanfor.\n"
 "Høgreklikk for fleire val."
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Lagt til"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Siste endring"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Trykk til høgre for å gruppera i staden for å setja inn."
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Trykk til venstre for å setja inn i staden for å gruppera."
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Lås opp"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Passordverna korg."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Trykk «Lås opp» for å få tilgang til ho."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Kryptering er ikkje støtta<br/>i denne versjonen av %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -450,27 +494,32 @@ msgstr ""
 "For å la korgene verta verande lås, kan du endra låseperioden i "
 "programoppsettet."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Lastar …"
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Fjern alle"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Tilpass …"
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtrer etter denne merkelappen"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtrer etter denne &tilstanden"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Merkelappar"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -479,7 +528,7 @@ msgstr ""
 "<qt>Er du sikker på at du vil sletta dette notatet?</qt>\n"
 "<qt>Er du sikker på at du vil sletta desse <b>%n</b> notata?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -487,7 +536,7 @@ msgstr ""
 "Slett notat\n"
 "Slett notat"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -495,7 +544,7 @@ msgstr ""
 "Kopierte notat til utklippstavla.\n"
 "Kopierte notat til utklippstavla."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -503,7 +552,7 @@ msgstr ""
 "Klipte ut notat til utklippstavla.\n"
 "Klipte ut notat til utklippstavla."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -511,39 +560,44 @@ msgstr ""
 "Kopierte notat til utval.\n"
 "Kopierte notat til utval."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Klarte ikkje opna notatet."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Du har ikkje løyve til å opna denne fila."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Lagra til fil"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Skriv inn passordet for denne privat­nøkkelen:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Skriv inn passordet for korga <b>%1</b>:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Vel eit passord for korga <b>%1</b>:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Ikkje nok diskplass til lagring av korgdata"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Feil filløyve for korg"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -551,7 +605,7 @@ msgstr ""
 "Du må sletta nokre filer frå disken <b>%1</b>, slik at programmet kan lagra "
 "endringane dine trygt."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -559,10 +613,36 @@ msgstr ""
 "Det er problem med fil­løyva for <b>%1</b>. Sjå til at du har skrive­tilgang "
 "til fila og til mappene over."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Lagringsfeil"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Vis/skjul hovudvindauge"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "&Vis hovudvindauget når muspeikaren er over systemtrauikonet i"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Opna korgarkiv"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Klarte ikkje laga mappe for den nye korga."
@@ -595,10 +675,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Korgeigenskapar"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Namn"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Bakgrunnsbilete:"
@@ -660,9 +744,11 @@ msgstr ""
 "til korga <i>Tips</i>, vert korga vist som <i><u>T</u>ips</i> i treet. Dette "
 "vil hjelpa deg å hugsa snar­vegane.</p><p><strong>Lokal eller global</strong>:"
 "<br>Med det første valet kan du visa korga mens hovud­vindauget er ope. "
-"Globale snar­vegar fungerer frå alle stader, sjølv om vindauget er skjult.</p><p><strong>Vis eller byt til</strong>:<br>Det siste valet gjer korga til "
+"Globale snar­vegar fungerer frå alle stader, sjølv om vindauget er skjult.</"
+"p><p><strong>Vis eller byt til</strong>:<br>Det siste valet gjer korga til "
 "den gjeldande utan å opna hovud­vindauget. Dette er nyttig når du brukar "
-"globale snar­vegar til å lima inn notat frå utklipps­tavla til gjeldande korg.</p>"
+"globale snar­vegar til å lima inn notat frå utklipps­tavla til gjeldande korg."
+"</p>"
 
 #: basketproperties.cpp:149
 msgid "S&how this basket"
@@ -682,7 +768,8 @@ msgstr "Viser om det finst endringar som ikkje er lagra enno."
 
 #: basketstatusbar.cpp:128
 msgid "Ctrl+drop: copy, Shift+drop: move, Shift+Ctrl+drop: link."
-msgstr "«Ctrl + dra»: kopier, «Shift + dra»: flytt, «Shift + Ctrl + dra»: lag lenkje."
+msgstr ""
+"«Ctrl + dra»: kopier, «Shift + dra»: flytt, «Shift + Ctrl + dra»: lag lenkje."
 
 #: basketstatusbar.cpp:148
 msgid "<p>This basket is <b>locked</b>.<br>Click to unlock it.</p>"
@@ -692,15 +779,15 @@ msgstr "<p>Denne korga er <b>låst</b>.<br>Trykk for å låsa ho opp.</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Denne korga er <b>ikkje låst</b>.<br>Trykk for å låsa ho.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Generelt"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Vis/skjul hovudvindauge"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
@@ -708,31 +795,31 @@ msgstr ""
 "Lèt deg visa hovudvindauget viss det er skjult, og skjula det viss det er "
 "vist."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Lim inn innhald frå utklippstavla i korga"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
 msgstr ""
-"Lèt deg lima inn innhaldet frå utklipps­tavla til den valde korga utan å måtta "
-"opna hovud­vindauget."
+"Lèt deg lima inn innhaldet frå utklipps­tavla til den valde korga utan å "
+"måtta opna hovud­vindauget."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Vis namn på gjeldande korg"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "Lèt deg sjå namnet på den gjeldande korga utan å opna hovud­vindauget."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Lim inn utval i korg"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
@@ -740,11 +827,11 @@ msgstr ""
 "Lèt deg lima inn utvalet på utklipps­tavla i gjeldande korg utan å måtta opna "
 "hovud­vindauget."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Lag ny korg"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -754,67 +841,78 @@ msgstr ""
 "andre globale snøgg­tastar for å leggja til notat, lima inn utklipps­tavla "
 "eller lima inn utval i den nye korga."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Gå til førre korg"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
-msgstr "Lèt deg byta frå gjeldande til den førre korga utan å måtta opna hovud­vindauget."
+msgstr ""
+"Lèt deg byta frå gjeldande til den førre korga utan å måtta opna hovud­"
+"vindauget."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Gå til neste korg"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
-msgstr "Lèt deg byta frå gjeldande til den neste korga utan å måtta opna hovud­vindauget."
+msgstr ""
+"Lèt deg byta frå gjeldande til den neste korga utan å måtta opna hovud­"
+"vindauget."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Set inn tekstnotat"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
-msgstr "Legg eit tekst­notat til den gjeldande korga utan å måtta opna hovud­vindauget."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
+msgstr ""
+"Legg eit tekst­notat til den gjeldande korga utan å måtta opna hovud­vindauget."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Set inn biletnotat"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
-msgstr "Legg eit bilet­notat til den gjeldande korga utan å måtta opna hovud­vindauget."
+msgstr ""
+"Legg eit bilet­notat til den gjeldande korga utan å måtta opna hovud­vindauget."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Set inn lenkjenotat"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Legg eit lenkje­notat til den gjeldande korga utan å måtta opna hovud­­vindauget."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Legg eit lenkje­notat til den gjeldande korga utan å måtta opna hovud­­"
+"vindauget."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Set inn fargenotat"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
-msgstr "Legg eit farge­notat til den gjeldande korga utan å måtta opna hovud­vindauget."
+msgstr ""
+"Legg eit farge­notat til den gjeldande korga utan å måtta opna hovud­vindauget."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Vel farge frå skjerm"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -822,11 +920,11 @@ msgstr ""
 "Legg ein farge henta frå eit punkt på skjermen til den gjeldande korga utan "
 "å måtta opna hovud­vindauget."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Hent skjermbilete"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -834,15 +932,11 @@ msgstr ""
 "Hent eit område av skjerm­biletet og legg dette i den gjeldande korga utan å "
 "måtta opna hovud­vindauget."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Korger"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Skriv anten på engelsk eller på fransk."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -855,243 +949,248 @@ msgstr ""
 "trykkja på dei, og du kan flytta rundt på dei ved å dra dei der du vil ha "
 "dei."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Korgarkiv …"
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "Skjul &vindauge"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "&HTML-nettside …"
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt …"
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards …"
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Tekst&fil …"
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Reservekopiar og gjenoppretting …"
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Slett"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Merk alle notat"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "&Fjern merking"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Fjern merking frå alle notata."
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Omvend merking"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Merk notat som ikkje er merkte, og fjern merking frå dei som er det."
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Rediger …"
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "O&pna"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Opna &med …"
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Lagra til fil …"
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Grupper"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "Lø&ys opp gruppe"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Flytt &øvst"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Flytt &opp"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Flytt &ned"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Flytt n&edst"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Tekst"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "&Lenkje"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Bilete"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Farge"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "&Program"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Hent frå &TDE-menyen …"
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "&Importer ikon …"
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Hent frå f&il …"
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "F&arge frå skjermen"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "&Skjermbilete"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "Ny &korg …"
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Ny &underkorg …"
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Ny &søskenkorg …"
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Ny"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Korgeigenskapar"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Slett"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "&Passord …"
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "&Lås"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "F&iltrer"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtrer &alle korger"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "F&jern filter"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Førre korg"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "&Neste korg"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Slå saman korg"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Utvid korg"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Set opp &globale snarvegar …"
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "&Velkommen-korger"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Tekstomforming for reintekst"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Gjer reintekstnotat om til rik tekst …"
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Låst"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Ingen notat"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1100,7 +1199,7 @@ msgstr ""
 "%n notat\n"
 "%n notat"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1109,15 +1208,15 @@ msgstr ""
 "%n merkt\n"
 "%n merkte"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "alle treff"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "ingen filter"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1126,29 +1225,29 @@ msgstr ""
 "%n treff\n"
 "%n treff"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2 og %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Henta farge til korga <i>%1</i>."
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Reintekstnotata er no gjort om til riktekstnotat."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Omgjering fullført"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Det finst ingen reintekstnotat å gjera om."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1164,87 +1263,90 @@ msgstr ""
 "installera programmet over heile systemet, kan du kopiera fila «basketui.rc» "
 "frå installasjonsarkivet og til mappa <a href='file://%3'>%4</a>.</p><p>Som "
 "ein siste utveg, viss du er sikker på at programmet er rett installert, men "
-"du hadde tidlegare ei testutgåve av det, kan du prøva å fjerna fila «%5basketui.rc».</p>"
+"du hadde tidlegare ei testutgåve av det, kan du prøva å fjerna fila "
+"«%5basketui.rc».</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Fann ikkje resurs"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Klarte ikkje leggja til notat"
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Henta skjermbilete til korga <i>%1</i>."
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Slett korg"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Berre slett den korga"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Slett notat og undernotat"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
-msgstr "<qt>Er du sikker på at du vil sletta korga <b>%1</b> og alt innhaldet?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+msgstr ""
+"<qt>Er du sikker på at du vil sletta korga <b>%1</b> og alt innhaldet?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Slett korg"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Slett korg"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
 msgstr "<qt><b>%1</b> inneheld desse korgene.<br>Vil du òg sletta dei?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Slett underkorger"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "&Slett underkorger"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Korgarkiv"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Innhaldet på utklippstavla er lagt til i korga <i>%1</i>."
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Utvalet er lim inn i korga <i>%1</i>."
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Det var ikkje lagt til noko notat."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Korga <i>%1</i> er låst"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Låst)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Legg til ny merkelapp …"
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Fjern alle"
 
@@ -1335,11 +1437,11 @@ msgstr "&Merkelapp: "
 msgid "Filter all Baskets"
 msgstr "Filtrer alle korger."
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Utan merkelapp)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Merkelapp)"
 
@@ -1417,7 +1519,8 @@ msgstr "data"
 
 #: htmlexporter.cpp:319
 msgid "Made with %1, a TDE tool to take notes and keep information at hand."
-msgstr "Laga med %1 – eit TDE-verktøy for lett tilgang til all slags informasjon."
+msgstr ""
+"Laga med %1 – eit TDE-verktøy for lett tilgang til all slags informasjon."
 
 #: kcolorcombo2.cpp:126 kcolorcombo2.cpp:602 kcolorcombo2.cpp:624
 #: tagsedit.cpp:470 variouswidgets.cpp:269
@@ -1428,35 +1531,35 @@ msgstr "(Standard)"
 msgid "Other..."
 msgstr "Annan …"
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Privatnøkkel-liste"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "E-post"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Vel ein hemmeleg nøkkel:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Nøkkeloversikta vart uventa forkorta."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Den offentlegnøkkelen er ikkje meint for kryptering."
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Ikkje støtta algoritme"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Ugyldig passord."
 
@@ -1496,47 +1599,58 @@ msgstr "Filsystem"
 msgid "File Types"
 msgstr "Filtypar"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Ikonfiler (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "O&pna"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr "Send tilbakemelding til programutviklarane om noko du liker."
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr "Send tilbakemelding til programutviklarane om noko du ikkje liker."
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr "Send tilbakemelding til programutviklarane om ein feil i programmet."
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
-msgstr "Send tilbakemelding til programutviklarane med ønskje om ein ny funksjon."
+msgstr ""
+"Send tilbakemelding til programutviklarane med ønskje om ein ny funksjon."
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "&Send tilbakemelding til utviklarane"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Velkommen til denne testversjonen av %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Velkommen til %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
-msgstr "Tilbakemeldingane dine er viktige for å hjelpa oss å forbetra programmet."
+msgstr ""
+"Tilbakemeldingane dine er viktige for å hjelpa oss å forbetra programmet."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1547,7 +1661,7 @@ msgstr ""
 "kort tilbake­melding på kva du likte eller mislikte – rett til program­"
 "utviklarane."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1556,7 +1670,7 @@ msgstr ""
 "rett nedanfor tittel­linja for å senda ei kort tilbake­melding rett til program­"
 "utviklarane."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1565,7 +1679,7 @@ msgstr ""
 "sure ansiktet rett nedanfor tittel­linja for å senda ei kort tilbake­melding "
 "rett til program­utviklarane."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1574,7 +1688,7 @@ msgstr ""
 "Du gjer det same om du vil melda frå om ein feil: Berre klikk på feil­ikonet "
 "øvst til høgre i vindauget, skriv inn feil­rapporten og trykk «Send»."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1584,7 +1698,7 @@ msgstr ""
 "ikonet rett nedanfor tittel­linja for å senda ei kort tilbake­melding rett til "
 "program­utviklarane."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1592,17 +1706,18 @@ msgstr ""
 "Eksempel:\n"
 "Eksempel:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Eg liker</b> den flotte grafikken. Han er veldig frisk og fin."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 "<b>Eg liker ikkje</b> velkomstsida i vegvisaren. Ho er for stor, og tar for "
 "lang tid å lesa."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1610,23 +1725,23 @@ msgstr ""
 "<b>Programmet har ein feil</b> i «Legg til»-knappen. Ingenting skjer når eg "
 "trykkjer på han."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr "<b>Eg skulle ønskja</b> det var mogleg å senda notata som e-post."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Hjelp til med å forbetra programmet"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "E-postadresse"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Skriv inn e-postadressa di."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1637,7 +1752,7 @@ msgstr ""
 "utløysa feilane du har funne, senda feilrettingar som du kan testa og "
 "liknande."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1645,59 +1760,58 @@ msgstr ""
 "E-postadressa er valfri. Viss du lèt feltet stå tomt, vert tilbakemeldingane "
 "sende anonymt."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Send tilbakemelding til utviklarane"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Send ei tilbakemelding til programutviklarane om:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Noko du &liker"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Noko du &ikkje liker"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Ein &feil i programmet"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Ein ny funksjon du &ønskjer"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "&Vis tilbakemeldingsknappar under tittellinja"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Send tilbakemelding"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "E-postadresse …"
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Skriv ei kort tilbake­melding om kva du synest om %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Skriv på engelsk."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr ""
 "Det kan vera du kan bruka eit <a href=\"%1\">auto­matisk om­settings­verktøy</"
 "a>."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1705,19 +1819,20 @@ msgstr ""
 "For at tilbake­meldingane skal vera mest mogleg nyttige for program­"
 "utviklarane, bør du helst prøva å senda både positive og negative meldingar."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
-msgstr "Men <b>ikkje</b> be om nye funksjonar. Slike føre­spurnader vert oversett."
+msgstr ""
+"Men <b>ikkje</b> be om nye funksjonar. Slike føre­spurnader vert oversett."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr "<p>Feil ved sending av rapporten.</p><p>Prøv på nytt seinare.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Overføringsfeil"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1725,7 +1840,7 @@ msgstr ""
 "<p>Tilbakemeldinga di er no sendt, og vil hjelpa oss å gjera programmet "
 "betre.</p><p>Tusen takk for at du tok deg tid til dette!</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Tilbakemelding sendt"
 
@@ -1807,11 +1922,11 @@ msgid ""
 "you drop, go to the \"General\" page and uncheck \"Image or animation\" in "
 "the \"View Content of Added Files for the Following Types\" group.</p>"
 msgstr ""
-"<p>Dette er normalt, då det finst fleire forskjellige typar notat. Denne "
-"inn­stillinga gjeld berre filer og lokal­lenkje­notat. Bileta du ser er "
-"biletnotat, ikkje fil­notat. Fil­notat er generelle dokument, mens bilet­notat er "
-"bilete du kan teikna på.</p><p>Når du dreg filer til ei korg, vil %1 "
-"auto­matisk finna ut kva fil­type dei er, og visa inn­haldet i filene. For eksempel "
+"<p>Dette er normalt, då det finst fleire forskjellige typar notat. Denne inn­"
+"stillinga gjeld berre filer og lokal­lenkje­notat. Bileta du ser er "
+"biletnotat, ikkje fil­notat. Fil­notat er generelle dokument, mens bilet­notat "
+"er bilete du kan teikna på.</p><p>Når du dreg filer til ei korg, vil %1 auto­"
+"matisk finna ut kva fil­type dei er, og visa inn­haldet i filene. For eksempel "
 "vert det laga bilet- og tekstnotat når du dreg bilet­filer og tekst­filer. For "
 "filtypar som %2 ikkje kjenner til, vert dei vist som generelle fil­ikon med "
 "berre eit ikon eller ei føre­hands­vising og eit fil­namn.</p><p>Viss du ikkje "
@@ -1823,19 +1938,19 @@ msgstr ""
 msgid "Example"
 msgstr "Eksempel"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimer"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Korg"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Er du sikker på at du vil avslutta %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1845,7 +1960,7 @@ msgstr ""
 "du loggar ut og programmet ikkje er avslutta, vert det auto­matisk starta opp "
 "att når du loggar deg inn att.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Stadfest avslutting"
 
@@ -1916,7 +2031,7 @@ msgstr "Flytande"
 msgid "Mind map"
 msgstr "Tankekart"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Bilete)"
 
@@ -1940,6 +2055,11 @@ msgstr "Animasjon"
 msgid "Sound"
 msgstr "Lyd"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Filer"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Lenkje"
@@ -1948,7 +2068,7 @@ msgstr "Lenkje"
 msgid "Launcher"
 msgstr "Program"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Farge"
 
@@ -1996,271 +2116,280 @@ msgstr "Rediger denne fargen."
 msgid "Edit this unknown object"
 msgstr "Rediger dette ukjente objektet."
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Opnar reintekst …"
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Opnar reintekstar …"
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Opnar reintekst med …"
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Opnar reintekstar med …"
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Opna reintekst med:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Opna reintekstar med:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Opnar tekst …"
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Opnar tekstar …"
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Opnar tekst med …"
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Opnar tekstar med …"
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Opna tekst med:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Opna tekstar med:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Storleik"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 × %2 pikslar"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Opnar bilete …"
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Opnar bilete …"
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Opnar bilete med …"
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Opnar bilete med …"
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Opna bilete med:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Opna bilete med:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Trykk for full storleik."
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Opnar animasjon …"
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Opnar animasjonar …"
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Opnar animasjon med …"
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Opnar animasjonar med …"
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Opna animasjon med:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Opna animasjonar med:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Type"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Opna denne fila."
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Opnar fil …"
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Opnar filer …"
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Opnar fil med …"
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Opnar filer med …"
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Opna fil med:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Opna filer med:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Opna denne lyden."
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Opnar lyd …"
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Opnar lydar …"
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Opnar lyd med …"
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Opnar lydar med …"
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Opna lyd med:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Opna lydar med:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Mål"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Opna denne lenkja."
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Lenkja har ikkje noko adresse som kan opnast."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Opnar lenkjemål …"
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Opnar lenkjemål …"
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Opnar lenkjemål med …"
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Opnar lenkjemål med …"
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Opna lenkjemål med:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Opna lenkjemål med:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(køyr i terminal)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Merknad"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Kommando"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Start dette programmet."
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Programstartaren inneheld ikkje nokon kommando å køyra."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Startar program …"
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Startar program …"
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Raud</i>: %1, <i>Grøn</i>: %2, <i>Blå</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "NMV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Nyanse</i>: %1, <i>Metting</i>: %2, <i>Verdi</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "CSS-fargenamn"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Utvida CSS-fargenamn"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Er ein vevfarge"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2270,11 +2399,11 @@ msgstr ""
 "vil innehelda eit bilet­redigerings­program.)\n"
 "Vil du opna biletet i eit program som kan lesa det?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Rediger biletnotat"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2282,15 +2411,15 @@ msgstr ""
 "Det animerte biletet kan ikkje redigerast her.\n"
 "Vil du opna biletet i eit program som kan lesa det?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Rediger animasjonsnotat"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Rediger fargenotat"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2300,74 +2429,97 @@ msgstr ""
 "Men du kan likevel dra eller kopiera notatet til eit program som forstår "
 "formatet."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Rediger ukjend notat"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Rediger lenkjenotat"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Auto"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Ikon:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Mål:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Tittel:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Rediger programstartarnotat"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Vel kommandoen som skal køyrast:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Gjett"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "&Kommando:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Namn:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "S&krift:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Storleik"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Halvfeit"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Kursiv"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Understrek"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Venstrejuster"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Midtstill"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Høgrejuster"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Blokkjuster"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2414,8 +2566,7 @@ msgstr "Vel storleiken på ikonet du vil importera som bilete:"
 msgid "Load File Content into a Note"
 msgstr "Lagra filinnhald som notat"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Passordvern"
@@ -2424,135 +2575,39 @@ msgstr "Passordvern"
 msgid "No private key selected."
 msgstr "Ingen privatnøkkel vald."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Korg"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksporter"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importer"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Gå til"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Notat"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Merkelappar"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Tekstformateringslinje"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "&Filter:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt + O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Ingen vern"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+I"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "&Vern korga med passord"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+V"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "V&ern korga med privatnøkkel:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+E"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Til venstre"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Til høgre"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "Plassering av &korgtre:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Øvst"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Nedst"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Plassering av &filterlinje:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "&Vis resultat av globale handlingar i ballonghjelp"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Kva er globale handlingar?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2566,7 +2621,7 @@ msgstr ""
 "ikonet i system­trauet for å endra den gjeldande korga, eller bruka midt­"
 "knappen på ikonet for å lima inn det gjeldande utvalet."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2574,7 +2629,7 @@ msgstr ""
 "Når du gjer dette, vil %1 visa ein liten tekst­ballong for å informera deg om "
 "at handlinga er utført. Du kan slå av denne ballongen om du ønskjer."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2584,65 +2639,65 @@ msgstr ""
 "vindauget alt er ope. Dette er fordi du då kan sjå resultatet av handlinga "
 "direkte."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Systemtrauikon"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "&Legg i systemtrauet"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "Vis &ikon for gjeldande korg i systemtrauet"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "&Skjul hovudvindauget når muspeikaren er utanfor i"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " tidels sekund"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "&Vis hovudvindauget når muspeikaren er over systemtrauikonet i"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "&Animer endringar i korger"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "V&is verktøytips i korger"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "S&tore notat"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Åtferd"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr ""
 "&Gjer om linjer som startar med «*» eller «-» til lister i "
 "teksthandsamingsverktøy."
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "&Spør før sletting av notat"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "&Eksporter merkelappar i tekstar"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Når vert dette brukt?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2650,11 +2705,12 @@ msgstr ""
 "Tekst­­ekvivalenten vert brukt når du kopierer og lim inn eller dreg notat til "
 "eit skrive­­program."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr "Lèt deg lima inn merke­lappar som rein­tekst­ekvivalentar."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2664,15 +2720,15 @@ msgstr ""
 "visast med teksten <b>[ ]</b> eller <b>[x]</b>, som symboliserer ein tom og "
 "ein avkryssa avkryssingsboks."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "&Grupper nye notat ved å klikka til høgre på innsetjingslinja"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Korleis gruppera nye notat?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2681,7 +2737,7 @@ msgstr ""
 "<p>Dette valet lèt deg ikkje berre setja inn notat ved markør­plasseringa, "
 "men lèt deg òg gruppera eit nytt notat med notatet nedan­for:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2693,168 +2749,168 @@ msgstr ""
 "b> eit notat.<br>Trykk til <b>høgre</b> for å <b>gruppera</b> eit notat med "
 "notatet <b>ovan­for eller nedan­for</b>, avhengig av kor peikaren er.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Ikkje gjer noko"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Lim inn frå utklippstavle"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Set inn programnotat"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Vel farge frå skjerm"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Hent notat frå fil"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Hent frå programstartar frå TDE-menyen"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importer ikon"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift + midtklikk:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "ved markørplassering"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "&Lås automatisk passordverna korger når dei har vore lukke i"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " minutt"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "Br&uk GnuPG agent for korger verna med privat-/offentlegnøkkel"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Plassering av nye notat:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Ved gjeldande notat"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Storleik for &nye bilete:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&gongar"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pikslar"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Vel &direkte …"
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Vis innhald av filer av følgjande type"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "&Reintekst"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&HTML-side"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "Bilete &og animasjonar"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Lyd"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Lydopptak frå konferanse"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Årsrapport"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Heimemappe"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Start %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Lydar"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Filer"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "&Lokale lenkjer"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "&Nettverkslenkjer"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "&Programstartarar"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Opna &tekstnotat med sjølvvald program:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Opna tekstnotat med:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Opna &biletnotat med sjølvvald program:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Opna biletnotat med:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Opna ani&masjonsnotat med sjølvvald program:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Opna animasjonsnotat med:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Opna &lydnotat med sjølvvald program:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Opna lydnotat med:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2864,7 +2920,7 @@ msgstr ""
 "notat av denne typen.</p><p>Elles vert standardprogrammet (sett opp i "
 "Konqueror) brukt.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2872,26 +2928,27 @@ msgstr ""
 "<p>Definer programmet som skal brukast til å opna notat av denne typen, i "
 "staden for å bruka standardprogrammet sett opp i Konqueror.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Korleis endra programmet brukt til å opna nettadresser?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Når du opnar nett­adresser, vert desse opna i forskjellige program, "
 "avhengig av inn­haldet til adressa (ei nett­side, eit bilete, eit PDF-dokument "
@@ -2907,11 +2964,11 @@ msgstr ""
 "eller Epiphany).</p><p>Sjå den andre hjelpe­lenkja for eit meir fin­inndelt opp­"
 "sett, der for eksempel berre nett­sider vert opna i nett­lesaren.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Korleis endra programma brukt til å opna filer og lenkjer?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2920,12 +2977,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Slik gjer du viss du vil bruka eit eige program kvar filtype. Dette gjeld "
 "òg nett­lenkjer om du vel å alltid opna dei i ein nett­lesar (sjå den første "
@@ -3016,7 +3073,8 @@ msgid ""
 msgstr "Frå «%1»"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 "Klarte ikkje importera fila. Ho er anten ugyldig, eller så er ho ikkje ei "
 "TuxCards-fil."
@@ -3164,6 +3222,11 @@ msgstr "Viktig"
 msgid "Very Important"
 msgstr "Veldig viktig"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animasjon"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Idé"
@@ -3232,6 +3295,11 @@ msgstr "Flytt opp («Ctrl + Shift + Pil opp»)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Flytt ned («Ctrl + Shift + Pil ned»)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Slett"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Merkelapp"
@@ -3325,13 +3393,15 @@ msgid ""
 "In the example above, the tag of the top note is only exported on the first "
 "line, while the tag of the bottom note is exported on every line of the note."
 msgstr ""
-"I eksempelet ovanfor vert merkelappen til det øvste notatet berre eksportert på "
-"første linje, mens merkelappen til det nedste notatet vert eksportert på alle "
-"linjene."
+"I eksempelet ovanfor vert merkelappen til det øvste notatet berre eksportert "
+"på første linje, mens merkelappen til det nedste notatet vert eksportert på "
+"alle linjene."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
-msgstr "Viss du slettar merkelappen, vert han fjerna frå alle notata som har han."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
+msgstr ""
+"Viss du slettar merkelappen, vert han fjerna frå alle notata som har han."
 
 #: tagsedit.cpp:902
 msgid "Confirm Delete Tag"
@@ -3345,7 +3415,8 @@ msgstr "Fjern merkelapp"
 msgid ""
 "Deleting the state will remove the tag from every note the state is "
 "currently assigned to."
-msgstr "Viss du slettar tilstanden, vert han fjerna frå alle notata som har han."
+msgstr ""
+"Viss du slettar tilstanden, vert han fjerna frå alle notata som har han."
 
 #: tagsedit.cpp:909
 msgid "Confirm Delete State"
@@ -3391,6 +3462,115 @@ msgstr ""
 "Endra storleiken på vindauget for å velja biletstorleik, og\n"
 "lukk vindauget eller trykk «Escape» for å bruka endringane."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Korg"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksporter"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importer"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Gå til"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Notat"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Merkelappar"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Gøym &verktøylinje"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Tekstformateringslinje"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "&Filter:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "O&pna"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt + O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Ingen vern"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+I"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "&Vern korga med passord"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+V"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "V&ern korga med privatnøkkel:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+E"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Skriv anten på engelsk eller på fransk."
+
 #~ msgid "&Export to HTML..."
 #~ msgstr "Eksporter til &HTML …"
 
@@ -3429,9 +3609,6 @@ msgstr ""
 #~ msgid "I desire a feature..."
 #~ msgstr "Eg ønskjer ein ny funksjon …"
 
-#~ msgid "Hide &Toolbar"
-#~ msgstr "Gøym &verktøylinje"
-
 #~ msgid "&No password"
 #~ msgstr "&Ikkje bruk passord"
 
@@ -3515,4 +3692,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Hugs at det er like viktig for oss å få veta kva du liker med programmet "
 #~ "som kva du ikkje liker."
-
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 86a7b03..9891bec 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,22 +7,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pl_PL\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2015-01-18 18:31+0100\n"
 "Last-Translator: mcbx\n"
 "Language-Team:  <pl@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mikołaj Machowski"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -43,14 +44,19 @@ msgid "BasKet Note Pads"
 msgstr "Koszyk notatek"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Autor, opiekun"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "szyfrowanie, integracja z Kontaktem, import z KnowIt"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -58,32 +64,32 @@ msgstr ""
 "blokowanie koszyków, ikona statusu zapisu, kopiuj/wklej HTML, dymek z nazwą "
 "koszyka, upuszczanie na nazwę koszyka"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Ikona"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Zapisz jako archiwum"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Zapisywanie jako archiwum. Proszę czekać..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "To nie jest plik archiwum Basket"
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Błąd archiwum"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Plik jest uszkodzony. Nie można otworzyć."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -91,44 +97,44 @@ msgid ""
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
 msgstr ""
-"Ten plik został utworzony w nowej wersji %1. Może zostać otwarty, lecz "
-"nie wszystkie informacje z niego będą dostępne. Niektóre notatki mogą "
-"nie zostać otwarte, gdyż mogą być typu nie obsługiwanego przez tą wersję. "
-"Zapisując, warto zapisać plik pod inną nazwą, żeby uniknąć utraty danych."
+"Ten plik został utworzony w nowej wersji %1. Może zostać otwarty, lecz nie "
+"wszystkie informacje z niego będą dostępne. Niektóre notatki mogą nie zostać "
+"otwarte, gdyż mogą być typu nie obsługiwanego przez tą wersję. Zapisując, "
+"warto zapisać plik pod inną nazwą, żeby uniknąć utraty danych."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
 msgstr ""
-"Ten plik został stworzony w nowszej wersji %1. Proszę zaktualizować swoją wersję "
-"programu by móc go otworzyć."
+"Ten plik został stworzony w nowszej wersji %1. Proszę zaktualizować swoją "
+"wersję programu by móc go otworzyć."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Kopia zapasowa"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Zapisz folder"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Twoje notatki są aktualnie przechowywane w folderze: <br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "Przenieś do folderu..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Użyj innego istniejącego folderu..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Dlaczego tak?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -141,54 +147,55 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>Możesz przenieść folder, w którym %1 przechowuje notatki aby:</p><ul><li>Przechowywać "
-"notatki w widocznym miejscu, np katalogu domowym,~/Notes lub ~/Baskets, "
-"by móc je ręcznie kopiować i synchronizować.</li><li>Przechowywać notatki na serwerze "
-"dzieląc je między komputerami.<br>W tym przypadku, zamontuj folder z notatkami "
-"na komputerze i ustaw %2 by używał punktu montowania.<br>Uwaga: Nie powinno się "
-"uruchamiać %3 w tym samym czasie na wielu komputerach, gdyż synchronizacja może nie zostać "
-"zachowana."
-"</li></ul><p>Zawartość tego folderu nie powinna być zmieniana ręcznie (np. dodanie pliku do "
-"tego folderu nie spowoduje, że pojawi się w notatkach).</p>"
-
-#: backup.cpp:89
+"<p>Możesz przenieść folder, w którym %1 przechowuje notatki aby:</"
+"p><ul><li>Przechowywać notatki w widocznym miejscu, np katalogu domowym,~/"
+"Notes lub ~/Baskets, by móc je ręcznie kopiować i synchronizować.</"
+"li><li>Przechowywać notatki na serwerze dzieląc je między komputerami.<br>W "
+"tym przypadku, zamontuj folder z notatkami na komputerze i ustaw %2 by "
+"używał punktu montowania.<br>Uwaga: Nie powinno się uruchamiać %3 w tym "
+"samym czasie na wielu komputerach, gdyż synchronizacja może nie zostać "
+"zachowana.</li></ul><p>Zawartość tego folderu nie powinna być zmieniana "
+"ręcznie (np. dodanie pliku do tego folderu nie spowoduje, że pojawi się w "
+"notatkach).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Kopie"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "Kopia zapasowa"
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "Przywróć kopię zapasową"
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Ostatnia kopia: nigdy"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Ostatnia kopia: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Wybierz folder, do którego notatki zostaną przeniesione"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "Folder <b>%1</b> nie jest pusty. Czy chcesz zapisać mimo to?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Zapisać mimo to?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "Zapisz"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -196,11 +203,11 @@ msgstr ""
 "Twoje notatki przeniesiono do <b>%1</b>. %2 zostanie zrestartowany aby "
 "uwzględnić tą zmianę."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Wybierz istniejący folder na notatki"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
@@ -208,105 +215,108 @@ msgstr ""
 "Twój folder zapisu został zmieniony na <b>%1</b>. %1 zostanie zrestartowany "
 "aby uwzględnić zmianę."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Baskets_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Archiwum TAR spakowane GZip-em"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Kopie zapasowe"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "Plik <b>%1</b> już istnieje. Czy chcesz go nadpisać?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Nadpisać plik?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Trwa kopiowanie. Proszę czekać..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Otwórz archiwum"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "README.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "To jest kopia bezpieczeństwa notatek sprzed przywrócenia kopii zapasowej %1"
+msgstr ""
+"To jest kopia bezpieczeństwa notatek sprzed przywrócenia kopii zapasowej %1"
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr "Jeżeli przywrócenie odbyło się poprawnie, możesz usunąć ten folder."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Jeżeli coś poszło nie tak, możesz użyć tego folderu by przechowywać swoje notatki."
+msgstr ""
+"Jeżeli coś poszło nie tak, możesz użyć tego folderu by przechowywać swoje "
+"notatki."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Wybierz \"Koszyk\"->\"Kopia zapasowa...\"->\"Użyj istniejącego folderu\" i wybierz ten folder."
+msgstr ""
+"Wybierz \"Koszyk\"->\"Kopia zapasowa...\"->\"Użyj istniejącego folderu\" i "
+"wybierz ten folder."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Przywracanie <b>%1</b>. Proszę czekać..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr ""
-"W razie problemów z przywracaniem, przeczytaj plik <b>%1</"
-"b>."
+msgstr "W razie problemów z przywracaniem, przeczytaj plik <b>%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Przywróć koszyk"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr ""
-"To archiwum nie jest kopią koszyka lub jest uszkodzone i nie może zostać zaimportowane. "
-"Zostały zachowane twoje poprzednie koszyki."
+"To archiwum nie jest kopią koszyka lub jest uszkodzone i nie może zostać "
+"zaimportowane. Zostały zachowane twoje poprzednie koszyki."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Błąd przywracania"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr ""
-"Kopia została przywrócona do <b>%1</b>. %2 zostanie zrestartowany aby"
-"uwzględnić zmianę."
+"Kopia została przywrócona do <b>%1</b>. %2 zostanie zrestartowany "
+"abyuwzględnić zmianę."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -324,39 +334,39 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Koszyki przed przywróceniem (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "Nowa notatka nie pasuje do filtra i została ukryta."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Nowa notatka nie pasuje do filtra i została ukryta."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr "Niektóre nowe notatki nie pasują do filtra i zostały ukryte."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "Nowe notatki nie pasują do filtra i zostały ukryte."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Grupuj"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Wstaw"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Upuszczone do koszyka <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -364,7 +374,7 @@ msgstr ""
 "Ta wiadomość nie powinna się nigdy pojawić. Jeśli ją widzisz program ma "
 "błąd! Proszę zgłosić go do opiekuna."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -372,48 +382,48 @@ msgstr ""
 "Wstaw notatkę\n"
 "Kliknij prawym przyciskiem myszy by poznać więcej możliwości"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Zmień rozmiar tych kolumn"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Zmień rozmiar grupy"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Zmień rozmiar notatki"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Wybierz lub przenieć tę notatkę"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Wybierz lub przenieć tę grupę"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Dodaj lub usuń znaczniki z tej notatki"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Dodane znaczniki</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Rozwiń grupę"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Zwiń grupę"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -421,7 +431,7 @@ msgstr ""
 "Grupuj notatkę z notatką poniżej\n"
 "Kliknij prawym przyciskiem myszy by poznać więcej możliwości"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -429,46 +439,46 @@ msgstr ""
 "Grupuj notatkę z notatką powyżej\n"
 "Kliknij prawym przyciskiem myszy by poznać więcej możliwości"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Dodano"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Ostania zmiana"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Kliknij po prawej by grupować zamiast wstawić"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Kliknij po lewej by wstawić zamiast grupować"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Odblokuj"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Koszyk chroniony hasłem."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Przyciśnij Odblokuj by uzyskać dostęp."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Szyfrowanie nie jest wspierane <br/> w tej wersji %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -476,27 +486,32 @@ msgstr ""
 "Aby koszyki pozostawały odblokowane, zmień czas<br> automatycznego "
 "blokowania w ustawieniach programu."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Usuń wszystko"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Własne ustawienia..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtruj wg tego znacznika"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtruj wg &Stanu"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Znaczniki"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -506,7 +521,7 @@ msgstr ""
 "<qt>Czy naprawdę chcesz usunąć <b>%n</b> notatki</qt>\n"
 "<qt>Czy naprawdę chcesz usunąć <b>%n</b> notatek</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -515,7 +530,7 @@ msgstr ""
 "Usuń %n notatki\n"
 "Usuń %n notatek"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -524,7 +539,7 @@ msgstr ""
 "Skopiowano %n notatki do schowka.\n"
 "Skopiowano %n notatek do schowka."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -533,7 +548,7 @@ msgstr ""
 "Wycięto %n notatki do schowka.\n"
 "Wycięto %n notatek do schowka."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -542,39 +557,44 @@ msgstr ""
 "Skopiowano %n notatki do zaznaczenia.\n"
 "Skopiowano %n notatek do zaznaczenia."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Nie można otworzyć tej notatki."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Nie masz uprawnień by otworzyć ten plik."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Zapisz do pliku"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Proszę podać hasło dla następującego klucza prywatnego:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Proszę podać hasło dla koszyka <b>%1</b>:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Proszę przydzielić hasło dla koszyka <b>%1</b>:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Brak miejsca na dysku by zapisać dane Koszyka"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Złe prawa do pliku koszyka"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -582,7 +602,7 @@ msgstr ""
 "Proszę usunąć pliki na dysku <b>%1</b> by pozwolić programowi na bezpieczne "
 "zapisanie zmian."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -590,10 +610,36 @@ msgstr ""
 "Nieprawidłowe prawa dostępu dla pliku <b>%1</b>. Proszę sprawdzić czy masz "
 "prawa zapisu do pliku i katalogów."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Błąd zapisu"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Pokaż/ukryj główne okno"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "Pokaż &główne okno kiedy mysz jest nad ikoną w tacce systemowej"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Otwórz archiwum"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Niestety nie powiodło się utworzenie katalogu dla nowego koszyka."
@@ -626,10 +672,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Właściwości koszyka"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Nazwa"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Obrazek tła:"
@@ -727,25 +777,25 @@ msgstr "<p>Ten koszyk jest <b>zablokowany</b>.<br>Kliknij, aby odblokować</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Ten koszyk jest <b>odblokowany</b>.<br>Kliknij, aby zablokować</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Ogólne"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Pokaż/ukryj główne okno"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr "Pokazuje główne okno jeśli jest ukryte i ukrywa jeśli je widać."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Wkleja zawartość schowka do bieżącego koszyka"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
@@ -753,21 +803,21 @@ msgstr ""
 "Wkleja zawartość schowka do bieżącego koszyka bez potrzeby otwierania "
 "głównego okna."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Pokaż nazwę bieżącego koszyka"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr ""
 "Dzięki temu będzie można poznać nazwę bieżącego koszyka bez potrzeby "
 "otwierania głównego okna."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Wklej zaznaczenie do bieżącego koszyka"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
@@ -775,11 +825,11 @@ msgstr ""
 "Pozwala na wklejenie zawartość zaznaczenia do bieżącego koszyka bez potrzeby "
 "otwierania głównego okna."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Utwórz nowy koszyk"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -789,11 +839,11 @@ msgstr ""
 "(można użyć skrótów globalnych by dodać notatkę, wkleić zawartość schowka "
 "lub zaznaczenia do nowego koszyka)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Idź do poprzedniego koszyka"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
@@ -801,11 +851,11 @@ msgstr ""
 "Pozwala na zmianę bieżącego koszyka na poprzedni bez potrzeby otwierania "
 "głównego okna."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Idź do następnego koszyka"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -813,49 +863,54 @@ msgstr ""
 "Pozwala na zmianę bieżącego koszyka na następny bez potrzeby otwierania "
 "głównego okna."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Wstaw notatkę tekstową"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr ""
 "Dodaj notatkę tekstową do bieżącego koszyka bez potrzeby otwierania głównego "
 "okna."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Wstaw obrazek"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
-msgstr "Dodaj obrazek do bieżącego koszyka bez potrzeby otwierania głównego okna."
+msgstr ""
+"Dodaj obrazek do bieżącego koszyka bez potrzeby otwierania głównego okna."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Wstaw odnośnik"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Dodaj odnośnik do bieżącego koszyka bez potrzeby otwierania głównego okna."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Dodaj odnośnik do bieżącego koszyka bez potrzeby otwierania głównego okna."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Wstaw kolor"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
-msgstr "Dodaj kolor do bieżącego koszyka bez potrzeby otwierania głównego okna."
+msgstr ""
+"Dodaj kolor do bieżącego koszyka bez potrzeby otwierania głównego okna."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Pobierz kolor z ekranu"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -863,11 +918,11 @@ msgstr ""
 "Dodaj kolor pobrany z jednego piksela ekranu do bieżącego koszyka bez "
 "potrzeby otwierania głównego okna."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Pobierz region ekranu"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -875,15 +930,11 @@ msgstr ""
 "Dodaj region ekranu jako obrazek do bieżącego koszyka bez potrzeby "
 "otwierania głównego okna."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Koszyki"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Proszę pisać po angielsku lub francusku."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -896,243 +947,248 @@ msgstr ""
 "przez klikanie na koszyk aby otworzyć lub reorganizować metodą przyciągnij i "
 "upuść."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "Archiwum koszyków..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Ukryj okno"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "Strona &HTML"
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "Żółte k&arteczki"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Plik tekstowy..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "Kopia zapasowa..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Usuń"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Zaznacz wszystkie notatki"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "O&dznacz wszystkie"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Odznacz wszystkie zaznaczone pozycje"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "Od&wróć zaznaczenie"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Odwróć zaznaczenie wybranych pozycji"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Edytuj..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Otwórz"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Otwórz &z..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Zapisz do pliku..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Grupuj"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "&Rozgrupuj"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Przesuń na &wierzch"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Przesuń do &góry"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Prze&suń w dół"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Przesuń pod s&pód"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Tekst"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "Od&nośnik"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Obrazek"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Kolor"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "Uruch&amianie programów"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importuj program uruchamiający z &KMenu..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&portuj ikonę..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Wczyta&j z pliku..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "K&olor z ekranu"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Pobierz &region ekranu"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Nowy koszyk..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Nowy &pod-koszyk..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Nowy koszyk &bliźniaczy..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Nowy"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Właściwości koszyka"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Usuń"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Hasł&o..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "Zab&lokuj"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtr"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtruj wszystkie &koszyki"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "U&suń filtr"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Poprzedni koszyk"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "&Następny koszyk"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Zwiń koszyk"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Rozwiń koszyk"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Konfiguruj skróty &globalne..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "Po&witalne koszyki"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Konwersja notatek tekstowych"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Konwersja zwykłych notatek tekstowych do tekstu wzbogaconego..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Zablokowany"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Brak notatek"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1142,7 +1198,7 @@ msgstr ""
 "%n notatki\n"
 "%n notatek"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1152,15 +1208,15 @@ msgstr ""
 "%n zaznaczone\n"
 "%n zaznaczonych"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "wszystkie dopasowania"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "brak filtra"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1170,29 +1226,29 @@ msgstr ""
 "%n dopasowania\n"
 "%n dopasowań"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Pobrano kolor do koszyka <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Zwykłe notatki tekstowe zostały zamienione na tekst formatowany."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Zakończono konwersję"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Nie ma zwykłych notatek tekstowych do konwersji."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1210,87 +1266,88 @@ msgstr ""
 "poprawnie zainstalowany ale masz wersję testową spróbuj usunąć plik "
 "%5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Nie znaleziono zasobu"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Nie można dodać notatki."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Pobrano region ekranu do koszyka <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Usuń koszyk"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Usuń tylko ten koszyk"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Usuń z podrzędnymi"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>Czy na pewno chcesz usunąć koszyk <b>%1</b> i jego zawartość?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Usuń koszyk"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Usuń koszyk"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
 msgstr ""
-"<qt><b>%1</b> ma następujące koszyki potomne.<br>Czy je też chcesz "
-"usunąć?</qt>"
+"<qt><b>%1</b> ma następujące koszyki potomne.<br>Czy je też chcesz usunąć?</"
+"qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Usuń koszyki potomne"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "Usuń koszyki potomne"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Archiwalne koszyki"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Zawartość schowka wklejono do koszyka <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Zaznaczenie wklejono do koszyka <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Nie dodano notatki."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Koszyk <i>%1</i> jest zablokowany"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Zablokowany)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Dodaj nowy znacznik..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Usuń wszystko"
 
@@ -1381,11 +1438,11 @@ msgstr "Zn&acznik: "
 msgid "Filter all Baskets"
 msgstr "Filtruj wszystkie koszyki"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Brak znaczników)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Znaczniki)"
 
@@ -1410,8 +1467,8 @@ msgid ""
 "modify the other anymore as they are now separate entities.</p>"
 msgstr ""
 "<p>Odzwierciedlanie katalogów nie jest dłużej wspierane (więcej informacji "
-"na <a href='http://basket.kde.org/'>basket.kde.org</a>).</p><p>Katalog <b>%"
-"1</b> został skopiowany na potrzeby koszyka. Możesz usunąć ten katalog lub "
+"na <a href='http://basket.kde.org/'>basket.kde.org</a>).</p><p>Katalog <b>"
+"%1</b> został skopiowany na potrzeby koszyka. Możesz usunąć ten katalog lub "
 "koszyk, albo używać obu. Ale pamiętaj, że modyfikacja jednego z nich nie "
 "zmieni drugiego - są to byty osobne.</p>"
 
@@ -1476,35 +1533,35 @@ msgstr "(Domyślne)"
 msgid "Other..."
 msgstr "Inne..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Lista kluczy prywatnych"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "E-mail"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Wybierz tajny klucz:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Lista kluczy nagle ucięta."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Ten klucz publiczny nie jest przeznaczony do szyfrowania"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Niewspierany algorytm"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Złe hasło."
 
@@ -1544,49 +1601,58 @@ msgstr "System plików"
 msgid "File Types"
 msgstr "Typy plików"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Pliki ikon (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Otwórz"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr "Wyślij deweloperom programu komentarz o tym co ci się podoba"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr "Wyślij deweloperom programu komentarz o tym co ci się nie podoba"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr "Wyślij deweloperom programu komentarz o tym co nie działa"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 "Wyślij deweloperom programu komentarz o tym co powinno w programie się "
 "pojawić"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "&Wyślij komentarz do deweloperów"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Witamy w wersji testowej %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Witamy w %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Twoje komentarze co należy poprawić są dla nas bardzo pomocne."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1596,7 +1662,7 @@ msgstr ""
 "zdenerwowało kliknij odpowiednią twarzyczkę poniżej paska tytułu, krótko "
 "opisz co ci się podoba i wciśnij Wyślij."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1604,7 +1670,7 @@ msgstr ""
 "Za każdym razem kiedy coś ci się spodobało kliknij uśmiechniętą twarzyczkę "
 "poniżej paska tytułu, krótko opisz co ci się podoba i wciśnij Wyślij."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1612,7 +1678,7 @@ msgstr ""
 "Za każdym razem kiedy coś ci się nie spodobało kliknij skwaszoną twarzyczkę "
 "poniżej paska tytułu, krótko opisz co ci się podoba i wciśnij Wyślij."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1621,7 +1687,7 @@ msgstr ""
 "Wykonaj podobną akcję by szybko zgłosić błąd: po prostu kliknij ikonę "
 "złamanego przedmiotu w prawym górnym rogu okna, opisz błąd i kliknij Wyślij."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1630,7 +1696,7 @@ msgstr ""
 "Za każdym razem kiedy natkniesz się na błąd kliknij ikonę złamanego "
 "przedmiotu poniżej belki tytułu, krótko opisz błąd i kliknij Wyślij."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1639,15 +1705,16 @@ msgstr ""
 "%n przykłady:\n"
 "%n przykładów:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Lubię</b> nową szatę graficzną. Odświeżająca."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr "<b>Nie lubię</b> ekranu powitalnego tego asystenta. Zbyt czasochłonny."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1655,23 +1722,24 @@ msgstr ""
 "<b>Program nie zachowuje się prawidłowo</b> kiedy kliknie się przycisk "
 "Dodaj. Nic się nie dzieje."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
-msgstr "<b>Chciałbym nową opcję</b> pozwalającą na wysyłanie pracy przez e-mail."
+msgstr ""
+"<b>Chciałbym nową opcję</b> pozwalającą na wysyłanie pracy przez e-mail."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Pomóż udoskonalić Program"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Adres e-mail"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Proszę podać adres e-mail."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1681,7 +1749,7 @@ msgstr ""
 "informacji o twoich komentarzach, zapytać się jak zreprodukować błąd, wysłać "
 "poprawki do testowania itd."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1689,57 +1757,56 @@ msgstr ""
 "Adres e-mail jest opcjonalny. Jeśli go nie podasz komentarze zostaną wysłane "
 "anonimowo."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Wyślij komentarz do Deweloperów"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Wyślij deweloperom programu komentarz o:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Czymś co &lubisz"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Czymś czego &nie lubisz"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Nieprawidłowym &zachowaniu programu"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Nowej &opcji jakiej potrzebujesz"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "Pokaż przyciski komentarz poniżej paska &tytułu okna"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Wyślij komentarz"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "Adres &e-mail..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Proszę podać krótki opis twojej opinii o %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Proszę pisać po angielsku."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr "Możesz użyć <a href=\"%1\">translatora na WWW</a>."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1747,19 +1814,20 @@ msgstr ""
 "Aby komentarze były bardziej użyteczne spróbuj wysłać tę samą ilość "
 "pozytywnych i negatywnych komentarzy."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr "<b>Nie</b> proś o nowe rzeczy: twoje prośby będą ignorowane."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
-msgstr "<p>Błąd w czasie wysyłania raportu.</p><p>Proszę spróbować później.</p>"
+msgstr ""
+"<p>Błąd w czasie wysyłania raportu.</p><p>Proszę spróbować później.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Błąd transportu"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1767,7 +1835,7 @@ msgstr ""
 "<p>Twój komentarz został wysłany. Pomoże to w rozwoju programu.</p> "
 "<p>Dziękujemy za poświęcony czas.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Komentarz wysłany"
 
@@ -1866,19 +1934,19 @@ msgstr ""
 msgid "Example"
 msgstr "Przykład"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimalizuj"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Koszyk"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Czy na pewno chcesz zamknąć %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1888,7 +1956,7 @@ msgstr ""
 "Jeśli zakończysz sesję a program cały czas działa, program zostanie "
 "uruchomiony przy następnym zalogowaniu.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Potwierdź zakończenie"
 
@@ -1959,7 +2027,7 @@ msgstr "Swobodny"
 msgid "Mind map"
 msgstr "Mapa umysłu"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Obrazek)"
 
@@ -1983,6 +2051,11 @@ msgstr "Animacja"
 msgid "Sound"
 msgstr "Dźwięk"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Pliki"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Odnośnik"
@@ -1991,7 +2064,7 @@ msgstr "Odnośnik"
 msgid "Launcher"
 msgstr "Uruchamianie programu"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Kolor"
 
@@ -2039,271 +2112,280 @@ msgstr "Zmień kolor"
 msgid "Edit this unknown object"
 msgstr "Zmień ten nieznany obiekt"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Otwieram zwykły tekst..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Otwieram zwykłe teksty..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Otwieram zwykły tekst w..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Otwieram zwykłe teksty w..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Otwórz zwykły tekst w:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Otwórz zwykłe teksty w:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Otwieram tekst..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Otwieram teksty..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Otwieram tekst w..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Otwieram teksty w..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Otwórz tekst w:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Otwórz teksty w:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Wielkość"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 na %2 piksele"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Otwieram obrazek..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Otwieram obrazki..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Otwieram obrazek w..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Otwieram obrazki w..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Otwórz obrazek w:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Otwórz obrazki w:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Kliknij by zobaczyć w skali 1:1"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Otwieram animację..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Otwieram animacje..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Otwieram animację w..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Otwieram animacje w..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Otwórz animację w:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Otwórz animacje w:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Typ"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Otwórz ten plik"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Otwieram plik..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Otwieram pliki..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Otwieram plik w..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Otwieram pliki w..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Otwórz plik w:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Otwórz pliki w:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Otwórz plik dźwiękowy"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Otwieram plik dźwiękowy..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Otwieram pliki dźwiękowe..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Otwieram pliki dźwiękowe w..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Otwieram pliki dźwiękowe w..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Otwórz plik dźwiękowy w:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Otwórz pliki dźwiękowe w:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Cel"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Otwórz ten link"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Odnośnik nie zawiera URL-a do otwarcia."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Otwieram odnośnik..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Otwieram odnośniki..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Otwieram odnośnik w..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Otwieram odnośniki w..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Otwórz odnośnik w:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Otwórz odnośniki w:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(uruchom w terminalu)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Komentarz"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Polecenie"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Uruchom ten program"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "To uruchomianie nie ma określonego programu."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Uruchamiam program..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Uruchamiam programy..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Czerwony</i>: %1, <i>Zielony</i>: %2, <i>Niebieski</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Barwa</i>: %1, <i>Nasycenie</i>: %2, <i>Wartość</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Nazwa koloru CSS"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Rozszerzona nazwa koloru CSS"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Czy jest kolorem Sieci"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Brak"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2313,11 +2395,11 @@ msgstr ""
 "zawierać edytor obrazków).\n"
 "Czy chcesz otworzyć go w programie, który posiada taką możliwość?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Edytuj notatkę obrazkową"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2325,15 +2407,15 @@ msgstr ""
 "Ten animowany obrazek nie może być tu zmieniony.\n"
 "Czy chcesz otworzyć go w programie który może to wykonać?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Zmień animację"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Zmień kolor"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2343,74 +2425,97 @@ msgstr ""
 "Możesz jednak przeciągnąć kopię notatki do aplikacji, która posiada taką "
 "możliwość."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Zmień nieznaną notatkę"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Zmień odnośnik"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Ikona:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Cel:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Tytuł:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Zmień uruchamianie programu"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Wybierz polecenie do uruchomienia:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "Od&gadnij"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "P&olecenie:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Nazwa:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Czcionka:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Wielkość"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Kursywa"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Do lewej"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Wyśrodkowanie"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Do prawej"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Wyjustowanie"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2457,8 +2562,7 @@ msgstr "Wybierz rozmiar ikony do importu jako obrazek:"
 msgid "Load File Content into a Note"
 msgstr "Wczytaj zawartość pliku do notatki"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Ochrona hasłem"
@@ -2467,135 +2571,39 @@ msgstr "Ochrona hasłem"
 msgid "No private key selected."
 msgstr "Nie wybrano klucza prywatnego."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Koszyk"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksportuj"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importuj"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Idź do"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Notatka"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Znaczniki"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Pasek narzędzi formatowania tekstu"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&ltr:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Brak ochrony"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Chroń koszyk &hasłem"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Chroń koszyk &kluczem prywatnym:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Po lewej"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Po prawej"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "Pozycja drzewa &koszyków:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Na górze"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Na dole"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Pozycja paska &filtrowania:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "&Użyj dymków do powiadamiania o wynikach działań globalnych"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Co to są działania globalne?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2609,7 +2617,7 @@ msgstr ""
 "zmienić bieżący koszyk lub użyć środkowego przycisku myszy nad tą ikoną by "
 "wkleić bieżące zaznaczenie."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2617,7 +2625,7 @@ msgstr ""
 "Robiąc to, %1 pokazuje mały dymek z wiadomością informującą cię o "
 "zakończonej z powodzeniem akcji. Możesz wyłączyć ten dymek."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2627,63 +2635,63 @@ msgstr ""
 "główne okno jest widoczne. Dzieje się tak ponieważ jesteś w stanie widzieć "
 "rezultat swojego działania w głównym oknie."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Ikona tacki systemowej"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "&Dokuj w tacce systemowej"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "&Pokaż ikonę bieżącego koszyka w tacce systemowej"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "Ukryj główne okno kiedy nie ma nad nim kursora"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " dziesiątych sekundy"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "Pokaż &główne okno kiedy mysz jest nad ikoną w tacce systemowej"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Ani&macja zmian w koszykach"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "&Pokaż dymki w koszykach"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "&Duże notatki"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr "Zamień &linie zaczynające się * lub - na listy w edytorach tekstu"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Proś o potwierdzenie przed &usunięciem notatek"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "&Eksportuj znaczniki w tekście"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Kiedy to się stosuje?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2691,11 +2699,12 @@ msgstr ""
 "Znajduje zastosowanie kiedy kopiujesz/wklejach lub przeciągasz i upuszczasz "
 "notatki w edytorze tekstu."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr "Jeśli włączone, pozwala wkleić znaczniki w formie tekstowej."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2705,15 +2714,15 @@ msgstr ""
 "b> zostaną eksportowane jako wiersze poprzedzone <b>[ ]</b> lub <b>[x]</b>, "
 "reprezentującymi puste pole wyboru i wypełnione."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "&Grupuj nową notatkę klikając po prawej stronie linii wstawiania"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Jak zgrupować nową notatkę?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2723,7 +2732,7 @@ msgstr ""
 "wstawianie notatek przy pozycji kursora, ale także pozwala na grupowanie "
 "nowej notatki razem z tą, nad którą jest kursor:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2735,178 +2744,179 @@ msgstr ""
 "b> notatkę. <br>Kliknij po <b>prawej</b> aby <b>zgrupować</b> notatkę z inną "
 "<b>poniżej albo powyżej</b>, w zależności od położenia wskaźnika myszy.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Nic nie rób"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Wklej zawartość schowka"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Wstaw uruchamianie programów"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Wstaw kolor z ekranu"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Wczytaj notatkę z pliku"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Importuj uruchamianie z KMenu"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importuj ikonę"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+środkowy przycisk wszędzie:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "na pozycji kursora"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "A&utomatycznie blokuj chronione koszyki kiedy zamknięte od"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " minuty"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
-msgstr "Użyj agenta GnuPG dla koszyków chronionych kluczem &prywatnym/publicznym"
+msgstr ""
+"Użyj agenta GnuPG dla koszyków chronionych kluczem &prywatnym/publicznym"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "U&miejscowienie nowych notatek:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Przy bieżącej notatce"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Wielkość &nowych obrazków:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&na"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pikseli"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Wizualizuj..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Pokaż zawartość dodanych plików dla następujących typów"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "&Tekst zwykły"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "Strona &HTML"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Obrazek lub animacja"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "Dź&więk"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "nagranie audio konferencji"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Raport roczny"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Katalog domowy"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Uruchamianie programu %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Dźwięki"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Pliki"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Dowiązania &lokalne"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "Dowiązania &sieciowe"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "Uruc&hamianie programów"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Otwórz notatki &tekstowe w programie użytkownika:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Otwórz notatki tekstowe w:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Otwórz notatki &obrazkowe w programie użytkownika:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Otwórz obrazki w:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Otwórz a&nimacje w programie użytkownika:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Otwórz animacje w:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Otwórz pliki &dźwiękowe w programie użytkownika:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Otwórz pliki dźwiękowe w:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
 msgstr ""
-"<p>Jeśli opcja jest zaznaczona, program określony poniżej zostanie użyty do otwierania "
-"tego typu notatek.</p><p>W innym wypadku zostanie użyty program zdefiniowany "
-"w Konquerorze.</p>"
+"<p>Jeśli opcja jest zaznaczona, program określony poniżej zostanie użyty do "
+"otwierania tego typu notatek.</p><p>W innym wypadku zostanie użyty program "
+"zdefiniowany w Konquerorze.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2914,26 +2924,27 @@ msgstr ""
 "<p>Zdefiniuj program do otwierania tego typu notatek zamiast programu "
 "zdefiniowanego w Konquerorze.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Jak zmienić program używany do otwierania odnośników WWW?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Kiedy otwierasz linki WWW, otwierane są one w różnych programach w "
 "zależności od zawartości linka (strona WWW, obrazek, plik PDF...), tak jakby "
@@ -2949,11 +2960,11 @@ msgstr ""
 "lub...).</p><p>Dokładniejsze ustawienia (np. otwieranie tylko stron WWW w "
 "przeglądarce) opisane są w drugim linku.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Jak zmienić programy używane do otwierania plików i odnośników?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2962,12 +2973,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Tutaj dowiesz się jak ustawić programy używane dla każdego typu pliku. "
 "Stosuje się to także do linków WWW jeśli nie będziesz ich chciał otwierać w "
@@ -2992,7 +3003,8 @@ msgstr "Jak importować notatki?"
 
 #: softwareimporters.cpp:52
 msgid "&Keep original hierarchy (all notes in separate baskets)"
-msgstr "&Zachowaj oryginalną hierarchię (wszystkie notatki w oddzielnych koszykach)"
+msgstr ""
+"&Zachowaj oryginalną hierarchię (wszystkie notatki w oddzielnych koszykach)"
 
 #: softwareimporters.cpp:53
 msgid "&First level notes in separate baskets"
@@ -3058,7 +3070,8 @@ msgid ""
 msgstr "Z %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 "Nie mogę importować tego pliku. Albo jest zepsuty, albo to nie jest plik "
 "TuxCards."
@@ -3207,6 +3220,11 @@ msgstr "Ważne"
 msgid "Very Important"
 msgstr "Bardzo ważne"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animacja"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Pomysł"
@@ -3275,6 +3293,11 @@ msgstr "Do góry (Ctrl+Shift+Up)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Do dołu (Ctrl+Shift+Down)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Usuń"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Znacznik"
@@ -3373,7 +3396,8 @@ msgstr ""
 "każdej linii notatki."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 "Usunięcie znacznika spowoduje jego zniknięcie z każdej notatki do której "
 "został przydzielony."
@@ -3438,3 +3462,111 @@ msgstr ""
 "Zmień rozmiar okna by wybrać rozmiar obrazka\n"
 "i zamknij je lub wciśnij Escape by zaakceptować zmiany."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Koszyk"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksportuj"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importuj"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Idź do"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Notatka"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Znaczniki"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Pasek narzędzi formatowania tekstu"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Pasek narzędzi formatowania tekstu"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&ltr:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Otwórz"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Brak ochrony"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Chroń koszyk &hasłem"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Chroń koszyk &kluczem prywatnym:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Proszę pisać po angielsku lub francusku."
diff --git a/po/pt.po b/po/pt.po
index c053bce..ffd72c1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,22 +4,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-01-29 16:46+0000\n"
 "Last-Translator: Nuno J. Silva <nunojsg@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Nuno J. Silva"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -33,21 +34,27 @@ msgid ""
 msgstr ""
 "<p><b>Cuidando das suas ideias.</b></p><p>Uma aplicação para registar "
 "anotações que lhe permite escrever facilmente as suas ideias quando estas "
-"lhe vêm à cabeça, e encontrá-las facilmente mais tarde. Organizar as suas anotações nunca foi tão fácil.</p>"
+"lhe vêm à cabeça, e encontrá-las facilmente mais tarde. Organizar as suas "
+"anotações nunca foi tão fácil.</p>"
 
 #: aboutdata.cpp:34
 msgid "BasKet Note Pads"
 msgstr "Bloco de Notas BasKet"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Autoria e manutenção"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Encriptação de cestos, integração com o Kontact, importador do KnowIt"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -55,71 +62,79 @@ msgstr ""
 "Bloqueio automático de cestos, ícone do estado de guardado, copiar/colar "
 "HTML, dica com o nome do cesto, largar no cesto pelo nome"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Ícone"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Guardar como ficheiro de cestos"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Guardando como ficheiro de cestos. Por favor aguarde..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Este não é um ficheiro de cestos."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Erro do Ficheiro de Cestos"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Este ficheiro está corrompido. Não pode ser aberto."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
 "missing because they are of a type only available in new versions. When "
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
-msgstr "Este ficheiro foi criado com uma versão recente do %1. Pode ser aberto, mas nem todas as informações estarão disponíveis. Por exemplo, algumas anotações poderão não aparecer porque são de um tipo apenas disponível em novas versões. Ao guardar o ficheiro, considere guardá-lo noutro ficheiro, para preservar o original."
+msgstr ""
+"Este ficheiro foi criado com uma versão recente do %1. Pode ser aberto, mas "
+"nem todas as informações estarão disponíveis. Por exemplo, algumas anotações "
+"poderão não aparecer porque são de um tipo apenas disponível em novas "
+"versões. Ao guardar o ficheiro, considere guardá-lo noutro ficheiro, para "
+"preservar o original."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
-msgstr "Este ficheiro foi criado com uma versão recente do %1. Por favor actualize para uma nova versão a fim de conseguir abrir este ficheiro."
+msgstr ""
+"Este ficheiro foi criado com uma versão recente do %1. Por favor actualize "
+"para uma nova versão a fim de conseguir abrir este ficheiro."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Salvaguardar e restaurar"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Guardar pasta"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
-msgstr "Os seus cestos estão actualmente guardados na seguinte pasta:<br><b>%1</b>"
+msgstr ""
+"Os seus cestos estão actualmente guardados na seguinte pasta:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&Mover para outra pasta..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "&Usar outra pasta existente..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Porquê fazer isto?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -131,154 +146,183 @@ msgid ""
 "</li></ul><p>Please remember that you should not change the content of that "
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
-msgstr "<p>Pode mover a pasta onde o %1 guarda os seus cestos para:</p><ul><li>Guardar os seus cestos num sítio visível na sua pasta pessoal, como por exemplo ~/Anotações ou ~/Cestos, para que possa fazer manualmente cópias de segurança quando quiser.</li><li>Guarde os seus cestos num servidor para os partilhar entre dois computadores.<br>Neste caso, monte a pasta partilhada no sistema de ficheiros local e configure o %2 para usar esse ponto de montagem.<br>Aviso: Não deve correr o %3 ao mesmo tempo nos dois computadores, ou arrisca-se a perder dados enquanto as duas aplicações não estão sincronizadas.</li></ul><p>Lembre-se que não deve modificar manualmente o conteúdo dessa pasta (p. ex. adicionar um ficheiro na pasta de um cesto não irá adicionar esse ficheiro ao cesto).</p>"
-
-#: backup.cpp:89
+msgstr ""
+"<p>Pode mover a pasta onde o %1 guarda os seus cestos para:</"
+"p><ul><li>Guardar os seus cestos num sítio visível na sua pasta pessoal, "
+"como por exemplo ~/Anotações ou ~/Cestos, para que possa fazer manualmente "
+"cópias de segurança quando quiser.</li><li>Guarde os seus cestos num "
+"servidor para os partilhar entre dois computadores.<br>Neste caso, monte a "
+"pasta partilhada no sistema de ficheiros local e configure o %2 para usar "
+"esse ponto de montagem.<br>Aviso: Não deve correr o %3 ao mesmo tempo nos "
+"dois computadores, ou arrisca-se a perder dados enquanto as duas aplicações "
+"não estão sincronizadas.</li></ul><p>Lembre-se que não deve modificar "
+"manualmente o conteúdo dessa pasta (p. ex. adicionar um ficheiro na pasta de "
+"um cesto não irá adicionar esse ficheiro ao cesto).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Cópias de segurança"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Salvaguardar..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Restaurar uma cópia de segurança..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Última cópia de segurança: nunca"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Última cópia de segurança: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Escolha uma pasta para a qual mover os cestos"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "A pasta <b>%1</b> não está vazia. Deseja realmente subsituí-la?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Substituir pasta?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "&Substituir"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Os seus cestos foram movidos com sucesso para <b>%1</b>. O %2 vai ser reiniciado para finalizar a alteração."
+msgstr ""
+"Os seus cestos foram movidos com sucesso para <b>%1</b>. O %2 vai ser "
+"reiniciado para finalizar a alteração."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Escolha uma pasta existente para guardar cestos"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
-msgstr "A pasta onde são guardados os cestos foi alterada com sucesso para <b>%1</b>. O %2 vai ser reiniciado para finalizar a alteração."
+msgstr ""
+"A pasta onde são guardados os cestos foi alterada com sucesso para <b>%1</"
+"b>. O %2 vai ser reiniciado para finalizar a alteração."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Cestos_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Arquivos Tar comprimidos pelo Gzip"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Salvaguardar Cestos"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "O ficheiro <b>%1</b> já existe. Deseja realmente substituí-lo?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Substituir ficheiro?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "A salvaguardar os cestos. Por favor aguarde..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Abrir ficheiro de cestos"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "LEIAME.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Esta é uma cópia dos seus cestos tal e qual como eles estavam antes de restaurar a cópia de segurança %1."
+msgstr ""
+"Esta é uma cópia dos seus cestos tal e qual como eles estavam antes de "
+"restaurar a cópia de segurança %1."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
-msgstr "Se o restauro foi efectuado com sucesso, e conseguiu recuperar o que queria, pode apagar esta pasta."
+msgstr ""
+"Se o restauro foi efectuado com sucesso, e conseguiu recuperar o que queria, "
+"pode apagar esta pasta."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Se alguma coisa correu mal durante o processo de restauro, pode reutilizar esta pasta para guardar os seus cestos e não perderá nada."
+msgstr ""
+"Se alguma coisa correu mal durante o processo de restauro, pode reutilizar "
+"esta pasta para guardar os seus cestos e não perderá nada."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Escolha \"Cesto\" -> \"Salvaguar e restaurar...\" -> \"Usar outra pasta existente...\" e escolha essa pasta."
+msgstr ""
+"Escolha \"Cesto\" -> \"Salvaguar e restaurar...\" -> \"Usar outra pasta "
+"existente...\" e escolha essa pasta."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "A restaurar <b>%1</b>. Por favor aguarde..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr "Se algo correr mal durante o processo de restauro, leia o ficheiro <b>%1</b>."
+msgstr ""
+"Se algo correr mal durante o processo de restauro, leia o ficheiro <b>%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Restaurar cestos"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
-msgstr "Este ficheiro ou não é uma cópia de segurança de cestos ou está corrompido. Não pode ser importado. Em vez disso, os seus cestos antigos foram preservados."
+msgstr ""
+"Este ficheiro ou não é uma cópia de segurança de cestos ou está corrompido. "
+"Não pode ser importado. Em vez disso, os seus cestos antigos foram "
+"preservados."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Erro de restauro"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "A sua cópia de segurança foi restaurada com sucesso para <b>%1</b>. O %2 vai ser reiniciado"
+msgstr ""
+"A sua cópia de segurança foi restaurada com sucesso para <b>%1</b>. O %2 vai "
+"ser reiniciado"
 
 #: backup.cpp:338
 msgid "Restart"
@@ -296,49 +340,51 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Cestos antes do restauro (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "A nova anotação não coincide com o filtro e por isso não está visível."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
-msgstr "Uma nova anotação não coincide com o filtro e por isso não está visível."
+msgstr ""
+"Uma nova anotação não coincide com o filtro e por isso não está visível."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr ""
 "Algumas anotações recentemente criadas não coincidem com o filtro e por isso "
 "não estão visíveis."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
-msgstr "As novas anotações não coincidem com o filtro e por isso não estão visíveis."
+msgstr ""
+"As novas anotações não coincidem com o filtro e por isso não estão visíveis."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Agrupar"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Inserir"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "Largado no cesto <i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
 msgstr ""
-"Esta mensagem não devia aparecer. Se está a vê-la, é porque o programa "
-"tem falhas! Por favor informe o programador sobre a falha."
+"Esta mensagem não devia aparecer. Se está a vê-la, é porque o programa tem "
+"falhas! Por favor informe o programador sobre a falha."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -346,48 +392,48 @@ msgstr ""
 "Introduza aqui a anotação\n"
 "Clique com o botão direito para mais opções"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Alterar a largura destas colunas"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Redimensionar este grupo"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Redimensionar esta anotação"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Seleccionar ou mover esta anotação"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Seleccionar ou mover este grupo"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Adicionar ou remover classificações da anotação"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Classificações atribuídas</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Expandir este grupo"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Fechar este grupo"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -395,7 +441,7 @@ msgstr ""
 "Agrupar esta anotação com a seguinte\n"
 "Clique com o botão direito para mais opções"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -403,46 +449,46 @@ msgstr ""
 "Agrupar esta anotação com a anterior\n"
 "Clique com o botão direito para mais opções"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Adicionado"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Última modificação"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Clique na direita para agrupar em vez de inserir"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Clique na esquerda para inserir em vez de agrupar"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "Desbloq&uear"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Cesto protegido com palavra-passe."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Clique em Desbloquear para acedê-lo."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Não existe suporte para encriptação<br/>nesta versão do %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -450,27 +496,32 @@ msgstr ""
 "Para manter os cestos desbloqueados, altere a duração do "
 "bloqueio<br>automático nas definições do programa."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "A carregar..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Remover todas"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Personalizar..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "&Filtrar por esta Classificação"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Filtrar por este E&stado"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Classificações"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -479,7 +530,7 @@ msgstr ""
 "<qt>Deseja mesmo apagar esta anotação?</qt>\n"
 "<qt>Deseja mesmo apagar estas <b>%n</b> anotações?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -487,7 +538,7 @@ msgstr ""
 "Apagar anotação\n"
 "Apagar anotações"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -495,7 +546,7 @@ msgstr ""
 "Anotação copiada para a área de transferência.\n"
 "Anotações copiada para a área de transferência."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -503,7 +554,7 @@ msgstr ""
 "Mover anotação para a área de transferência.\n"
 "Mover anotações para a área de transferência."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -511,39 +562,44 @@ msgstr ""
 "Anotação copiada para a selecção.\n"
 "Anotações copiadas para a selecção."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Incapaz de abrir anotação."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Não está autorizado a abir este ficheiro."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Guardar para Ficheiro"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Por favor introduza a palavra-passe para a seguinte chave privada:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Por favor introduza a palavra passe para o cesto <b>%1</b>:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Por favor atribua uma palavra-passe ao cesto <b>%1</b>:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Espaço em Disco Insuficiente Para Guardar Dados do Cesto"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Permissões do Ficheiro do Cesto Erradas"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -551,18 +607,46 @@ msgstr ""
 "Por favor remova ficheiros do disco <b>%1</b> para a aplicação poder guardar "
 "as suas alterações de uma forma segura."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
 msgstr ""
-"As permissões do ficheiro <b>%1</b> estão incorrectas. Por favor verifique se tem "
-"acesso de escrita ao mesmo e às pastas em que ele se encontra."
+"As permissões do ficheiro <b>%1</b> estão incorrectas. Por favor verifique "
+"se tem acesso de escrita ao mesmo e às pastas em que ele se encontra."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Erro ao Guardar"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Mostar/ocultar a janela principal"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"&Mostrar a janela principal quando o apontador \n"
+"está sobre o ícone do tabuleiro de sistema durante"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Abrir ficheiro de cestos"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Desculpe, mas a criação da pasta para este novo cesto falhou."
@@ -573,7 +657,8 @@ msgstr "Criação do Cesto Falhou"
 
 #: basketfactory.cpp:90
 msgid "Sorry, but the template copying for this new basket has failed."
-msgstr "Desculpe, mas o processo de cópia do modelo para este novo cesto falhou."
+msgstr ""
+"Desculpe, mas o processo de cópia do modelo para este novo cesto falhou."
 
 #: basketfactory.cpp:111
 msgid "Sorry, but the template customization for this new basket has failed."
@@ -595,10 +680,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Propriedades do Cesto"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Nome"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Imagem de fundo:"
@@ -654,18 +743,18 @@ msgid ""
 "useful in addition to the configurable global shortcuts, eg. to paste the "
 "clipboard or the selection into the current basket from anywhere.</p>"
 msgstr ""
-"<p><strong>Lembre-se facilmente dos seus atalhos</strong>:<br>Com a primeira opção, ao "
-"dar ao cesto um atalho do tipo <strong>Alt+Letra</strong> irá sublinhar essa "
-"letra na árvore de cestos.<br>Por exemplo, se associar o atalho <i>Alt+I</i> "
-"a um cesto chamado <i>Ideias</i>, o cesto irá aparecer na árvore como "
-"<i><u>I</u>deias</i>. Isto ajuda-o a ver os atalhos e a decorá-los "
-"facilmente.</p><p><strong>Local vs Global</strong>:<br>A primeira opção "
-"permite abrir o cesto quando a janela principal está aberta. Os atalhos "
-"globais funcionam em qualquer altura, mesmo se a janela estiver ocultada.</"
-"p><p><strong>Mostar vs Mudar</strong>:<br>A última opção faz com que este "
-"seja o cesto activo sem abrir a janela principal. Esta função é útil em "
-"conjunto com os atalhos globais para, por exemplo, colar o conteúdo da área-"
-"de-transferência no cesto activo em qualquer altura.</p>"
+"<p><strong>Lembre-se facilmente dos seus atalhos</strong>:<br>Com a primeira "
+"opção, ao dar ao cesto um atalho do tipo <strong>Alt+Letra</strong> irá "
+"sublinhar essa letra na árvore de cestos.<br>Por exemplo, se associar o "
+"atalho <i>Alt+I</i> a um cesto chamado <i>Ideias</i>, o cesto irá aparecer "
+"na árvore como <i><u>I</u>deias</i>. Isto ajuda-o a ver os atalhos e a "
+"decorá-los facilmente.</p><p><strong>Local vs Global</strong>:<br>A primeira "
+"opção permite abrir o cesto quando a janela principal está aberta. Os "
+"atalhos globais funcionam em qualquer altura, mesmo se a janela estiver "
+"ocultada.</p><p><strong>Mostar vs Mudar</strong>:<br>A última opção faz com "
+"que este seja o cesto activo sem abrir a janela principal. Esta função é "
+"útil em conjunto com os atalhos globais para, por exemplo, colar o conteúdo "
+"da área-de-transferência no cesto activo em qualquer altura.</p>"
 
 #: basketproperties.cpp:149
 msgid "S&how this basket"
@@ -691,21 +780,23 @@ msgstr ""
 
 #: basketstatusbar.cpp:148
 msgid "<p>This basket is <b>locked</b>.<br>Click to unlock it.</p>"
-msgstr "<p>Este cesto está <b>bloqueado</b>.<br>Clique aqui para o desbloquear.</p>"
+msgstr ""
+"<p>Este cesto está <b>bloqueado</b>.<br>Clique aqui para o desbloquear.</p>"
 
 #: basketstatusbar.cpp:153
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
-msgstr "<p>Este cesto está <b>desbloqueado</b>.<br>Clique aqui para o bloquear.</p>"
+msgstr ""
+"<p>Este cesto está <b>desbloqueado</b>.<br>Clique aqui para o bloquear.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Geral"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Mostar/ocultar a janela principal"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
@@ -713,11 +804,11 @@ msgstr ""
 "Permite-lhe abrir a janela principal se esta estiver ocultada, e ocultá-la "
 "se estiver aberta."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Colar o conteúdo da área-de-transferência no cesto actual"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
@@ -725,31 +816,31 @@ msgstr ""
 "Permite-lhe colar os conteúdos da área de transferência no cesto activo sem "
 "ter de abrir a janela principal."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Mostrar o nome do cesto activo"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "Permite-lhe saber qual é o cesto activo sem abrir a janela principal."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Colar selecção no cesto actual"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
 msgstr ""
-"Permite-lhe colar a selecção para o cesto "
-"activo sem ter de abrir a janela principal."
+"Permite-lhe colar a selecção para o cesto activo sem ter de abrir a janela "
+"principal."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Criar um novo cesto"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -759,11 +850,11 @@ msgstr ""
 "pode usar os atalhos globais para adicionar uma anotação, colar o conteúdo "
 "da área de transferência ou colar a selecção no novo cesto)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Ir para o cesto anterior"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
@@ -771,11 +862,11 @@ msgstr ""
 "Permite-lhe mudar o cesto activo para o cesto anterior sem ter de abrir a "
 "janela principal."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Ir para o cesto seguinte"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -783,59 +874,69 @@ msgstr ""
 "Permite-lhe mudar o cesto activo para o cesto seguinte sem ter de abrir a "
 "janela principal."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Inserir anotação com texto"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr ""
-"Adicionar uma anotação com texto ao cesto activo sem ter de abrir a "
-"janela principal."
+"Adicionar uma anotação com texto ao cesto activo sem ter de abrir a janela "
+"principal."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Inserir anotação com imagem"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
-msgstr "Adicionar uma anotação com imagem ao cesto activo sem ter de abrir a janela principal."
+msgstr ""
+"Adicionar uma anotação com imagem ao cesto activo sem ter de abrir a janela "
+"principal."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Inserir anotação com ligação"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Adicionar uma anotação com uma ligação ao cesto activo sem ter de abrir a janela principal."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Adicionar uma anotação com uma ligação ao cesto activo sem ter de abrir a "
+"janela principal."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Inserir anotação com cor"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
-msgstr "Adicionar uma anotação com uma cor ao cesto activo sem ter de abrir a janela principal."
+msgstr ""
+"Adicionar uma anotação com uma cor ao cesto activo sem ter de abrir a janela "
+"principal."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Escolher cor a partir do ecrã"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
-msgstr "Adicionar uma anotação com uma cor escolhida do ecrã ao cesto activo sem ter de abrir a janela principal."
+msgstr ""
+"Adicionar uma anotação com uma cor escolhida do ecrã ao cesto activo sem ter "
+"de abrir a janela principal."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Fotografar zona do ecrã"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -843,15 +944,11 @@ msgstr ""
 "Fotografar uma zona no ecrã e guardá-la como uma imagem no cesto activo sem "
 "ter de abrir a janela principal."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Cestos"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Por favor escreva em Francês ou em Inglês."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -863,243 +960,248 @@ msgstr ""
 "criando novos cestos dentro de outros. Pode navegar entre eles clicando num "
 "cesto para o abrir, ou reorganizá-los usando arrastar-e-largar."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Ficheiro de cestos..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Ocultar Janela"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "Página web &HTML"
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Ficheiro &de texto..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "S&alvaguardar e restaurar..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Eliminar"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Selecciona todas as anotações"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Desselecio&nar Tudo"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Desselecciona todas as notas seleccionadas"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Inverter Selecção"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Inverte a selecção actual de anotações"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Editar..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Abrir"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Abrir &com..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "&Guardar para Ficheiro"
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "Ag&rupar"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "&Desagrupar"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Mover para o &Topo"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "Mover para Ci&ma"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "Mover para &Baixo"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Mover para o &Fim"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Texto"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "&Ligação"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Imagem"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Cor"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "L&ançador"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Importar Lançador do menu do &TDE..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Im&portar Ícone..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Carregar do &Ficheiro..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "C&or a partir do Ecrã"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Foto&grafar Zona do Ecrã"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Novo Cesto"
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Novo sub-&cesto..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Novo Cesto I&rmão..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Novo..."
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Propriedades do Cesto"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Remover"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Pala&vra-passe"
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "B&loquear"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Filtrar"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Filtrar todos &os Cestos"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "&Reiniciar filtro"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Cesto anterior"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "Cesto Segui&nte"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "&Fechar Cesto"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "&Expandir Cesto"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Configurar os Atalhos &Globais..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "&Cestos de boas-vindas"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Conversão de Anotações de Texto Simples"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "A converter anotações de texto simples em texto formatado..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Sem anotações"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1108,7 +1210,7 @@ msgstr ""
 "%n anotação\n"
 "%n anotações"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1117,15 +1219,15 @@ msgstr ""
 "%n seleccionada\n"
 "%n seleccionadas"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "todas as correspondências"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "sem filtro"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1134,31 +1236,29 @@ msgstr ""
 "%n correspondência\n"
 "%n correspondências"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "A cor escolhida foi guardada no cesto <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
-msgstr ""
-"As anotações de texto simples foram convertidas em texto "
-"formatado"
+msgstr "As anotações de texto simples foram convertidas em texto formatado"
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Conversão Terminada"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Não existem anotações de texto simples para converter."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1168,92 +1268,97 @@ msgid ""
 "sure the application is correctly installed but you had a preview version of "
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
-"<p><b>O ficheiro basketui.rc parece não existir ou é demasiado antigo.<br>O %1 não pode correr sem ele e irá encerrar.</b></p><p>Por favor verifique a sua "
-"instalação do %2.</p><p>Se não tiver direitos de administrador para instalar "
-"a aplicação ao nível do sistema, pode copiar o ficheiro basketui.rc do "
-"arquivo de instalação para a pasta <a href='file://%3'>%4</a>.</p><p>Como "
+"<p><b>O ficheiro basketui.rc parece não existir ou é demasiado antigo.<br>O "
+"%1 não pode correr sem ele e irá encerrar.</b></p><p>Por favor verifique a "
+"sua instalação do %2.</p><p>Se não tiver direitos de administrador para "
+"instalar a aplicação ao nível do sistema, pode copiar o ficheiro basketui.rc "
+"do arquivo de instalação para a pasta <a href='file://%3'>%4</a>.</p><p>Como "
 "último recurso, se tem a certeza de que a aplicação está bem instalada, mas "
-"tinha uma versão de teste da mesma, experimente remover o ficheiro %5basketui.rc</p>"
+"tinha uma versão de teste da mesma, experimente remover o ficheiro "
+"%5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Recurso não Encontrado"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Impossível adicionar anotação."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Zona do ecrã fotografada para o cesto <i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Apagar Cesto"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Apagar Apenas esse Cesto"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Apagar anotações e sub-anotações"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
-msgstr "<qt>Deseja realmente remover o cesto<b>%1</b> e os seus conteúdos?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+msgstr ""
+"<qt>Deseja realmente remover o cesto<b>%1</b> e os seus conteúdos?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Remover Cesto"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Remover Cesto"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
-msgstr "<qt><b>%1</b> tem os seguintes sub-cestos.<br>Deseja removê-los também?</qt>"
+msgstr ""
+"<qt><b>%1</b> tem os seguintes sub-cestos.<br>Deseja removê-los também?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Remover Sub-cestos"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "&Remover Sub-cestos"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Ficheiros de cestos"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "O conteúdo da área de transferência foi colado no cesto <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Selecção colada no cesto <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Não foi adicionada nenhuma anotação."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "O cesto <i>%1</i> está bloqueado"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Bloqueado)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "&Atribuir nova Classificação..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Remover todas"
 
@@ -1344,11 +1449,11 @@ msgstr "C&lassificação:"
 msgid "Filter all Baskets"
 msgstr "Filtrar todos os Cestos"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Sem classificação)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Classificado)"
 
@@ -1439,35 +1544,35 @@ msgstr "(Pré-definida)"
 msgid "Other..."
 msgstr "Outra..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Lista de Chaves Privadas"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Email"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Escolha uma chave privada:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "A lista de chaves terminou inesperadamente."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Essa chave pública não foi criada para encriptação."
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Algoritmo não suportado"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Palavra-passe errada."
 
@@ -1507,21 +1612,32 @@ msgstr "Sistema de Ficheiros"
 msgid "File Types"
 msgstr "Tipos de Ficheiros"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
-msgstr "*.png *.xpm *.svg *.svgz|Ficheiros de Ícones (*.png *.xpm *.svg *.svgz)"
+msgstr ""
+"*.png *.xpm *.svg *.svgz|Ficheiros de Ícones (*.png *.xpm *.svg *.svgz)"
+
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Abrir"
 
-#: likeback.cpp:74
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
-msgstr "Envie um comentário aos programadores da aplicação sobre algo de que gosta"
+msgstr ""
+"Envie um comentário aos programadores da aplicação sobre algo de que gosta"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 "Envie um comentário aos programadores da aplicação sobre algo de que não "
 "gosta"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
@@ -1529,31 +1645,31 @@ msgstr ""
 "Envie um comentário aos programadores da aplicação sobre um comportamento "
 "anormal da aplicação"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 "Envie um comentário aos programadores da aplicação sobre uma nova "
 "funcionalidade que deseje"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "Enviar um Comentário ao&s Programadores"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Seja bem-vindo a esta versão de teste do %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Seja bem-vindo ao %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Para nos ajudar a melhorar, os seus comentários são importantes."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1563,7 +1679,7 @@ msgstr ""
 "apropriada debaixo da barrade título da janela, descreva brevemente aquilo "
 "de que gosta ou não gosta e clique em Enviar."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1572,7 +1688,7 @@ msgstr ""
 "debaixo da barrade título da janela, descreva brevemente aquilo de que gosta "
 "e clique em Enviar."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1581,7 +1697,7 @@ msgstr ""
 "debaixo da barrade título da janela, descreva brevemente aquilo de que não "
 "gosta e clique em Enviar."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
@@ -1591,7 +1707,7 @@ msgstr ""
 "clique no ícone de objecto partido no canto superior direito da janela, "
 "descreva-o e clique em Enviar."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1601,7 +1717,7 @@ msgstr ""
 "objecto quebrado debaixo da barra-de-título, descreva brevemente o "
 "comportamento anormal e clique em Enviar."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1609,17 +1725,18 @@ msgstr ""
 "Exemplo:\n"
 "Exemplos:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Eu gosto</b> no novo aspecto gráfico. Muito refrescante."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 "<b>Eu não gosto</b> da página de boas-vindas do assistente. Consome "
 "demasiado tempo."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
@@ -1627,25 +1744,25 @@ msgstr ""
 "<b>A aplicação teve um comportamento anormal</b> quando eu cliquei no botão "
 "Adicionar. Não aconteceu nada."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 "<b>Eu gostaria de uma nova funcionalidade</b> que me permitisse enviar o meu "
 "trabalho por e-mail."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Ajudar a Melhorar a Aplicação"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Endereço de Correio Electrónico"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Por favor forneça o seu endereço de correio electrónico."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1655,7 +1772,7 @@ msgstr ""
 "sobre os seus comentários, para lhe perguntar como reproduzir as falhas que "
 "reportou, enviar correcções da falha para que as teste, etc."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1663,57 +1780,56 @@ msgstr ""
 "O endereço de correio electrónico é opcional. Se não fornecer nenhum, os "
 "seus comentários serão enviados de forma anónima."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Enviar um Comentário aos Programadores"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Enviar aos Programadores da Aplicação um Comentário Sobre:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "A&lgo de que goste"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Algo &de que não goste"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Um &comportamento anormal desta aplicação"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Uma nova &funcionalidade que deseje"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "Mostrar botões de comentário debaixo das barras-de-título das &janelas"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "E&nviar Comentário"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "&Endereço de Correio Electrónico..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Por favor forneça uma breve descrição da sua opinião sobre %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Por favor escreva em Inglês."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr "Poderá usar uma <a href=\"%1\">ferramenta de tradução on-line</a>."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1721,21 +1837,21 @@ msgstr ""
 "Para tornar mais úteis os comentários que envia para melhorar a aplicação, "
 "tente enviar a mesma quantidade de comentários positivos e negativos."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr "<b>Não</b> peça funcionalidades: o seu pedido será ignorado."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Ocorreu um erro ao tentar enviar o relatório.</p><p>Por favor tente "
 "novamente mais tarde.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Erro de Transferência"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1743,7 +1859,7 @@ msgstr ""
 "<p>O seu comentário foi enviado com sucesso. Isto irá ajudar-nos a melhorar "
 "a aplicação.</p><p>Agradecemos a sua disponibilidade. </p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Comentário Enviado"
 
@@ -1846,19 +1962,19 @@ msgstr ""
 msgid "Example"
 msgstr "Exemplo"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Cesto"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Deseja mesmo sair do %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1867,7 +1983,7 @@ msgstr ""
 "<p>Não necessita de sair do programa antes de terminar a sua sessão do TDE: "
 "ele será iniciado automaticamente da próxima vez que iniciar sessão.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Confirmar Saída"
 
@@ -1938,7 +2054,7 @@ msgstr "Liv&re"
 msgid "Mind map"
 msgstr "Mapa mental"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Imagem)"
 
@@ -1962,6 +2078,11 @@ msgstr "Animação"
 msgid "Sound"
 msgstr "Som"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Ficheiros"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Ligação"
@@ -1970,7 +2091,7 @@ msgstr "Ligação"
 msgid "Launcher"
 msgstr "Lançador"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Cor"
 
@@ -2018,271 +2139,280 @@ msgstr "Editar esta cor"
 msgid "Edit this unknown object"
 msgstr "Editar este objecto desconhecido"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "A abrir texto simples..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "A abrir textos simples..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "A abrir texto simples com..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "A abrir textos simples com..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Abrir texto simples com:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Abrir textos simples com:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "A abrir texto..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "A abrir textos..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "A abrir texto com..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "A abrir textos com..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Abrir texto com:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Abrir textos com:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Tamanho"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 por %2 pixels"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "A abir imagem..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "A abrir imagens..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "A abrir imagem com..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "A abrir imagens com..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Abrir imagem com:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Abrir imagens com:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Clique para ver no tamanho normal"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "A abrir animação..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "A abrir animações..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "A abrir animação com..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "A abrir animações com..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Abrir animação com:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Abrir animações com:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Tipo"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Abrir este ficheiro"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "A abrir ficheiro..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "A abrir ficheiros..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "A abrir ficheiro com..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "A abrir ficheiros com..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Abrir ficheiro com:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Abrir ficheiros com:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Abrir este som"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "A abrir som..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "A abrir sons..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "A abrir som com..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "A abrir sons com..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Abrir som com:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Abrir sons com:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Destino"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Abrir esta ligação"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "A ligação não tem nenhum URL para abrir."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "A abrir o destino da ligação..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "A abrir os destinos das ligações..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "A abrir o destino da ligação com..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "A abrir os destinos das ligações com..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Abrir destino da ligação com:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Abrir destinos das ligações com:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(correr no terminal)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Comentário"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Comando"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Executar esta aplicação"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "O lançador não tem nenhum comando para executar."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "A lançar aplicação..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "A lançar aplicações..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Vermelho (R)</i>: %1, <i>Verde (G)</i>: %2, <i>Azul (B)</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Matiz</i>: %1, <i>Saturação</i>: %2, <i>Valor</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Nome de Cor CSS"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Nome Estendido de Cor CSS"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "É uma Cor Web"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Nenhuma"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2292,11 +2422,11 @@ msgstr ""
 "Notas BasKet incluirá um editor de imagens).\n"
 "Deseja abrir a imagem com uma aplicação capaz de a editar?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Editar Anotação com Imagem"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2304,15 +2434,15 @@ msgstr ""
 "Esta imagem animada não pode ser editada aqui.\n"
 "Deseja abri-la com uma aplicação que suporte imagens animadas?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Editar Anotação com Animação"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Editar Anotação com Cor"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2322,74 +2452,97 @@ msgstr ""
 "editado neste programa.\n"
 "No entanto pode arrastar os mesmos para uma aplicação que os compreenda."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Editar Anotação Desconhecida"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Editar Anotação com Ligação"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Automático"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Ícone:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Destino:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Título:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Editar Anotação com Lançador"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Escolha um comando a executar:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Adivinhar"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "Coman&do:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "Tipo de &Letra:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Tamanho"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Negrito"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "I&tálico"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Alinhar à Esquerda"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Centrado"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Alinhar à Direita"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "Justificado"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2436,8 +2589,7 @@ msgstr "Escolha o tamanho do ícone a importar como imagem:"
 msgid "Load File Content into a Note"
 msgstr "Carregar Conteúdodo Ficheiro para a Nota"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Protecção por Palavra-passe"
@@ -2446,135 +2598,39 @@ msgstr "Protecção por Palavra-passe"
 msgid "No private key selected."
 msgstr "Nenhuma chave privada seleccionada."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "Ce&sto"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportar"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Importar"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "I&r"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "A&notação"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "&Classificações"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Barra de Ferramentas de Formatação de Texto"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Fi&ltrar:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Sem protecção"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+S"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Proteger cesto com uma &palavra-passe"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Proteger cesto com chave p&rivada:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+R"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "À esquerda"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "À direita"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "Posição da árvor&e de cestos:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "No topo"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "No fundo"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Posição da barra de &filtragem:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "&Usar balões para relatar os resultados de acções globais"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "O que são acções globais?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2588,7 +2644,7 @@ msgstr ""
 "rato sobre o ícone da bandeja do painel para mudar o cesto activo, ou usar o "
 "botão do meio do rato nesse ícone para colar a selecção actual."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2596,7 +2652,7 @@ msgstr ""
 "Ao fazê-lo, %1 mostra uma mensagem num pequeno balão a informá-lo de que a "
 "acção foi concluída com sucesso. Pode desactivar esse balão."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2606,65 +2662,66 @@ msgstr ""
 "aparecer caso a janela principal esteja aberta. Isto deve-se ao facto de "
 "você já estar a visualizar o resultado das suas acções na janela principal."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Ícone do Tabuleiro de Sistema"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "Ancorar no ta&buleiro de sistema"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "Mostrar o ícone no cesto act&ual no ícone do tabuleiro do sistema"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "Ocultar a janela pr&incipal quando o apontador está fora dela há"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr " décimas de segundo"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr ""
 "&Mostrar a janela principal quando o apontador \n"
 "está sobre o ícone do tabuleiro de sistema durante"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Animar a&lterações nos cestos"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "Mostrar dica&s nos cestos."
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "Anotações &grandes"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
-msgstr "&Transformar linhas começadas por * ou - em listas nos editores de texto"
+msgstr ""
+"&Transformar linhas começadas por * ou - em listas nos editores de texto"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Pedir confirmação antes &de apagar anotações"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "E&xportar classificações com o texto"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Quando é que isto se aplica?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
@@ -2672,13 +2729,14 @@ msgstr ""
 "Aplica-se quando copia e cola, ou arrasta e larga anotações para um editor "
 "de texto."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 "Se activado, esta propriedade permite-lhe colar as classificações como "
 "equivalentes textuais."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2689,15 +2747,15 @@ msgstr ""
 "b>, representando uma caixa de verificação vazia e uma caixa de vericação "
 "marcada."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "A&grupar uma nova anotação ao clicar na direita da linha de inserção"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Como agrupar uma nova anotação?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2707,7 +2765,7 @@ msgstr ""
 "inserir notas na posição actual do cursor como também lhe permite agrupar "
 "uma nova nota com a que se encontra sob o cursor:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2720,179 +2778,180 @@ msgstr ""
 "anotação com a que estiver <b>abaixo ou acima</b>, dependendo do local onde "
 "se encontra o seu apontador.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Não fazer nada"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Colar o conteúdo da área de transferência"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Inserir anotação com lançador"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Inserir cor a partir do ecrã"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Carregar anotação a partir de ficheiro"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Importar Lançador do menu do TDE"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Importar ícone"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+clique-com-o-botão-do-meio em qualquer sítio:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "na posição do cursor"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "Bloq&uear automaticamente os cestos protegidos quando fechado durante"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " minutos"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr ""
 "Usar o agente do GnuPG &para as chaves públicas/privadas dos cestos "
 "protegidos"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Localização das novas anotações:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Na anotação actual"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Tamanho das &novas imagens:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "po&r"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "pixels"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Visualizar..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Ver o Conteúdo dos Ficheiros Adicionados para os Seguintes Tipos"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "Texto sim&ples"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "Página &HTML"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Imagem ou animação"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Sons"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Gravação áudio da conferência"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Relatório anual"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Directoria pessoal"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Lançar %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Sons"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Ficheiros"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Ligações &Locais"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "L&igações de Rede"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "Lança&dores"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Abrir anotações com &texto numa aplicação diferente:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Abrir anotações com texto com:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Abrir anotações com &imagens numa aplicação diferente:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Abrir anotações com imagens com:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Abrir anotações com a&nimações numa aplicação diferente:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Abrir anotações com animações com:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Abir anotações com som n&uma aplicação diferente:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Abrir anotações com sons com:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
 msgstr ""
 "<p>Se estiver seleccionado, a aplicação definida de seguida será usada para "
-"abrir anotações desse tipo.</p><p>Caso contrário, será usada a aplicação definida no Konqueror.</p>"
+"abrir anotações desse tipo.</p><p>Caso contrário, será usada a aplicação "
+"definida no Konqueror.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2900,48 +2959,49 @@ msgstr ""
 "<p>Defina a aplicação a usar para abrir anotações deste tipo, em vez da "
 "aplicação configurada do Konqueror.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Como mudar as aplicações usadas para abrir ligações para a Web?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Ao abrir ligações para a Web, elas são abertas em aplicações diferentes, "
-"dependendo do conteúdo da ligação (uma página Web, uma imagem, um "
-"documento PDF,...), tal como se fossem ficheiros armazenados no seu "
-"computador.</p><p>Eis como fazer se quiser abrir todos os endereços Web no "
-"seu navegador Web. Isto é útil se não estiver a usar o TDE (se estiver a "
-"usar, por exemplo, GNOME, XFCE, ...).</p><ul><li>Abra o Centro de Controlo "
-"do TDE (se não estiver disponível, experimente escrever \"kcontrol\" num "
-"terminal de linha de comandos);</li><li>Vá a \"Componentes do TDE\" e depois "
-"à secção \"Selector de Componentes\";</li><li>Escolha \"Navegação Web\", "
-"escolha \"no seguinte nagevador:\" e introduza o nome do seu navegador Web "
-"(algo como \"firefox\" ou \"epiphany\").</li></ul><p>Agora, quando clicar em "
+"dependendo do conteúdo da ligação (uma página Web, uma imagem, um documento "
+"PDF,...), tal como se fossem ficheiros armazenados no seu computador.</"
+"p><p>Eis como fazer se quiser abrir todos os endereços Web no seu navegador "
+"Web. Isto é útil se não estiver a usar o TDE (se estiver a usar, por "
+"exemplo, GNOME, XFCE, ...).</p><ul><li>Abra o Centro de Controlo do TDE (se "
+"não estiver disponível, experimente escrever \"kcontrol\" num terminal de "
+"linha de comandos);</li><li>Vá a \"Componentes do TDE\" e depois à secção "
+"\"Selector de Componentes\";</li><li>Escolha \"Navegação Web\", escolha \"no "
+"seguinte nagevador:\" e introduza o nome do seu navegador Web (algo como "
+"\"firefox\" ou \"epiphany\").</li></ul><p>Agora, quando clicar em "
 "<i>qualquer</i> ligação que comece por \"http://...\", ela será aberta no "
 "seu navegador Web (p. ex., Mozilla Firefox ou Epiphany ou...).</p><p>Para "
 "uma configuração mais pormenorizada (por exemplo, abrir apenas as páginas "
 "Web no seu navegador Web), leia a segunda ligação de ajuda.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Como mudar as aplicações usadas para abrir ficheiros e ligações?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2950,12 +3010,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Eis como definir a aplicação a usar para cada tipo de ficheiro. Isto "
 "também se aplica a ligações Web se optar por não as abrir todas num "
@@ -3048,7 +3108,8 @@ msgid ""
 msgstr "De %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 "Não é possível importar esse ficheiro. Ou se encontra corrompido ou não é um "
 "ficheiro do TuxCards."
@@ -3197,6 +3258,11 @@ msgstr "Importante"
 msgid "Very Important"
 msgstr "Altamente Importante"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animação"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Ideia"
@@ -3265,6 +3331,11 @@ msgstr "Mover para Cima (Ctrl+Shift+Up)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Mover para Baixo (Ctrl+Shift+Down)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Eliminar"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Classificação"
@@ -3360,11 +3431,12 @@ msgid ""
 "line, while the tag of the bottom note is exported on every line of the note."
 msgstr ""
 "No exemplo em cima, a classificação da anotação de cima só é explortada  na "
-"primeira linha, enquanto que a classificação da anotação de baixo é exportada em "
-"todas as linhas da anotação."
+"primeira linha, enquanto que a classificação da anotação de baixo é "
+"exportada em todas as linhas da anotação."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 "Eliminiar a classificação irá removê-la de todas as notas às quais se "
 "encontra associada."
@@ -3429,3 +3501,111 @@ msgstr ""
 "Redimensione a janela para escolher o tamanho da imagem\n"
 "e feche-a ou pressione Escape para aceitar as modificações."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "Ce&sto"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportar"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Importar"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "I&r"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "A&notação"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "&Classificações"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra de Ferramentas de Formatação de Texto"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Barra de Ferramentas de Formatação de Texto"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Fi&ltrar:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Abrir"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Sem protecção"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+S"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Proteger cesto com uma &palavra-passe"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Proteger cesto com chave p&rivada:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+R"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Por favor escreva em Francês ou em Inglês."
diff --git a/po/ru.po b/po/ru.po
index 33125ad..967fed2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,22 +6,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-02-05 23:13-0800\n"
 "Last-Translator: Daniel Dotsenko <dd@accentsolution.com>\n"
 "Language-Team:  <ru@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Danil Dotsenko"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -42,14 +43,19 @@ msgid "BasKet Note Pads"
 msgstr "Альбом заметок BasKet"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Автор"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Шифрование корзин, Интеграция с Kontact, Импорт заметок KnowIt"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -57,71 +63,77 @@ msgstr ""
 "Авто-замыкание Корзин, значок изменения не сохранены, копирование и вставка "
 "в формате HTML, всплывающие подсказки, кинуть на имя корзины"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Значок"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Сохранить как контейнер"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Пакуем в контейнер BasKet..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Данный файл не является контейнер данных BasKet."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Ошибка в контейнер."
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Файл повреждён. Чтение невозможно."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
 "missing because they are of a type only available in new versions. When "
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
-msgstr "Этот файл был создан другой версией %1. Его можно прочитать но, возможно, не все данные будут импортированны вследствие несовпадения встроенных типов данных. Сохраните ваши изменения в другом файле, иначе неимпортированные данные могут быть утеряны."
+msgstr ""
+"Этот файл был создан другой версией %1. Его можно прочитать но, возможно, не "
+"все данные будут импортированны вследствие несовпадения встроенных типов "
+"данных. Сохраните ваши изменения в другом файле, иначе неимпортированные "
+"данные могут быть утеряны."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
-msgstr "Этот файл был создан другой версией %1. Пожалуйста, установите более новую версию приложения."
+msgstr ""
+"Этот файл был создан другой версией %1. Пожалуйста, установите более новую "
+"версию приложения."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Резервное копирование"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Сохранить"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Местонахождение всех корзин:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "Передвинуть в папку..."
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "Подсоединится к данным в другой папке..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Когда это применимо?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -134,158 +146,164 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>%1 может хранить свои данные в папке вашего выбора:</p><ul><li>"
-"Хранение данных в домашней папке, как ~/Notes или ~/ "
-"обеспечивает лёгкий доступ для ручного манипулирования данными.</li><li>"
-"Хранение данных на сервере позволит иметь доступ к этим данным с нескольких станций."
-"<br>Подсоедините сетевой ресурс к местной файловой системе и укажите %2 "
-"на эту папку.<br>Будте осторожны, если более чем один компьютер попробуют изметить"
-" данные на сервере одновременно, возможна потеря данных."
-"</li></ul><p>Пожалуйста, не меняйте содержимое этой папки в-ручную; "
-"добавление файлов в структуру папки не добавит его в индекс данных.</p>"
-
-#: backup.cpp:89
+"<p>%1 может хранить свои данные в папке вашего выбора:</p><ul><li>Хранение "
+"данных в домашней папке, как ~/Notes или ~/ обеспечивает лёгкий доступ для "
+"ручного манипулирования данными.</li><li>Хранение данных на сервере позволит "
+"иметь доступ к этим данным с нескольких станций.<br>Подсоедините сетевой "
+"ресурс к местной файловой системе и укажите %2 на эту папку.<br>Будте "
+"осторожны, если более чем один компьютер попробуют изметить данные на "
+"сервере одновременно, возможна потеря данных.</li></ul><p>Пожалуйста, не "
+"меняйте содержимое этой папки в-ручную; добавление файлов в структуру папки "
+"не добавит его в индекс данных.</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Резервная копия"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "Сохранить..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "Восстановить..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Последняя: никогда"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Последняя: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Выберите папку"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "Папка не пуста. Стереть содержимое?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Заменить содержимое папки?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "За&менить"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr "Корзины передвинуты в <b>%1</b>. Перезапускаем %2."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Выберите папку"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
 msgstr "Корзины переключены на папку <b>%1</b>. Перезапускаем %2."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "basket_архив_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Архив tar.gz"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Все файлы"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Резервная копия"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "Файл <b>%1</b> уже существует. Переписать поверх?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Переписать поверх файла?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Пакуем ..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Открыть контейнер"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "README.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Специальная копия корзин созданная %1 для сохранности ваших данных во время процедуры восстановления резервной копии."
+msgstr ""
+"Специальная копия корзин созданная %1 для сохранности ваших данных во время "
+"процедуры восстановления резервной копии."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr "Если восстановление данных прошло успешно, удалите эту папку."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Воспользуйтесь этой специальной копией корзин в случае провала процедуры восстановления резервной копии."
+msgstr ""
+"Воспользуйтесь этой специальной копией корзин в случае провала процедуры "
+"восстановления резервной копии."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "Выберите \"Корзина\" -> \"Резервная копия...\" -> \"Подсоединится к данным в другой папке...\" и выберите папку."
+msgstr ""
+"Выберите \"Корзина\" -> \"Резервная копия...\" -> \"Подсоединится к данным в "
+"другой папке...\" и выберите папку."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "Восстановление <b>%1</b>..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
 msgstr "Читайте файл <b>%1</b> в случае ошибок."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Восстановить"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr "Ошибка чтения резервной копии. Возвращаемся к предыдущим корзинам."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Ошибка восстановления"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -307,39 +325,40 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Корзины до восстановления резервной копии (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "Новая заметка не подходит под категории фильтра и была спрятана."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Новая заметка не подходит под категории фильтра и была спрятана."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
-msgstr "Некоторые из новых заметок не подходят под категории фильтра и были спрятаны."
+msgstr ""
+"Некоторые из новых заметок не подходят под категории фильтра и были спрятаны."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "Новые заметки не подходят под категории фильтра и были спрятаны."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Группировать"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Вставить"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "(%1) помещено в корзину <i>%2</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -347,7 +366,7 @@ msgstr ""
 "Если вы видите это сообщение - в программе случилась ошибка. Пожалуйста, "
 "сообщите об этой проблеме производителю этой программы."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -355,48 +374,48 @@ msgstr ""
 " Вставить сюда\n"
 "Щёкните правой клавишей мыши для других вариантов"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Поменять размер колонок"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Поменять размер группы"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Изменить размер заметки"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Выделить или переместить заметку"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Выделить или переместить группу"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Манипуляция метками"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Предписанная метка</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Раскрыть группу"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Свернуть группу"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -404,7 +423,7 @@ msgstr ""
 "Сгруппировать заметку с нижней\n"
 "Щёкните правой клавишей мыши для других вариантов"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -412,46 +431,46 @@ msgstr ""
 "Сгруппировать заметку с верхней\n"
 "Щёкните правой клавишей мыши для других вариантов"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Добавлен"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Последняя модификация"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Щёлкните справа что бы сгруппировать вместо вставки"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Щёлкните слева что бы вставить вместо группировки"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "Раз&блокировать"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Защищено паролем."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Разблокируйте перед просмотром."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "Шифрование не поддерживается<br/>этой версией %1."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
@@ -459,27 +478,32 @@ msgstr ""
 "Для предотвращения автоматического замыкания корзины,<br>измените период "
 "автоматического замыкания корзин в настройках приложения."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Удалить все"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Настроить..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "Фильтровать по метке"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Фильтровать по &состоянию метки"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Метки"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
@@ -489,7 +513,7 @@ msgstr ""
 "<qt>Удалить эти <b>%n</b> заметки?</qt>\n"
 "<qt>Удалить эти <b>%n</b> заметок?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
@@ -498,7 +522,7 @@ msgstr ""
 "Удалить заметки\n"
 "Удалить заметки"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
@@ -507,7 +531,7 @@ msgstr ""
 "Заметки скопированы в буфер.\n"
 "Заметки скопированы в буфер."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
@@ -516,7 +540,7 @@ msgstr ""
 "Заметки вырезаны в буфер.\n"
 "Заметки вырезаны в буфер."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
@@ -525,54 +549,86 @@ msgstr ""
 "Заметки скопированы в выделение.\n"
 "Заметки скопированы в выделение."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Невозможно открыть заметку."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "У вас нет прав для открытия этого файла."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Сохранить в файл"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Введите пароль для личного ключа:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Введите пароль для корзины '%1':"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Введите пароль для корзины '%1':"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Недостаточно места на диске"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Право доступа к файлу данных"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
-msgstr "Для успешного сохранения данных вам нужно очистить место на диске <b>%1</b>."
+msgstr ""
+"Для успешного сохранения данных вам нужно очистить место на диске <b>%1</b>."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
 msgstr "Похоже что у вас нет права на запись для <b>%1</b>."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Ошибка сохранения"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Показать / спрятать главное окно"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "Курсор мыши показывает главное окно после"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Открыть контейнер"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Невозможно создать папку для новой корзины данных."
@@ -605,10 +661,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Свойства корзины"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "Имя"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "&Рисунок фона:"
@@ -709,15 +769,15 @@ msgstr ""
 "<p>Эта корзина <b>разблокирована</b>.<br>Щёлкните мышью для заблокирования</"
 "p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Общие"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Показать / спрятать главное окно"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
@@ -725,11 +785,11 @@ msgstr ""
 "Позволяет показать главное окно если оно спрятано и спрятать если оно на "
 "виду."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Вставить содержимое буфера обмена в выбранную корзину"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
@@ -737,21 +797,21 @@ msgstr ""
 "Позволяет вставить содержимое буфера обмена в выбранную корзину без "
 "необходимости открытия главного окна."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Показать имя выбранной корзины"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr ""
 "Позволяет узнать которая корзина выбрана.без необходимости открытия главного "
 "окна."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Вставить выделенное в выбранную корзину"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
@@ -759,22 +819,22 @@ msgstr ""
 "Позволяет вставить содержимое буфера обмена в выбранную корзину без "
 "необходимости открытия главного окна."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Создать новую корзину"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
 "or paste selection in this new basket)."
 msgstr "Позволяет создать корзину без необходимости открытия главного окна."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Перейти к предыдущей корзине"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
@@ -782,11 +842,11 @@ msgstr ""
 "Позволяет перейти к предыдущей корзине без необходимости открытия главного "
 "окна."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Перейти к следующей корзине"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
@@ -794,39 +854,43 @@ msgstr ""
 "Позволяет перейти к следующей корзине без необходимости открытия главного "
 "окна."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Вставить заметку из простого текста"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr ""
 "Вставить заметку из простого текста в выбраную корзину без необходимости "
 "открытия главного окна."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Вставить рисунок"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
-msgstr "Вставить рисунок в выбраную корзину без необходимости открытия главного окна."
+msgstr ""
+"Вставить рисунок в выбраную корзину без необходимости открытия главного окна."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Вставить ссылку"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Вставить ссылку в выбраную корзину без необходимости открытия главного окна."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Вставить ссылку в выбраную корзину без необходимости открытия главного окна."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Вставить цветную заметку"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
@@ -834,11 +898,11 @@ msgstr ""
 "Вставить цветную заметку в выбраную корзину без необходимости открытия "
 "главного окна."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Выбрать цвет с точки экрана"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -846,11 +910,11 @@ msgstr ""
 "Выбрать цвет с любой точки экрана в выбраную корзину без необходимости "
 "открытия главного окна."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Сделать снимок зоны экрана"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -858,15 +922,11 @@ msgstr ""
 "Вставить снимок зоны экрана в выбраную корзину без необходимости открытия "
 "главного окна."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Корзины"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Пожалуйста, используйте английский или французский."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -877,243 +937,249 @@ msgstr ""
 "корзин в группы по темам. Пользуйтесь мышью для перетаскивания корзин из "
 "одной группы в другую."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "Контейнер BasKet..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "Скрыть Окно"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "Страница HTML"
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "Заметки TDE"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Sticky Notes"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Текстовый файл..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "Резервное копирование..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Удалить"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Выделить все"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Убрать выделение со всех"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Убрать выделение со всех"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "&Инвертировать выделение"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Уберает выделение с выделенных заметок, выделяет невыделенные заметки"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Правка..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Открыть"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "Открыть в..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "Сохранить в файл..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "Сгруппировать"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "Разбить группу"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "Вверх"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "&Выше"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "&Ниже"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "Вниз"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Текст"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "Ссы&лка на ресурс"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Рисунок"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "Цвет"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "Ссылка на &приложение"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "Вставить сылку приложения из меню TDE..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Вставить &значок..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Загрузить из файла..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "Взять цвет c точки экрана"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Сделать &снимок зоны экрана"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "Новая головная корзина..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Новая дочерняя корзина..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Новая родственная корзина..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Создать"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Свойства корзины"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Удалить"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Пароль..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "За&блокировать"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Фильтр"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Поиск по всем корзин&ам"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "Очистить фильтр"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "Предыдущая корзина"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "Следующая корзина"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "Свернуть вид корзины"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "Развернуть вид корзины"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Комбинации клавиш (глобальные)..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "Удалить"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Конвертирование текста"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
-msgstr "Производится конвертирование простого текста в текст с форматированием..."
+msgstr ""
+"Производится конвертирование простого текста в текст с форматированием..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Заблокированный"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Пусто"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
@@ -1123,7 +1189,7 @@ msgstr ""
 "%n заметки\n"
 "%n заметок"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
@@ -1133,15 +1199,15 @@ msgstr ""
 "%n выделены\n"
 "%n выделено"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "все варианты подходящие под условия фильтров"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "фильтр не установлен"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -1151,29 +1217,29 @@ msgstr ""
 "%n совпадения\n"
 "%n совпадений"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Корзина <i>%1</i> оцвечена"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Заметки с обычным текстом конвертированны в текст с форматированием."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Конвертирование окончено"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Заметки с обычным текстом отсутствуют."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1190,85 +1256,87 @@ msgstr ""
 "инсталяционного пакета в папку <a href='file://%3'>%4</a>.</p><p>В крайнем "
 "случае, можно попробовать удалить файл %5basketui.rc</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Не найден"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Заметку невозможно добавить."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Cнимок зоны экрана вставлен в корзину <i>\"%1\"</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Удалить"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Удалить только эту"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Удалить вместе с дочерними"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>Удалить корзину <b>%1</b> и её содержимое?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Удалить"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "Удалить"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
-msgstr "<qt><b>%1</b> содержит следующие дочерние корзины.<br>Их тоже удалить?</qt>"
+msgstr ""
+"<qt><b>%1</b> содержит следующие дочерние корзины.<br>Их тоже удалить?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Удалить дочерние корзины"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "Удалить дочерние корзины"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Свойства корзины"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Содержимое буфера обмена (%1) вставлено в <i>%2</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Выделенное (%1) вставлено в <i>%2</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Заметка не была добавлена."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "Корзина <i>%1</i> заблокирована"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Заблокированно)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "Предписать новую &метку..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Удалить все"
 
@@ -1292,7 +1360,8 @@ msgstr ""
 msgid ""
 "The information below is to help the developers identify the problem, please "
 "do not modify it."
-msgstr "Пожалуйста, добавьте детали вы находите нужными для отладки этой ошибки."
+msgstr ""
+"Пожалуйста, добавьте детали вы находите нужными для отладки этой ошибки."
 
 #: crashhandler.cpp:206
 msgid ""
@@ -1353,11 +1422,11 @@ msgstr "&Метка: "
 msgid "Filter all Baskets"
 msgstr "Искать во всех корзинах"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(метки нет)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(помечен)"
 
@@ -1446,35 +1515,35 @@ msgstr "(По умолчанию)"
 msgid "Other..."
 msgstr "Другое..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Лист личных ключей"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Адрес электронной почты"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "Идентификатор"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Выберите ключь шифровки:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Лист ключей неожиданно оборвался."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Этот публичный ключ не может быть использован для шифрации"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Стандарт не поддерживается"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Неправильный пароль."
 
@@ -1514,49 +1583,58 @@ msgstr "Файловые Системы"
 msgid "File Types"
 msgstr "Типы файлов"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Файлы значков (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Открыть"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr "Послать разработчикам положительный отзыв"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr "Послать разработчикам отрицательный отзыв"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr "Послать разработчикам предложение об изменении поведения приложения"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr "Послать разработчикам просьбу о включении дополнительных функций"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "Отправить комментарий"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "Добро пожаловать в  %1."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "Добро пожаловать в  %1."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr ""
 "Ваши отзывы очень важны и полезны для дальнейшего совершенствования этого "
 "приложения."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
@@ -1566,7 +1644,7 @@ msgstr ""
 "подходящую руку под титульной строкой. Вам будет дана возможность написать "
 "отзыв и подтведить его отправку."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
@@ -1575,7 +1653,7 @@ msgstr ""
 "подходящую руку под титульной строкой. Вам будет дана возможность написать "
 "отзыв и подтведить его отправку."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
@@ -1584,14 +1662,14 @@ msgstr ""
 "подходящую руку под титульной строкой. Вам будет дана возможность написать "
 "отзыв и подтведить его отправку."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
 "Send."
 msgstr "Аналогичным способом можно предоставлять сообщения об ошибках."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
@@ -1601,7 +1679,7 @@ msgstr ""
 "подходящую руку под титульной строкой. Вам будет дана возможность написать "
 "отзыв и подтведить его отправку."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
@@ -1609,41 +1687,42 @@ msgstr ""
 "Пример:\n"
 "Примеры:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "<b>Понравилось</b> новое оформление. Интересненькое такое."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 "<b>Не понравилась</b> приветственное окно гида. Забирает слишком много "
 "времени."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
 msgstr "Щёлкаю на Добавить... не работает."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 "<b>Хотелось бы</b> что бы чёлк на заметку и можно по электронной почте было "
 "отправить."
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Помочь улучшить приложение"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Адрес электронной почты"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Введите адрес электронной почты."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
@@ -1652,7 +1731,7 @@ msgstr ""
 "Он будет использован только для прямого контакта с вами в случае "
 "необходимости более полного набора данных по оговоренной проблеме."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
@@ -1660,57 +1739,57 @@ msgstr ""
 "Адрес электронной почты не обязателен. Если он не будет указан ваши заметки "
 "будут отосланны ононимно."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Отправить Комментарий"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Отправить комментарий"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Понравилось"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Не понравилось"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Приложение не правильно себя ведёт"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "Новая функциональность"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "Показать кнопки отзывов"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "Отправить комментарий"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "Адрес электронной почты"
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Кратко о вашем мнении о %1."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Пожалуйста, используйте английский."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
-msgstr "Есть возможность использовать <a href=\"%1\">Интернет-приложение перевода</a>"
+msgstr ""
+"Есть возможность использовать <a href=\"%1\">Интернет-приложение перевода</a>"
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
@@ -1718,25 +1797,25 @@ msgstr ""
 "Придерживаясь баланса между негативными и позитивными комментариями, вы "
 "поддерживаете рабочий баланс разработчикоа."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr "Запросы новых функций в данный момент будут <b>игнорированны</b>."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr "<p>Ошибка при отсылке отзыва.</p><p>Попробуйте снова позже.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Коммуникационная ошибка"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
 msgstr "<p>Отзыв отослан успешно.</p><p>Большое спасибо за участие.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Комментарий отправлен"
 
@@ -1834,19 +1913,19 @@ msgstr ""
 msgid "Example"
 msgstr "Пример"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Свернуть"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Корзина"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>Выйти из %1?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
@@ -1856,7 +1935,7 @@ msgstr ""
 "в TDE. Если вы оставите приложение работающим, оно будет автоматически "
 "загруженр в начале следующей сессии TDE.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Подтвердите выход"
 
@@ -1925,7 +2004,7 @@ msgstr "Свободное размещение"
 msgid "Mind map"
 msgstr "Свободное размещение"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(рисунок)"
 
@@ -1949,6 +2028,11 @@ msgstr "Анимация"
 msgid "Sound"
 msgstr "Звук"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Файл"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Ссылка ресурса"
@@ -1957,7 +2041,7 @@ msgstr "Ссылка ресурса"
 msgid "Launcher"
 msgstr "Ссылка к приложению"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Цвет"
 
@@ -2005,271 +2089,280 @@ msgstr "Правка цвета"
 msgid "Edit this unknown object"
 msgstr "Правка неизвестного обьекта"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Открытие текста..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Открытие текста..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Открытие текста в..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Открытие текста в..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Открыть текст в:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Открыть текст в:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Открытие текста..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Открытие текста..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Открытие текста в..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Открытие текста в..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Открыть текст в:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Открыть текст в:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Размер"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 х %2 точек"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Открытие рисунка..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Открытие рисунков..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Открытие рисунка в..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Открытие рисунков в..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Открыть рисунок в:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Открыть рисунки в:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Щёлните мышью для полного размера"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Открываем файл анимации..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Открываем файлы анимации..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Открываем файл анимации в..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Открываем файлы анимации в..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Открыть файл анимации в:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Открыть файлы анимации в:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Тип"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Открыть файл"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Открытие файла..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Открытие файлов..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Открытие файла в..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Открытие файлов в..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Открыть файл в:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Открыть файлы в:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Открыть файл звука"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Загрузка файла звука..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Загрузка файла звука..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Загрузка файла звука в..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Загрузка файла звука в..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Открыть файла звука в:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Открыть файла звука в:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Цель"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Следовать ссылке"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Ссылка не содержит адрес для открытия."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Открытие ресурса ссылки..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Открытие ресурсов ссылок..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Открытие ресурса ссылки в..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Открытие ресурсов ссылок в..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Открыть ресурс ссылки в:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Открыть ресурсы ссылок в:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1<i>(запустить в терминале)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Комментарий"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Команда"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Запустить эту программу"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Ссылка пуста."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Запускаем программу..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Запускаем программы..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB - КрасныйЗелёныйСиний"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i> Красный</i><i> Зелёный</i><i> Синий</i>"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV Тон Насыщенность Значение"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i> Тон</i><i> Насыщенность</i><i> Значение</i>"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "Имя цвета CSS"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "Имя расширенного цвета CSS"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Является Web Цветом"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Нет"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2279,11 +2372,11 @@ msgstr ""
 "обретёт эту функцию.\n"
 "Открыть этот рисунок во внешнем редакторе?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Примечание по изменению рисунков"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2291,15 +2384,15 @@ msgstr ""
 "Невозможно редактировать анимацию внутри BasKet.\n"
 "Открыть эту анимацию во внешнем редакторе?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Примечание по изменению анимации"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Примечание по изменению цвета"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2308,74 +2401,97 @@ msgstr ""
 "Тип этой заметки неизвестен\n"
 "Перетащите эту заметку в программу которая её поймёт."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Примечание по правке неизвестной заметки"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Примечание по изменению ссылки"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Авто"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Пиктограмма:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "Цель:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "Заго&ловок:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Примечание по изменению ссылки к приложению"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Выберите комманду для запуска:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "Автоматически"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "Коман&да:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&Имя:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Шрифт:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Размер"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Полужирный"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "&Курсив"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Подчёркнутый"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "По левому краю"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "По центру"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "По правому краю"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "По ширине"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2421,8 +2537,7 @@ msgstr "Выбрать размер значка надлежащий импор
 msgid "Load File Content into a Note"
 msgstr "Загрузка Файл Примечание"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Защита поролем"
@@ -2431,135 +2546,39 @@ msgstr "Защита поролем"
 msgid "No private key selected."
 msgstr "Личный ключ не выбран."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Корзина"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Экспорт"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Импорт"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Перейти"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Заметки"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "Метки"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Панель инструментов Формат"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Фильтр:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "Нет защиты поролем"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Защитить паролем"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Защитить личным ключём"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Слева"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Справа"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "Позиция вида дерева корзин:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Сверху"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Снизу"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Позиция панели фильтрования:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "Результат глобальной комманды во всплывающем уведомлении"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Что это значит?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2573,7 +2592,7 @@ msgstr ""
 "мыши над значком вставляет в активную корзину заметку с содержимым буфера "
 "обмена."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
@@ -2581,7 +2600,7 @@ msgstr ""
 "В процессе использования, %1 показывает всплывающую подсказку с информацией "
 "о том что было сделано."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
@@ -2590,73 +2609,75 @@ msgstr ""
 "Если главное окно показано, всплывающие подсказки не показываются так как "
 "результат манипуляции показан в главном окне?"
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Значок системного лотка"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "Пристыковать в системный лоток"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "Значок выбранной корзины замещает стандартный"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "Скрыть главное окно если мышь выведена вне на"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "/10 секунды"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "Курсор мыши показывает главное окно после"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Анимация действий в корзинах"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "Показывать подсказки"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "Увеличить размер заметок"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Поведение"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr "Превращать * и - в маркер списка"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Спрашивать разрешение перед удалением заметки"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "Экспортировать метки в текст"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Когда это применимо?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
-msgstr "Относится к переносу или копированию заметок во внешний текстовый редактор."
+msgstr ""
+"Относится к переносу или копированию заметок во внешний текстовый редактор."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr "Если включено, позволяет вставлять статус меток в текстовом формате."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2665,15 +2686,15 @@ msgstr ""
 "К примеру, лист заметок помеченный как <b>Сделать</b> и <b>Сделано</b>  "
 "экспортируется как <b>[ ]</b> or <b>[x]</b>."
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "Группировка новой заметки с близ-лежащими"
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Как группировать новые заметки?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2682,7 +2703,7 @@ msgstr ""
 "<p>При установке этой настройки, вы можете сгруппировать новую заметку с той "
 "что под курсором.</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2696,168 +2717,168 @@ msgstr ""
 "разделительной полосы) расположене курсора мыши определяет с которой из "
 "заметок произойдёт группировка.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Ничего не делать"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Вставить заметку отражающую буфер обмена"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Вставить заметку с ссылками на приложения"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Выбрать цвет с точки экрана"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Загрузить из файла..."
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "Вставить сылку приложения из меню TDE..."
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Вставить &значок..."
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+средняя клавиша мыши:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "."
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "Автоматически замыкать защищённые корзины после"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " минут"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "Использовать агент GnuPG для личного/публичного "
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "Расположение новых заметок:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "На место выделенной заметки"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "Размер новых рисунков:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "на"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "пикселов"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "Макет..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Показывать содержимое добавленных файлов относящихся к следующему типу"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "Простой текст"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "страница формата HTML"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "Рисунок или анимация"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "Звуки"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Аудио запись конференции"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Годовой отчёт"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Папка \"Домой\""
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Запустить %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "Звук"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Файл"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "Локальная ссылка"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "Сетевой ресурс"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "Приложение"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "Открыть заметки с текстом во внешнем приложении:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Открыть текст:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "Открыть заметки с рисунками во внешнем приложении:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Открываем в:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "Открыть заметки с анимацией во внешнем приложении:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Открываем в:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "Открыть заметки со звуками во внешнем приложении:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Открыть заметки со звуками в:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2867,32 +2888,33 @@ msgstr ""
 "этого типа заметок</p><p>В противном случае приложение прописанное в "
 "Konqueror будет использовано по-умолчанию.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
 msgstr "<p>Выберите приложение для открытия заметки.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "Как изменить приложение используемое для открытия Web ссылок?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Щёлкая на линк, вы откроете содержимое привязанного файла в "
 "соответсвуйщем приложении, что похоже на поведение в остальных частях "
@@ -2905,11 +2927,11 @@ msgstr ""
 "<i>все</i> линки начинающиеся с \"http://...\", будут открываться там где "
 "вам надо.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "Как изменить приложение используемое для файлов и местных ссылок?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2918,12 +2940,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Что бы научить приложение открывать линки в специфических приложениях "
 "опробуйте следующий способ.</p> <p>Допустим, мы хотим открывать HTML линки в "
@@ -3013,7 +3035,8 @@ msgid ""
 msgstr "Из %1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr "Ошибка при импорте файла. Файл повреждён или в неправильном формате."
 
 #: softwareimporters.cpp:643
@@ -3160,6 +3183,11 @@ msgstr "Важное"
 msgid "Very Important"
 msgstr "Очень важное"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Анимация"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Идея"
@@ -3228,6 +3256,11 @@ msgstr "Переместить вверх (Ctrl+Shift+Вверх)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Переместить вниз (Ctrl+Shift+Вниз)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Удалить"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Метка"
@@ -3296,7 +3329,8 @@ msgstr "Словесный эквивалент:"
 msgid ""
 "If filled, this property lets you paste this tag or this state as textual "
 "equivalent."
-msgstr "Этот текст будет использован в замен состояния метки для внешних операций."
+msgstr ""
+"Этот текст будет использован в замен состояния метки для внешних операций."
 
 #: tagsedit.cpp:496
 msgid "On ever&y line"
@@ -3324,7 +3358,8 @@ msgstr ""
 "каждую последующую строку."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr "Удаляя эту метку, вы удалите её из всех заметок."
 
 #: tagsedit.cpp:902
@@ -3339,7 +3374,8 @@ msgstr "Удалить метку"
 msgid ""
 "Deleting the state will remove the tag from every note the state is "
 "currently assigned to."
-msgstr "Удаляя это состояние метки, вы удалите метки содержащие его из всех заметок."
+msgstr ""
+"Удаляя это состояние метки, вы удалите метки содержащие его из всех заметок."
 
 #: tagsedit.cpp:909
 msgid "Confirm Delete State"
@@ -3385,3 +3421,111 @@ msgstr ""
 "Изменить размер окошка для изменения размера картинки\n"
 "и закройте его (или нажмите клавишу Esc) для принятия изменений."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Корзина"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Экспорт"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Импорт"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Перейти"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Заметки"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "Метки"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Панель инструментов Формат"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Панель инструментов Формат"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Фильтр:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Открыть"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "Нет защиты поролем"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Защитить паролем"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Защитить личным ключём"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Пожалуйста, используйте английский или французский."
diff --git a/po/tr.po b/po/tr.po
index 5949a40..ffac4a8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,23 +6,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-05-18 16:54+0300\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Serdar Soytetir"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -33,91 +34,109 @@ msgid ""
 "<p><b>Taking care of your ideas.</b></p><p>A note-taking application that "
 "makes it easy to record ideas as you think, and quickly find them later. "
 "Organizing your notes has never been so easy.</p>"
-msgstr "<p><b>Düşüncelerinize iyi bakın.</b></p><p>Düşüncelerinizi tam olarak aklınıza geldiği gibi ve hızlı bir şekilde kaydetmenize, sonradan kolayca bulmanıza yarayan bir not alma uygulamasıdır. Notlarınızı düzenlemek asla bu kadar kolay olmadı.</p>"
+msgstr ""
+"<p><b>Düşüncelerinize iyi bakın.</b></p><p>Düşüncelerinizi tam olarak "
+"aklınıza geldiği gibi ve hızlı bir şekilde kaydetmenize, sonradan kolayca "
+"bulmanıza yarayan bir not alma uygulamasıdır. Notlarınızı düzenlemek asla bu "
+"kadar kolay olmadı.</p>"
 
 #: aboutdata.cpp:34
 msgid "BasKet Note Pads"
 msgstr "Basket Not Tutma Aracı"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "Yazar, geliştirici"
 
 #: aboutdata.cpp:45
-msgid "Basket encryption, Kontact integration, KnowIt importer"
-msgstr "Sepet şifrelemesi, Kontact entegrasyonu, KnowIt dosyalarını içe aktarma"
+msgid "Original Author"
+msgstr ""
 
 #: aboutdata.cpp:49
+msgid "Basket encryption, Kontact integration, KnowIt importer"
+msgstr ""
+"Sepet şifrelemesi, Kontact entegrasyonu, KnowIt dosyalarını içe aktarma"
+
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
-msgstr "Otomatik sepet kilitleme, kaydetme-durum simgesi, HTML kopyala/yapıştır, sepet dı ipucu, basket adına atma"
+msgstr ""
+"Otomatik sepet kilitleme, kaydetme-durum simgesi, HTML kopyala/yapıştır, "
+"sepet dı ipucu, basket adına atma"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "Simge"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "Basket Arşivi Olarak Kaydet"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "Basket arşivi olarak kaydediliyor. Lütfen bekleyin..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "Bu dosya bir basket arşivi değil."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "Basket Arşiv Hatası"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "Bu dosya bozuk. Açılamadı."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
 "missing because they are of a type only available in new versions. When "
 "saving the file back, consider to save it to another file, to preserve the "
 "original one."
-msgstr "Bu dosya %1 uygulamasının daha yeni bir sürümü ile oluşturulmuş. Bu dosya açılamaz ancak dosyanın içerisindeki bilgilere erişebileceksiniz. Örneğin, daha yeni sürümlerde kullanılan bazı notlarınız kaybolabilir. Dosyayı yeniden kaydederken başka bir dosyaya kaydedin ve orijinal dosyayı koruyun."
+msgstr ""
+"Bu dosya %1 uygulamasının daha yeni bir sürümü ile oluşturulmuş. Bu dosya "
+"açılamaz ancak dosyanın içerisindeki bilgilere erişebileceksiniz. Örneğin, "
+"daha yeni sürümlerde kullanılan bazı notlarınız kaybolabilir. Dosyayı "
+"yeniden kaydederken başka bir dosyaya kaydedin ve orijinal dosyayı koruyun."
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
-msgstr "Bu dosya %1 uygulamasının daha yeni bir sürümü ile oluşturuldu. Dosyayı açabilmek için lütfen uygulamayı daha yeni bir sürüme yükseltin."
+msgstr ""
+"Bu dosya %1 uygulamasının daha yeni bir sürümü ile oluşturuldu. Dosyayı "
+"açabilmek için lütfen uygulamayı daha yeni bir sürüme yükseltin."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "Yedekle & Yedek Yükle"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "Kaydetme Dizini"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "Sepetleriniz şu dizine kaydedildi: <br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "&Başka Bir Dizine Taşı"
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "Varolan B&aşka Bir Dizin Kullan..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "Bu neden yapılır?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -130,156 +149,181 @@ msgid ""
 "folder manually (eg. adding a file in a basket folder will not add that file "
 "to the basket).</p>"
 msgstr ""
-"<p>%1'nun sepetlerinizi depoladığı dizini başka bir yere taşıyabilirsiniz:</p><ul><li>Sepetlerinizi "
-"Ev Dizininizdeki görünür bir yere taşıyarak, ~/Notlar ya da ~/Sepetler gibi, istediğiniz zaman elle yedekleyebilirsiniz.</li><li>Sepetlerinizi bir sunucu üzerine taşıyarak iki bilgisayar arasında paylaşabilirsiniz.<br>Bu durumda paylaşılan dizini yerel dosya sistemine bağlayıp %2'ya bu dizini kullanmasını söylemelisiniz.<br>Uyarı: %3'yu aynı anda iki bilgisayarda çalıştırmamalısınız. Aksi durumda iki uygulama arasında eşzamanlama kaybolabileceğinden veri kaybedebilirsiniz."
-"</li></ul><p>Lütfen dizin içeriğini elle değiştirmemeniz gerektiğini unutmayın (bir sepet dizinine dosya eklemek o dosyayı sepetinize eklemez).</p>"
-
-#: backup.cpp:89
+"<p>%1'nun sepetlerinizi depoladığı dizini başka bir yere taşıyabilirsiniz:</"
+"p><ul><li>Sepetlerinizi Ev Dizininizdeki görünür bir yere taşıyarak, ~/"
+"Notlar ya da ~/Sepetler gibi, istediğiniz zaman elle yedekleyebilirsiniz.</"
+"li><li>Sepetlerinizi bir sunucu üzerine taşıyarak iki bilgisayar arasında "
+"paylaşabilirsiniz.<br>Bu durumda paylaşılan dizini yerel dosya sistemine "
+"bağlayıp %2'ya bu dizini kullanmasını söylemelisiniz.<br>Uyarı: %3'yu aynı "
+"anda iki bilgisayarda çalıştırmamalısınız. Aksi durumda iki uygulama "
+"arasında eşzamanlama kaybolabileceğinden veri kaybedebilirsiniz.</li></"
+"ul><p>Lütfen dizin içeriğini elle değiştirmemeniz gerektiğini unutmayın (bir "
+"sepet dizinine dosya eklemek o dosyayı sepetinize eklemez).</p>"
+
+#: backup.cpp:91
 msgid "Backups"
 msgstr "Yedekler"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "&Yedekle..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "&Bir Yedeklemeyi Geri Yükle"
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "Son yedekleme: yok"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "Son yedekleme: %1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "Seperlerin Taşınacağı Bir Dizin Seçin"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "<b>%1</b> dizini boş değil. Üzerine yazmak ister msiniz?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "Dizinin Üzerine Yazılsın mı?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "&Üzerine Yaz"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Sepetleriniz <b>%1</b> dizinine başarıyla taşındı. Bu değişikliğin etkin olabilmesi için %2 yeniden başlatılacak."
+msgstr ""
+"Sepetleriniz <b>%1</b> dizinine başarıyla taşındı. Bu değişikliğin etkin "
+"olabilmesi için %2 yeniden başlatılacak."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "Sepetlerinizi Kaydetmek İçin Oluşturulmuş Bir Dizin Seçin"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
-msgstr "Sepet kaydetme dizininiz <b>%1</b> olarak değiştirildi. Bu değişikliğin etkin olabilmesi için %2 yeniden başlatılacak."
+msgstr ""
+"Sepet kaydetme dizininiz <b>%1</b> olarak değiştirildi. Bu değişikliğin "
+"etkin olabilmesi için %2 yeniden başlatılacak."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr "Sepetler_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "Gzip Tarafından Sıkıştırılan Tar Arşivleri"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "Sepetleri Yedekle"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "<b>%1</b> dosyası zaten var. Dosyanın üzerine yazmak ister misiniz?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "Dosyanın üzerine yazılsın mı?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "Sepetler yedekleniyor. Lütfen bekleyin..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "Basket Arşivi Aç"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "README.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
-msgstr "Bu, sepetlerinizin %1 yedeğinizi geri yüklemeden önceki halinin güvenlik için alınan bir kopyasıdır."
+msgstr ""
+"Bu, sepetlerinizin %1 yedeğinizi geri yüklemeden önceki halinin güvenlik "
+"için alınan bir kopyasıdır."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
-msgstr "Eğer geri yükleme başarılı olduysa ve istediklerinizi geri yüklediyseniz bu dizini silebilirsiniz."
+msgstr ""
+"Eğer geri yükleme başarılı olduysa ve istediklerinizi geri yüklediyseniz bu "
+"dizini silebilirsiniz."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
-msgstr "Eğer ger yükleme sırasında birşeyler ters gittiyse bu klasörü sepetleriniz kaydetmek için kullanabilirsiniz ve böylece hiç veri kaybetmezsiniz."
+msgstr ""
+"Eğer ger yükleme sırasında birşeyler ters gittiyse bu klasörü sepetleriniz "
+"kaydetmek için kullanabilirsiniz ve böylece hiç veri kaybetmezsiniz."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "\"Sepet\" -> \"Yedekle & Yedeği Geri Yükle...\" -> \"Varolan Başka Bir Dizin Kullan...\" yolunu takip ederek o dizini seçin."
+msgstr ""
+"\"Sepet\" -> \"Yedekle & Yedeği Geri Yükle...\" -> \"Varolan Başka Bir Dizin "
+"Kullan...\" yolunu takip ederek o dizini seçin."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "<b>%1</b>Arşivi geri yükleniyor. Lütfen bekleyin..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr "Yedeği geri yükleme sürecinde birşeyler ters giderse <b>%1</b> dosyasını okuyun."
+msgstr ""
+"Yedeği geri yükleme sürecinde birşeyler ters giderse <b>%1</b> dosyasını "
+"okuyun."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "Sepetleri Yeniden Yükle"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
-msgstr "Bu dosya ya bir sepet arşivi değil ya da bozuk. İçeriye aktarılamaz. Bu dosya yerine eski sepetleriniz kullanılacak."
+msgstr ""
+"Bu dosya ya bir sepet arşivi değil ya da bozuk. İçeriye aktarılamaz. Bu "
+"dosya yerine eski sepetleriniz kullanılacak."
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "Geri Yükleme Hatası"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
-msgstr "Yedeğiniz <b>%1</b> dizinine başarıyla geri yüklendi. Bu değişikliğin etkin olabilmesi için %2 yeniden başlatılacak."
+msgstr ""
+"Yedeğiniz <b>%1</b> dizinine başarıyla geri yüklendi. Bu değişikliğin etkin "
+"olabilmesi için %2 yeniden başlatılacak."
 
 #: backup.cpp:338
 msgid "Restart"
@@ -297,39 +341,39 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "Geri Yüklemeden Önceki Sepetler (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "Yeni not süzgece uymuyor,gizli."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "Bir yeni not süzgece uymuyor, gizli."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr "Bazı yeni notlar süzgece uymuyorlar, gizliler."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "Yeni notlar süzgece uymuyorlar,gizliler."
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "Grupla"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "Ekle"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "<i>%1</i> sepete atıldı"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
@@ -337,7 +381,7 @@ msgstr ""
 "Bu ileti asla ortaya çıkmamalıdır. Eğer bu iletiyi gördüyseniz bu programda "
 "hatalar var demektir! Lütfen hataları geliştiriciye raporlayın."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -345,48 +389,48 @@ msgstr ""
 "Notu buraya ekle\n"
 "Daha fazla seçenek için sağ tıklayın"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "Şu sütunları yeniden boyutlandır"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "Bu grubu yeniden boyutlandır"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "Bu notu yeniden boyutlandır"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "Bu notu seç ya da taşı"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "Bu grubu seç ya da taşı"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "Bu nota etiket ata ya da bu notun etiketini kaldır"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>Atanmış Etiketler</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1 %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "Bu grubu genişlet"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "Bu grubu topla"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -394,7 +438,7 @@ msgstr ""
 "Notu alttaki ile grupla\n"
 "Daha çok seçenek için sağ tıklayın"
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -402,135 +446,148 @@ msgstr ""
 "Notu üstteki ile grupla\n"
 "Daha çok seçenek için sağ tıklayın"
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "Eklendi"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "Son Düzenleme"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>:%2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "Eklemek yerine gruplamak için sağa tıklayın"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "Eklemek yerine gruplamak için sola tıklayın"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "&Kilidi Aç"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "Parola korumalı sepet."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "Erişmek için Kilidi Aç düğmesine tıklayın."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "%1 uygulamasının bu sürümünde<br/> şifreleme desteklenmiyor."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
-msgstr "Sepetlerin otomatik kilitlenmesini engellemek için<br> kilitlenme süresini belirleyen ayarı uygulamanın ayarlarından değiştirin."
+msgstr ""
+"Sepetlerin otomatik kilitlenmesini engellemek için<br> kilitlenme süresini "
+"belirleyen ayarı uygulamanın ayarlarından değiştirin."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "&Tümünü Kaldır"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "&Özelleştir..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "Bu etikete göre &Süz"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "Bu &İfadeye göre Süz"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "Etiketler"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
 "<qt>Do you really want to delete those <b>%n</b> notes?</qt>"
-msgstr "<qt>Gerçekten <b>%n</b> adet notu silmek istediğinizden emin misiniz?</qt>"
+msgstr ""
+"<qt>Gerçekten <b>%n</b> adet notu silmek istediğinizden emin misiniz?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
 msgstr "Notları Sil"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
 msgstr "Not panoya kopyalandı."
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
 msgstr "Not panoya alındı-kesildi."
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
 msgstr "Notlar seçilen yere kopyalandı."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "Bu not açılamadı."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "Bu dosyayı açmak için yetkiniz yok."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "Dosyaya Kaydet"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "Lütfen aşağıdaki anahtar için parolayı girin:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "Lütfen <b>%1</b> sepeti için parolayı girin:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "Lütfen <b>%1</b> sepeti için bir parola atayın:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "Sepet Verilerini Kaydetmek için Yetersiz Disk Alanı"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "Yanlış Sepet Dosyası İzinleri"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
@@ -538,7 +595,7 @@ msgstr ""
 "Uygulamanın değişikliklerinizi güvenli şekilde kaydetmesi için lütfen "
 "diskinizden dosyaları silin <b>%1</b>."
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
@@ -546,10 +603,38 @@ msgstr ""
 "<b>%1</b> için dosya izinleri yanlış. Lütfen o dosyalara yazma hakkınız olup "
 "olmadığını kontrol edin."
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "Kaydetme Hatası"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "Ana pencereyi göster/gizle"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr ""
+"Sistem çekmecesindeki simge üzerine fare geldiğinde ana paencereyi göstermek "
+"için bekle"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "Basket Arşivi Aç"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "Bu yeni sepet için klasör oluşturma işlemi başarısız oldu."
@@ -582,10 +667,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Sepet Özellikleri"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "İsim"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "Arkaplan re&smi:"
@@ -652,7 +741,8 @@ msgstr ""
 "bile her yerde geçerlidir.</p><p><strong>Göster & Seç</strong>:<br>Son "
 "seçenek bir sepeti ana pencereyi açmadan geçerli hale getirir. Örneğin pano "
 "içeriğini ya da seçimini geçerli sepete yapıştır gibi işlemler için genel "
-"kısayol atamak ve her yerden bu işlemleri yapabilmek kullanışlı olacaktır.</p>"
+"kısayol atamak ve her yerden bu işlemleri yapabilmek kullanışlı olacaktır.</"
+"p>"
 
 #: basketproperties.cpp:149
 msgid "S&how this basket"
@@ -682,53 +772,55 @@ msgstr "<p>Bu sepet<b>kilitli</b>.<br>Kilidi açmak için tıklayın.</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>Bu sepet<b>kilitli değil</b>.<br>Kilitlemek için tıklayın.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "Genel"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "Ana pencereyi göster/gizle"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr "Ana pencere gizli ise göstermenizi, görünüyor ise gizlemenizi sağlar."
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "Pano içeriğini geçerli sepete yapıştır"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
-msgstr "Ana pencereyi açmadan pano içeriğini geçerli sepete yapıştırmanızı sağlar."
+msgstr ""
+"Ana pencereyi açmadan pano içeriğini geçerli sepete yapıştırmanızı sağlar."
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "Geçerli sepet adını göster"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "Ana pencereyi açmadan geçerli sepeti bilmenizi sağlar."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "Seçimi geçerli sepete yapıştır"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
-msgstr "Ana pencereyi açmadan pano seçimini geçerli sepete yapıştırmanızı sağlar."
+msgstr ""
+"Ana pencereyi açmadan pano seçimini geçerli sepete yapıştırmanızı sağlar."
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "Yeni bir sepet oluştur"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
@@ -738,67 +830,72 @@ msgstr ""
 "yeni sepete bir not ekle, panoyu ya da seçimi yapıştır gibi işlemler için "
 "genel kısayol atayabilirsiniz)."
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "Önceki sepete git"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
-msgstr "Ana pencereyi açmadan geçerli sepet olarak önceki sepeti seçmenizi sağlar."
+msgstr ""
+"Ana pencereyi açmadan geçerli sepet olarak önceki sepeti seçmenizi sağlar."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "Sonraki sepete git"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
-msgstr "Ana pencereyi açmadan geçerli sepet olarak sonraki sepeti seçmenizi sağlar."
+msgstr ""
+"Ana pencereyi açmadan geçerli sepet olarak sonraki sepeti seçmenizi sağlar."
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "Metin notu ekle"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr "Ana pencereyi açmadan geçerli sepete bir metin notu eklemenizi sağlar."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "Resim notu ekle"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
 msgstr "Ana pencereyi açmadan geçerli sepete bir resim notu eklemenizi sağlar."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "Bağlantı notu ekle"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
-msgstr "Ana pencereyi açmadan geçerli sepete bir bağlantı notu eklemenizi sağlar."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
+msgstr ""
+"Ana pencereyi açmadan geçerli sepete bir bağlantı notu eklemenizi sağlar."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "Renk notu ekle"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
 msgstr "Ana pencereyi açmadan geçerli sepete bir renk notu eklemenizi sağlar."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "Ekrandan renk al"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
@@ -806,11 +903,11 @@ msgstr ""
 "Ana pencereyi açmadan geçerli sepete ekranın bir pikselinden alınan bir renk "
 "notu eklemenizi sağlar."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "Ekran görüntüsü yakala"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
@@ -818,15 +915,11 @@ msgstr ""
 "Ana pencereyi açmadan geçerli sepete yakalanan bir ekran görüntüsü notu "
 "eklemenizi sağlar."
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Sepetler"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "Lütfen İngilizce ya da Fransızca yazın."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -839,294 +932,299 @@ msgstr ""
 "Sepetlerinize tıklayarak gözatabilirsiniz ya da sürükleyip bırakarak yeniden "
 "düzenleyebilirsiniz."
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "&Basket Arşivi..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "&Pencereyi Gizle"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "&HTML Web Sayfası..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "&Kjots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "&Yapışkan Notlar"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "&Tomboy"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "Metin &Dosyası..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "&Yedekle && Yedeği Geri Yükle..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "&Sil"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "Tüm notları seçer"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "Hiçbirsini Seçme"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "Seçilen notların hiçbirisini seçme"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "Seçimi Tersine &Çevir"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "Şimdiki seçilen notların seçimini tersine çevirir"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "&Düzenle..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "&Aç"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "&Birlikte Aç..."
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "Dosyaya Kay&det..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "&Grupla"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "Grubu Çö&z"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "En ü&ste Taşı"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "&Yukarı Taşı"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "A&şağı Taşı"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "En a&lta Taşı"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "&Metin"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "Bağla&ntı"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "&Resim"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "&Renk"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "&Başlatıcı"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "TDE Menüsünden &Başlatıcı..."
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "Simge &Ekle..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "Dosyadan &Yükle..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "E&krandan Renk"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "Ekran &Görüntüsü Yakala"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "&Yeni Sepet..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "Yeni &Alt-Sepet..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "Yeni &Kardeş-Sepet..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "&Yeni"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Sepet Özellikleri"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "&Kaldır"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "Pa&rola..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "&Kilitle"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "&Süzgeç"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "Tüm &Sepetleri Süz"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "Süzgeci &Kaldır"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "&Önceki Sepet"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "So&nraki Sepet"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "Sepeti &Topla"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "Sepeti &Genişlet"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "Genel Kısayolları &Yapılandır..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "&Hoşgeldin Sepetleri"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "Düz Metin Notları Dönüştürme"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "Düz metin notları zengin metin notlarına dönüştürülüyor..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "Kilitli"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "Not yok"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
 "%n notes"
 msgstr "Toplam %n not"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
 "%n selected"
 msgstr "seçili %n"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "tüm uyanlar"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "süzgeç yok"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr "süzgece uyan %n"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "Yakalanan renk <i>%1</i>sepetine eklendi."
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "Düz metin notları zengin metin notlarına dönüştürüldü."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "Düönüştürme İşlemi Bitti"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "Dönüştürülecek düz metin notu yok."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1144,43 +1242,45 @@ msgstr ""
 "kurduğunuzdan eminseniz ama bir deneme sürümünü kullanyorsanız %5basketui.rc "
 "dosyasını silmeyi deneyin.</p>"
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "Kaynak Bulunamadı"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "Not eklenemez."
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "Yakalanan ekran görüntüsü <i>%1</i>sepetine eklendi."
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "Sepeti Sil"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "Sadece şu sepetli Sil"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "Sepeti & Alt Sepetlerini Sil"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
-msgstr "<qt><b>%1</b> sepetini ve içeriğini silmek istediğinizden emin misiniz?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+msgstr ""
+"<qt><b>%1</b> sepetini ve içeriğini silmek istediğinizden emin misiniz?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "Sepeti Kaldır"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "&Sepeti Kaldır"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
@@ -1188,43 +1288,43 @@ msgstr ""
 "<qt><b>%1</b> sepetinin alt sepetleri var.<br>Onları da silmek istiyor "
 "musunuz?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "Alt Sepetleri Sil"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "Alt Sepetleri &Kaldır"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Basket Arşivleri"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "Pano içeriği <i>%1</i> sepete yapıştırıldı"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "Seçilen <i>%1</i> sepete yapıştırıldı"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "Not eklendi."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "<i>%1</i> sepeti kilitli"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(Kilitli)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "Yeni E&tiket Ata..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "&Tümünü Kaldır"
 
@@ -1314,11 +1414,11 @@ msgstr "E&tiket: "
 msgid "Filter all Baskets"
 msgstr "Tüm Sepetleri Süz"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(Etiketsiz)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(Etiketli)"
 
@@ -1343,8 +1443,8 @@ msgid ""
 "modify the other anymore as they are now separate entities.</p>"
 msgstr ""
 "<p>Klasör yansılama artık mümkün değil ( daha fazla bilgi için <a "
-"href='http://basket.kde.org/'>basket.kde.org</a> adresine bakın.).</p><p><b>%"
-"1</b> klasörü sepet gereksinimleri için kopyalandı. Bu klasörü ya da sepeti "
+"href='http://basket.kde.org/'>basket.kde.org</a> adresine bakın.).</p><p><b>"
+"%1</b> klasörü sepet gereksinimleri için kopyalandı. Bu klasörü ya da sepeti "
 "veya her ikisini de silebilirsiniz. But remember that modifying one will not "
 "modify the other anymore as they are now separate entities.</p>"
 
@@ -1396,7 +1496,9 @@ msgstr "veri"
 
 #: htmlexporter.cpp:319
 msgid "Made with %1, a TDE tool to take notes and keep information at hand."
-msgstr "Not almaya ve her çeşit veriyi el altında tutmaya yarayan ve bir TDE aracı olan Basket uygulamasının %1 sürümü ile oluşturuldu."
+msgstr ""
+"Not almaya ve her çeşit veriyi el altında tutmaya yarayan ve bir TDE aracı "
+"olan Basket uygulamasının %1 sürümü ile oluşturuldu."
 
 #: kcolorcombo2.cpp:126 kcolorcombo2.cpp:602 kcolorcombo2.cpp:624
 #: tagsedit.cpp:470 variouswidgets.cpp:269
@@ -1407,35 +1509,35 @@ msgstr "(Öntanımlı)"
 msgid "Other..."
 msgstr "Diğer..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "Özel Anahtar Listesi"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "E-Posta"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "Kimlik"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "Bir anahtar seçin:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr "Anahtar listeleme işlemi beklenmedik şekilde kesildi."
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "Bu Public key şifreleme anlamına gelmez"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "Desteklenmeyen algoritma"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "Yanlış parola."
 
@@ -1475,202 +1577,243 @@ msgstr "Dosya Sistemi"
 msgid "File Types"
 msgstr "Dosya Türleri"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Sime Dosyaları (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "&Aç"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
-msgstr "Hoşlandığınız bir özellik ile ilgili uygulamanın geliştiricisine bir yorum gönderin"
+msgstr ""
+"Hoşlandığınız bir özellik ile ilgili uygulamanın geliştiricisine bir yorum "
+"gönderin"
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
-msgstr "Hoşlanmadığınız bir özellik ile ilgili uygulamanın geliştiricisine bir yorum gönderin"
+msgstr ""
+"Hoşlanmadığınız bir özellik ile ilgili uygulamanın geliştiricisine bir yorum "
+"gönderin"
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
-msgstr "Uygulamanın gösterdiği tutarsız bir davranışı ile ilgili uygulamanın geliştiricisine bir yorum gönderin"
+msgstr ""
+"Uygulamanın gösterdiği tutarsız bir davranışı ile ilgili uygulamanın "
+"geliştiricisine bir yorum gönderin"
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
-msgstr "Olmasını istediğiniz bir özellik ile ilgili uygulamanın geliştiricisine bir yorum gönderin"
+msgstr ""
+"Olmasını istediğiniz bir özellik ile ilgili uygulamanın geliştiricisine bir "
+"yorum gönderin"
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "&Gelitiriciye Bir Yorum Gönder"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "%1 uygulamasının deneme sürümüne hoş geldiniz."
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "%1 Uygulamasına Hoşgeldiniz."
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "Uygulamayı geliştirebilmek için bize yardım edin, yorumlarınız önemli."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
 "or dislike and click Send."
-msgstr "Beğendiğiniz ya da hayal kırıklığına uğradığınız her durumda, pencere başlık çubuğunun altında bulunan ilgili yüze tıklayarak kısaca neyi beğendiğinizi ya da beğenmediğinizi yazıp, Gönder düğmesine tıklayın."
+msgstr ""
+"Beğendiğiniz ya da hayal kırıklığına uğradığınız her durumda, pencere başlık "
+"çubuğunun altında bulunan ilgili yüze tıklayarak kısaca neyi beğendiğinizi "
+"ya da beğenmediğinizi yazıp, Gönder düğmesine tıklayın."
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
-msgstr "Beğendiğiniz her durumda, pencere başlık çubuğunun altında bulunan gülen yüze tıklayarak kısaca neyi beğendiğinizi yazıp, Gönder düğmesine tıklayın."
+msgstr ""
+"Beğendiğiniz her durumda, pencere başlık çubuğunun altında bulunan gülen "
+"yüze tıklayarak kısaca neyi beğendiğinizi yazıp, Gönder düğmesine tıklayın."
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
-msgstr "Hayal kırıklığına uğradığınız her durumda, pencere başlık çubuğunun altında bulunan somurtkan yüze tıklayarak kısaca neyi beğenmediğinizi yazıp, Gönder düğmesine tıklayın."
+msgstr ""
+"Hayal kırıklığına uğradığınız her durumda, pencere başlık çubuğunun altında "
+"bulunan somurtkan yüze tıklayarak kısaca neyi beğenmediğinizi yazıp, Gönder "
+"düğmesine tıklayın."
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
 "Send."
-msgstr "Bir hata bildirmek istediğinizde de aynı yolu izleyin: pencerenin sağ köşesinde bulunan kırık nesne simgesine tıklayarak hatayı tarif edin ve Gönder düğmesine tıklayın."
+msgstr ""
+"Bir hata bildirmek istediğinizde de aynı yolu izleyin: pencerenin sağ "
+"köşesinde bulunan kırık nesne simgesine tıklayarak hatayı tarif edin ve "
+"Gönder düğmesine tıklayın."
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
 "and click Send."
-msgstr "Uygulamada bir hata bulduğunuzda pencere başlık çubuğunun altındaki kırık nesne simgesine tıklayarak hatalı davranışı kısaca anlatıp Gönder düğmesine tıklayın."
+msgstr ""
+"Uygulamada bir hata bulduğunuzda pencere başlık çubuğunun altındaki kırık "
+"nesne simgesine tıklayarak hatalı davranışı kısaca anlatıp Gönder düğmesine "
+"tıklayın."
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr "Örnekler:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr "Yeni arayüzden <b>hoşlandım</b>. Çok dinlendirici."
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
-msgstr "Sihirbazın hoş geldin sayfasından <b>hoşlanmıyorum</b>.Çok zaman harcıyor."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+msgstr ""
+"Sihirbazın hoş geldin sayfasından <b>hoşlanmıyorum</b>.Çok zaman harcıyor."
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
-msgstr "<b>Uygulama tutarsız bir davranış gösterdi</b> ekle düğmesine tıkladığımda hiçbir şey olmuyor."
+msgstr ""
+"<b>Uygulama tutarsız bir davranış gösterdi</b> ekle düğmesine tıkladığımda "
+"hiçbir şey olmuyor."
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
-msgstr "Yaptıklarımı e-posta ile göndermemi sağlayacak <b>yeni bir özellik istiyorum.</b>"
+msgstr ""
+"Yaptıklarımı e-posta ile göndermemi sağlayacak <b>yeni bir özellik istiyorum."
+"</b>"
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "Uygulamanın İyileştirilmesine Yardım Et"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "E-posta Adresi"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "Lütfen e-posta adresinizi girin."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
 "corrections for you to test, etc."
 msgstr ""
 "Bu sadece yorumlarınızla ilgili sizinle bağlantı kurmak, hatayı nasıl "
-"oluşturduğunuzu sormak ve hata düzeltmelerini test etmeniz için "
-"size gönderbilmek için kullanılacak."
+"oluşturduğunuzu sormak ve hata düzeltmelerini test etmeniz için size "
+"gönderbilmek için kullanılacak."
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
-msgstr "E-posta adresi yazmak isteğe bağlıdır. Eğer bir adres girmezseniz yorumlarıız anaonim olarak gönderilecektir."
+msgstr ""
+"E-posta adresi yazmak isteğe bağlıdır. Eğer bir adres girmezseniz "
+"yorumlarıız anaonim olarak gönderilecektir."
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "Gliştiricilere Bir Yorum Gönder"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "Uygulamanın Geliştiricilerine Şu Konuda Bir Yorum Gönder:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "Hoş&landığınız bir şey"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "Hoşlan&madığınız bir şey"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "Bu uygulamanın &gösterdiği bir tutarsız davranış"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "İstediğiniz yeni bir &özellik"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "Pencerenin başlık ç&ubuğu altında yorum düğmelerini göster"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "&Yorum Gönder"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "&E-posta Adresi..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr "Lütfen %1 hakkındaki düşüncelerinizin kısa bir özetini girin."
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "Lütfen İngilizce yazın."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr "<a href=\"%1\">Çevrimiçi çeviri aracını</a> kullanabilirsiniz."
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
-msgstr "Yaptığınız yorumlar uygulamanın geliştirilmesinde işe yarayacaktır, olumlu ve olumsuz yorumlarınızı aynı oranda göndermeye çalışın."
+msgstr ""
+"Yaptığınız yorumlar uygulamanın geliştirilmesinde işe yarayacaktır, olumlu "
+"ve olumsuz yorumlarınızı aynı oranda göndermeye çalışın."
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
-msgstr "Lütfen yeni özellikler <b>istemeyin</b>: istekleriniz kabul edilmeyecektir."
+msgstr ""
+"Lütfen yeni özellikler <b>istemeyin</b>: istekleriniz kabul edilmeyecektir."
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 "<p>Hata raporu gönderilirken hata oluştu.</p><p>Lütfen daha sonra tekrar "
 "deneyin.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "Gönderme Hatası"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
@@ -1678,7 +1821,7 @@ msgstr ""
 "<p>Yorumunuz başarılı şekilde gönderilmiştir.</p><p>Zaman ayırdığınız için "
 "teşekkür ederiz. Yorumunuz uygulamanın gelişimine katkıda bulunacaktır.</p>"
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "Yorum Gönerildi"
 
@@ -1777,26 +1920,29 @@ msgstr ""
 msgid "Example"
 msgstr "Örnek"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "Küçült"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Sepet"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>%1 uygulamasından çıkmak istediğinizden emin misiniz?</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
 "the application will be reloaded the next time you log in.</p>"
-msgstr "<p>TDE oturumunuzu kapatmadan önce uygulamadan çıkmak zorunda değilsiniz. Eğer uygulama çalışırken oturumunuzu kapattıysanız sonraki oturumda uygulama geri yüklenecektir.</p>"
+msgstr ""
+"<p>TDE oturumunuzu kapatmadan önce uygulamadan çıkmak zorunda değilsiniz. "
+"Eğer uygulama çalışırken oturumunuzu kapattıysanız sonraki oturumda uygulama "
+"geri yüklenecektir.</p>"
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "Çıkış Doğrulaması"
 
@@ -1867,7 +2013,7 @@ msgstr "Serbest Biçim"
 msgid "Mind map"
 msgstr "Zihin Haritası"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(Resim)"
 
@@ -1891,6 +2037,11 @@ msgstr "Animasyon"
 msgid "Sound"
 msgstr "Ses"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "&Dosyalar"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "Bağlantı"
@@ -1899,7 +2050,7 @@ msgstr "Bağlantı"
 msgid "Launcher"
 msgstr "Başlatıcı"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "Renk"
 
@@ -1947,271 +2098,280 @@ msgstr "Bu rengi düzenle"
 msgid "Edit this unknown object"
 msgstr "Bu bilinmeyen nesneyi düzenle"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "Düz metin açılıyor..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "Düz metinler açılıyor..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "Düz metin birlikte açılıyor..."
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "Düz metinler birlikte açılıyor..."
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "Düz metni birlikte aç:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "Düz metinleri birlikte aç:"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr "Metin açılıyor..."
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr "Metinler açılıyor..."
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr "Metin birlikte açılıyor..."
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr "Metinler birlikte açılıyor..."
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "Metni birlikte aç:"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "Metinleri birlikte aç:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "Boyut"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 x %2 piksel"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr "Resim açılıyor..."
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr "Resimler açılıyor..."
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr "Resim birlikte açılıyor..."
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr "Resimler birlikte açılıyor..."
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr "Resmi birlikte aç:"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr "Resimleri birlikte aç:"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "Resmi orijinal boyutunda görmek için tıklayın"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr "Animasyon Açılıyor..."
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr "Animasyonlar Açılıyor..."
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr "Animasyon Birlikte Açılıyor..."
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr "Animasyonlar Birlikte Açılıyor..."
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "Animasyonu Birlikte Aç:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "Animasyonları Birlikte Aç:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "Tip"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "Bu dosyayı aç"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr "Dosya açılıyor..."
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr "Dosyalar açılıyor..."
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr "Dosya birlikte açılıyor..."
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr "Dosyalar birlikte açılıyor..."
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr "Dosyayı birlikte aç:"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr "Dosyaları birlikte aç:"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "Bu sesi aç"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr "Ses açılıyor..."
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr "Sesler açılıyor..."
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr "Ses birlikte açılıyor..."
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr "Sesler birlikte açılıyor..."
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "Sesi birlikte aç:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "Sesleri birlikte aç:"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "Hedef"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "Bu bağlantıyı aç"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "Bağlantıyı açmak için bir URL yok."
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr "Bağlantı hedefi açılıyor..."
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr "Bağlantı hedefleri açılıyor..."
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr "Bağlantı hedefi birlikte açılıyor..."
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr "Bağlantı hedefleri birlikte açılıyor..."
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "Bağlantı hedefini birlikte aç:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "Bağlantı hedeflerini birlikte aç:"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(konsolda çalıştır)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "Yorum"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "Komut"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "Bu uygulamayı başlat"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "Çalıştırmak için başlatıcıya ait bir komut yok."
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "Uygulama başlatılıyor..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "Uygulamalar başlatılıyor..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>Kırmızı</i>: %1, <i>Yeşil</i>: %2, <i>Mavi</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "HSV"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>Ton</i>: %1, <i>Doygunluk</i>: %2, <i>Değer</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "CSS Renk Adı"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "CSS Genişletilmiş Renk Adı"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "Web Rengi"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "Hiçbiri"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
@@ -2221,11 +2381,11 @@ msgstr ""
 "resim editörü de içerecek).\n"
 "Bu dosyayı açabilen bir uygulama ile açmak ister misiniz?"
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "Resim Notunu Düzenle"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
@@ -2233,15 +2393,15 @@ msgstr ""
 "Bu hareketli resim burada düzenlenemez.\n"
 "Bu dosyayı açabilen bir uygulama ile açmak ister misiniz?"
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "Animasyon Notunu Düzenle"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "Renk Notunu Düzenle"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
@@ -2251,74 +2411,97 @@ msgstr ""
 "Bununla birlikte, bu notu açabilecek bir uygulamaya notu kopyalayabilir ya "
 "da sürükleyip bırakabilirsiniz."
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "Bilinmeyen Notu Düzenle"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "Bağlantı Notunu Düzenle"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "Otomatik"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "&Simge:"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "&Hedef:"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "&Başlık:"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "Başlatıcı Notunu Düzenle"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "Çalıştırmak için bir komut seçin:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "&Tahmin Et"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "K&omut:"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "&İsim:"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "&Yazı Tipi:"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "Boyut"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "Kalın"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "İta&lik"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "Altı Çizili"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "Sola Yasla"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "Ortala"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "Sağa Yasla"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "İki Yana Yasla"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2365,8 +2548,7 @@ msgstr "Resim olarak eklenecek simge için boyutu seçin:"
 msgid "Load File Content into a Note"
 msgstr "Dosya İçeriğini Bir Not İçine Yükle"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "Parola Koruması"
@@ -2375,225 +2557,145 @@ msgstr "Parola Koruması"
 msgid "No private key selected."
 msgstr "Özel anahtar seçilmedi."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&Sepet"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "&Dışarı Aktar"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "&Ekle"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "&Git"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "&Not"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "E&tiketler"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "Metin Biçimlendirme Araç Çubuğu"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "Sü&zgeç:"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+Z"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "&Koruma yok"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "Sepeti bir pa&rola ile koru"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+R"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "Sepeti bir özel anahtar ile &koru:"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "Solda"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "Sağda"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "&Sepet ağacı konumu:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "Üstte"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "Altta"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "Süzgeç &çubuğu konumu:"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "Genel işlemlerin sonuçlarını göstermek için &baloncuk kullan"
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "Genel işlemler neler?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
 "color from a point of the screen, etc. You can also use the mouse scroll "
 "wheel over the system tray icon to change the current basket. Or use the "
 "middle mouse button on that icon to paste the current selection."
-msgstr "Genel kısayolları yapılandırarak ana pencereyi açmadan komutlar verebilirsiniz. Örneğin, pano içeriğini yapıştırabilir, ekrandan renk yakalayabilirsiniz. Ayrıca siste çekmecesindeki simge üzerinde fare tekerini kullanarak geçerli sepeti değiştirebilirsiniz. Yada farenin orta düğmesini simge üzerindeyken tıklayarak pano içeriğini not olarak yapıştırabilirsiniz."
+msgstr ""
+"Genel kısayolları yapılandırarak ana pencereyi açmadan komutlar "
+"verebilirsiniz. Örneğin, pano içeriğini yapıştırabilir, ekrandan renk "
+"yakalayabilirsiniz. Ayrıca siste çekmecesindeki simge üzerinde fare tekerini "
+"kullanarak geçerli sepeti değiştirebilirsiniz. Yada farenin orta düğmesini "
+"simge üzerindeyken tıklayarak pano içeriğini not olarak yapıştırabilirsiniz."
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
-msgstr "Bu işlemlerden birini yaptığınızda %1 size işleminizin başarılı olduğunu bildirmek için bir balon iletisi gösterecektir. Bu bilgilendirme balonunu isterseniz pasifleştirebilirsiniz."
+msgstr ""
+"Bu işlemlerden birini yaptığınızda %1 size işleminizin başarılı olduğunu "
+"bildirmek için bir balon iletisi gösterecektir. Bu bilgilendirme balonunu "
+"isterseniz pasifleştirebilirsiniz."
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
 "the main window."
-msgstr "Ana pencere açık olduğunda bu balon iletilerin görünmeyeceğini unutmayın. Çünkü yaptığınız işlemlerin sonuçlarını zaten ana pencerede görüyorsunuzdur."
+msgstr ""
+"Ana pencere açık olduğunda bu balon iletilerin görünmeyeceğini unutmayın. "
+"Çünkü yaptığınız işlemlerin sonuçlarını zaten ana pencerede görüyorsunuzdur."
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "Sistem Çekmecesi Simgesi"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "&Sistem çekmecesine küçült"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "&Geçerli sepet simgesini sistem çekmecesinde göster"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "Üzerinden &fare çekildikten sonra ana pencereyi gizle"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "saniyenin onda biri"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr ""
 "Sistem çekmecesindeki simge üzerine fare geldiğinde ana paencereyi göstermek "
 "için bekle"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr "Sepet içindeki değişiklikleri &canlandır"
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "&Sepetler içerisinde ipuçlarını göster"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "&Büyük notlar"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "Davranış"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
-msgstr "* ya da - ile başlayan satırları metin düzenleyicilerde listelere dönüştür"
+msgstr ""
+"* ya da - ile başlayan satırları metin düzenleyicilerde listelere dönüştür"
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "Notları silmeden önce &kullanıcıya sor"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "Me&tinlerin içindeki etiketleri dışa aktar"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "Bu ne zaman uygulanır?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
-msgstr "Bir notu bir metin düzenleyiciye kopyalayıp yapıştırdığınızda ya da tutup attığınızda uygulanır."
+msgstr ""
+"Bir notu bir metin düzenleyiciye kopyalayıp yapıştırdığınızda ya da tutup "
+"attığınızda uygulanır."
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
-msgstr "Bu özellik etkinleştirildiğinde bir etiketi metin eşdeğeri olarak yapıştırmanızı sağlar."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
+msgstr ""
+"Bu özellik etkinleştirildiğinde bir etiketi metin eşdeğeri olarak "
+"yapıştırmanızı sağlar."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
@@ -2606,15 +2708,15 @@ msgstr ""
 "notlar dışa aktarıldığında notun başına <b>[ ]</b> ya da <b>[x]</b> işareti "
 "konulur. Bu işaretler boş ve dolu işaret kutularını temsil eder.</p>"
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "&Girdi satırının sağına tıklandığında yeni bir notu gruplandır."
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "Yeni bir not nasıl gruplanır?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
@@ -2624,7 +2726,7 @@ msgstr ""
 "girmenizi sağlamaz. Ayrıca bu yeni notu imlecin altındaki diğer not ile "
 "gruplamanıza da izin verir.</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2636,168 +2738,168 @@ msgstr ""
 "notu <b>ekleyin</b>.<br>Farenize <b>sağ</b> tıklayarak imlecin konumuna göre "
 "notu <b> üstteki ya da alttaki </b> bir not ile <b> gruplandırın</b>.</p>"
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "Hiçbir şey yapma"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "Panoyu yapıştır"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "Başlatıcı notu ekle"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "Ekrandan renk ekle"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "Dosyadan not yükle"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "TDE Menüsünden Başlatıcı Ekle"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "Simge Ekle"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+orta-düğme herhangi bir yer:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "imleç konumunda"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "Kilit korumalı sepetleri şu süre yaklaşınca otomatik olarak kilitle"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr " dakika"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "Private/public key &korumalı sepetler için GnuPG kullan"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "&Yeni notların yeri:"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "Geçerli notta"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "&Yeni resim boyutu:"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr "&x"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "piksel"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "&Göster..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "Aşağıdaki Dosya Tiplerinde Eklenen Dosyaların İçeriğini Göster"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "&Düz metin"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&HTML sayfası"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "&Resim ya da animasyon"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "&Ses"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "Konferans ses kaydı"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "Yıllık rapor"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Ev Dizini"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "Çalıştır %1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "&Sesler"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "&Dosyalar"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "&Yerel Bağlantılar"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "&Ağ Bağlantıları"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "&Başlatıcılar"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "M&etin notlarını özel bir uygulama ile aç:"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "Metin notlarını birlikte aç:"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "&Resim notlarını özel bir uygulama ile aç:"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "Resim notlarını birlikte aç:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "A&nimasyon notlarını özel bir uygulama ile aç:"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "Animasyon notarını birlikte aç:"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "&Ses notlarını özel bir uygulama ile aç:"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "Ses notlarını birlikte aç:"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
@@ -2807,7 +2909,7 @@ msgstr ""
 "kullanılır.</p><p>Aksi durumda ise, Konqueror yapılandırmasında seçtiğiniz "
 "uygulama kullanılacaktır.</p>"
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
@@ -2815,30 +2917,32 @@ msgstr ""
 "<p>Bu tip notları Konqueror yapılandırmasında tanımlanan dışında bir "
 "uygulama ile açmak için bir uygulama tanımlayın.</p>"
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
-msgstr "Web bağlantılarını açmak için kullanılan uygulamalar nasıl değiştirilir?"
+msgstr ""
+"Web bağlantılarını açmak için kullanılan uygulamalar nasıl değiştirilir?"
 
-#: settings.cpp:904
+#: settings.cpp:907
+#, fuzzy
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
 msgstr ""
 "<p>Web bağlantıları açılırken bağlantının içeriğine göre yerel dosyalarınız "
-"gibi farklı uygulamalar kullanılır. (Web sayfası, resim , PDF dokümanı gibi)"
-"</p><p> Burada her Web adresinin Web tarayıcınız ile nasıl açılacağını "
+"gibi farklı uygulamalar kullanılır. (Web sayfası, resim , PDF dokümanı "
+"gibi)</p><p> Burada her Web adresinin Web tarayıcınız ile nasıl açılacağını "
 "ayarlayabilirsiniz. Bu özellik TDE kullanmıyorsanız kullanışlıdır (Örneğin "
 "GNOME ya da XFCE kullanıyorsanız).</p><ul><li> TDE Denetim Masasını açın "
 "(Eğer sisteminizde bağlantı olarak yoksa \"kcontrol\" komutunu çalıştırarak "
@@ -2846,13 +2950,15 @@ msgstr ""
 "bölümüne gelin.</li><li> \"Web Tarayıcıyı\" seçin. Ardından \"Farklı bir "
 "tarayıcıyı:\" seçerek Web tarayıcınızın adını girin (\"firefox\" ya da "
 "\"epiphany\" gibi). </li></ul><p>Burada <i>tümü</i> seçilirse \"http://...\" "
-"ile başlayan tüm adresler Web tarayıcınızla açılacaktır.</p><p>Daha ayrıntılı bir yapılandırma yardımı için takip eden yardımı tıklayın.</p>"
+"ile başlayan tüm adresler Web tarayıcınızla açılacaktır.</p><p>Daha "
+"ayrıntılı bir yapılandırma yardımı için takip eden yardımı tıklayın.</p>"
 
-#: settings.cpp:922
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
-msgstr "Dosya ve bağlantıları açmak için kullanılan uygulamalar nasıl değiştirilir?"
+msgstr ""
+"Dosya ve bağlantıları açmak için kullanılan uygulamalar nasıl değiştirilir?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2861,12 +2967,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 "<p>Burada hangi dosya tipi için hangi uygulamanın kullanılacağını nasıl "
 "ayarlayacağınız anlatılıyor. Bu aynı zamanda eğer sistematik olarak Web "
@@ -2959,8 +3065,10 @@ msgid ""
 msgstr "%1 den"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
-msgstr "Bu dosya içeriye aktarılamadı. Dosya bozuk ya da TuxCards dosyası değil."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
+msgstr ""
+"Bu dosya içeriye aktarılamadı. Dosya bozuk ya da TuxCards dosyası değil."
 
 #: softwareimporters.cpp:643
 msgid "Bad File Format"
@@ -3107,6 +3215,11 @@ msgstr "Önemli"
 msgid "Very Important"
 msgstr "Çok Önemli"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "Animasyon"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "Fikir"
@@ -3175,6 +3288,11 @@ msgstr "Yukarı Taşı (Ctrl+Shift+Up)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "Aşağı Taşı (Ctrl+Shift+Down)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "&Sil"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "Etiket"
@@ -3243,7 +3361,9 @@ msgstr "Metin eşdeğeri:"
 msgid ""
 "If filled, this property lets you paste this tag or this state as textual "
 "equivalent."
-msgstr "Bu özellik doldurulduğunda bir etiketi ya da ifadeyi metin eşdeğeri olarak yapıştırmanızı sağlar."
+msgstr ""
+"Bu özellik doldurulduğunda bir etiketi ya da ifadeyi metin eşdeğeri olarak "
+"yapıştırmanızı sağlar."
 
 #: tagsedit.cpp:496
 msgid "On ever&y line"
@@ -3257,17 +3377,24 @@ msgstr "Bu ne anlama gelir?"
 msgid ""
 "When a note has several lines, you can choose to export the tag or the state "
 "on the first line or on every line of the note."
-msgstr "Bir not birden fazla satırdan oluşuyorsa etiket ya da ifadeyi sadece ilk satıra ya da her satıra eklenecek şekilde dışarı aktarmayı seçebilirsiniz."
+msgstr ""
+"Bir not birden fazla satırdan oluşuyorsa etiket ya da ifadeyi sadece ilk "
+"satıra ya da her satıra eklenecek şekilde dışarı aktarmayı seçebilirsiniz."
 
 #: tagsedit.cpp:504
 msgid ""
 "In the example above, the tag of the top note is only exported on the first "
 "line, while the tag of the bottom note is exported on every line of the note."
-msgstr "Yukarıdaki örnekte, en üstteki notun etiketi sadece ilk satıra eklenerek dışarı aktarılmıştır. Aşağıdaki notun etiketi ise her satıra eklenerek dışarı aktarılmıştır."
+msgstr ""
+"Yukarıdaki örnekte, en üstteki notun etiketi sadece ilk satıra eklenerek "
+"dışarı aktarılmıştır. Aşağıdaki notun etiketi ise her satıra eklenerek "
+"dışarı aktarılmıştır."
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
-msgstr "Bir etiketi silmek onu kullanan tüm notlar üzerinden o etiketi kaldırır."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
+msgstr ""
+"Bir etiketi silmek onu kullanan tüm notlar üzerinden o etiketi kaldırır."
 
 #: tagsedit.cpp:902
 msgid "Confirm Delete Tag"
@@ -3281,7 +3408,8 @@ msgstr "&Etiketi Sil"
 msgid ""
 "Deleting the state will remove the tag from every note the state is "
 "currently assigned to."
-msgstr "Bir ifadeyi silmek onu kullanan tüm notlar üzerinden o ifadeyi kaldırır."
+msgstr ""
+"Bir ifadeyi silmek onu kullanan tüm notlar üzerinden o ifadeyi kaldırır."
 
 #: tagsedit.cpp:909
 msgid "Confirm Delete State"
@@ -3327,3 +3455,111 @@ msgstr ""
 "Resim boyutunu seçmek için pencereyi boyutlandırın ve kapatın\n"
 "ya da Esc tuşuna basarak değişiklikleri kabul edin."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&Sepet"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "&Dışarı Aktar"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "&Ekle"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "&Git"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "&Not"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "E&tiketler"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Metin Biçimlendirme Araç Çubuğu"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "Metin Biçimlendirme Araç Çubuğu"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "Sü&zgeç:"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "&Aç"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+Z"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "&Koruma yok"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "Sepeti bir pa&rola ile koru"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+R"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "Sepeti bir özel anahtar ile &koru:"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "Lütfen İngilizce ya da Fransızca yazın."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 003a5aa..c9fd9e7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,22 +9,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2007-02-25 16:46+0800\n"
 "Last-Translator: cao ting <ctqucl@gmail.com>\n"
 "Language-Team: 中文简体 <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "cao ting"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -35,54 +36,61 @@ msgid ""
 "<p><b>Taking care of your ideas.</b></p><p>A note-taking application that "
 "makes it easy to record ideas as you think, and quickly find them later. "
 "Organizing your notes has never been so easy.</p>"
-msgstr "<p><b>抓住你的灵感.</b></p><p>一个用来记载想法的小贴士软件,可以帮助你便捷的记录和整理想法.</p>"
+msgstr ""
+"<p><b>抓住你的灵感.</b></p><p>一个用来记载想法的小贴士软件,可以帮助你便捷的记"
+"录和整理想法.</p>"
 
 #: aboutdata.cpp:34
 msgid "BasKet Note Pads"
 msgstr "Basket贴示板"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+#, fuzzy
+msgid "Maintainer"
 msgstr "创建者,维护者"
 
 #: aboutdata.cpp:45
+msgid "Original Author"
+msgstr ""
+
+#: aboutdata.cpp:49
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Basket 编码, Kontact 整合, KnowIt 输出"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
 msgstr ""
-"Baskets 自动锁定, 保存状态图标, HTML 导入导出, basket 名称 tip, "
-"basket 名称导入"
+"Baskets 自动锁定, 保存状态图标, HTML 导入导出, basket 名称 tip, basket 名称导"
+"入"
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 msgid "Icon"
 msgstr "图标"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr "保存为Basket文档"
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr "保存为basket文档.请稍等..."
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr "不是一个正确的basket文档."
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr "文档已损坏"
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr "无法打开,文档已损坏."
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -91,37 +99,37 @@ msgid ""
 "original one."
 msgstr ""
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
 msgstr "这个文件由最近的%1版本所创建,你需要升级到更新的版本才能打开."
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr "备份与还原"
 
-#: backup.cpp:65
+#: backup.cpp:67
 msgid "Save Folder"
 msgstr "保存文件夹"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr "你的basket里面已经存在了这样的目录:<br><b>%1</b>"
 
-#: backup.cpp:69
+#: backup.cpp:71
 msgid "&Move to Another Folder..."
 msgstr "移动到另一个目录(&d)"
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr "使用其它目录(&U)..."
 
-#: backup.cpp:71
+#: backup.cpp:73
 msgid "Why to do that?"
 msgstr "你要干什么?"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -135,60 +143,60 @@ msgid ""
 "to the basket).</p>"
 msgstr ""
 
-#: backup.cpp:89
+#: backup.cpp:91
 msgid "Backups"
 msgstr "备份"
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr "备份中(&B)..."
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr "备份与还原(&R)..."
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr "最近的备份:无"
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr "最近的备份:%1"
 
-#: backup.cpp:124
+#: backup.cpp:126
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "选择你的Basket将要移动到的目录"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr "目录<b>%1</b>非空. 确定覆盖么?"
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr "确定覆盖目录?"
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr "覆盖(&O)"
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr "你的basket成功移动到了<b>%1</b>. 更改后的设置将在%2被采用."
 
-#: backup.cpp:155
+#: backup.cpp:157
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "选择一个目录来保存Basket."
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
 msgstr "你的basket目录成功变更到了<b>%1</b>.更改后的设置将在%2被采用."
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
@@ -196,91 +204,90 @@ msgstr ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr "用Gzip压缩"
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr "所有文件"
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 msgid "Backup Baskets"
 msgstr "备份Basket"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr "文件<b>%1</b>已存在.是否覆盖?"
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr "覆盖文件?"
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr "备份basket中. 请稍候..."
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr "打开basket文档"
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr "README.txt"
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
 msgstr "你正在编辑的是名为%1的basket安全拷贝."
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr "如果你已经成功从备份还原了文档.你可以删除此目录."
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
 msgstr "如果你还原备份文档失败.你可以继续使用当前目录里面的basket."
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
-msgstr "选择 \"Basket\" -> \"备份与还原...\" -> \"使用另一个目录...\" 并选定目录."
+msgstr ""
+"选择 \"Basket\" -> \"备份与还原...\" -> \"使用另一个目录...\" 并选定目录."
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr "<b>%1</b>还原中.请稍等..."
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
-msgstr ""
-"如果你还原备份文档失败,请检查文件<b>%1</"
-"b>."
+msgstr "如果你还原备份文档失败,请检查文件<b>%1</b>."
 
-#: backup.cpp:257
+#: backup.cpp:259
 msgid "Restore Baskets"
 msgstr "还原Basket"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr ""
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr "还原失败"
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -302,45 +309,45 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr "还原前的Basket (%1)"
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr "新建不进行检索的隐藏贴示."
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr "一个隐藏的贴示未被检索."
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr "一些隐藏的贴示未被检索."
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr "隐藏贴示未被检索"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr "分组"
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr "插入"
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 msgid "Dropped to basket <i>%1</i>"
 msgstr "放置到basket<i>%1</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
 msgstr "程序有bug!请向开发者提交bug."
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
@@ -348,48 +355,48 @@ msgstr ""
 "插入贴示到这里\n"
 "右键获取更多信息"
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr "调整列"
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr "调整组"
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 msgid "Resize this note"
 msgstr "调整贴示"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 msgid "Select or move this note"
 msgstr "选择/移动贴示"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr "选择/移动组"
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 msgid "Assign or remove tags from this note"
 msgstr "分配/移除贴示标记"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr "<b>分配的标记</b>: %1"
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr "%1, %2"
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr "展开组"
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr "折叠组"
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
@@ -397,7 +404,7 @@ msgstr ""
 "以下贴示全部组选\n"
 "右键获取更多信息."
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
@@ -405,150 +412,186 @@ msgstr ""
 "以上贴示全部组选\n"
 "右键获取更多信息."
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr "已添加"
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr "最近的变更"
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr "<b>%1</b>: %2"
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr "右侧插入组"
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr "左侧插入组"
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 msgid "&Unlock"
 msgstr "解锁(&U)"
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr "密码保护的basket."
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr "点击解锁访问文件."
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr "当前版本(%1)不支持加密."
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
 msgstr "请在程序设置内更改锁定期限<br>来关闭文档的自动锁定功能."
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr "读取中..."
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "移除所有(&R)"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 msgid "&Customize..."
 msgstr "设置(&C)..."
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr "按标记检索(&F)"
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr "按条件检索(&S)"
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 msgid "Tags"
 msgstr "标记"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
 "<qt>Do you really want to delete those <b>%n</b> notes?</qt>"
 msgstr "<qt>你确定删除这<b>%n</b>条贴示?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
 msgstr "删除贴示"
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
 msgstr "复制贴示到剪贴板"
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
 msgstr "复制到剪贴板"
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
 msgstr "复制所选贴示."
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 msgid "Unable to open this note."
 msgstr "无法打开贴示."
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr "你无权打开这个文档."
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 msgid "Save to File"
 msgstr "保存到文档"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr "请输入私钥密码:"
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "请输入basket <b>%1</b> 的密码:"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "请设置basket <b>%1</b> 的密码:"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr "磁盘空间不足"
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr "错误的文档权限"
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
 msgstr ""
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
 msgstr ""
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr "保存错误"
 
+#: basket_options.h:30
+#, fuzzy
+msgid "Show the debug window"
+msgstr "显示/隐藏主窗口"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "鼠标移动到托盘图标时显示主窗体(&m)"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+#, fuzzy
+msgid "Open basket archive or template"
+msgstr "打开basket文档"
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr "新建basket目录失败."
@@ -581,10 +624,14 @@ msgstr "%1+%2"
 msgid "Basket Properties"
 msgstr "Basket喜好设置"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 msgid "Name"
 msgstr "名称"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+msgid "Appearance"
+msgstr ""
+
 #: basketproperties.cpp:76
 msgid "Background &image:"
 msgstr "背景图像(&i)"
@@ -669,144 +716,142 @@ msgstr "<p>basket被<b>锁定</b>.<br>点击解锁.</p>"
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr "<p>basket被<b>解锁</b>.<br>点击锁定.</p>"
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 msgid "General"
 msgstr "主要"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 msgid "Show/hide main window"
 msgstr "显示/隐藏主窗口"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr "隐藏/显示切换"
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 msgid "Paste clipboard contents in current basket"
 msgstr "粘贴剪贴板内容到当前文档"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
 msgstr "粘贴剪贴板内容"
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr "显示basket文件名"
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "切换为主要."
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "粘贴到basket"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
 msgstr "粘贴剪贴板选项"
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
 "or paste selection in this new basket)."
 msgstr "新建basket"
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "转到上一个basket"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
 msgstr "切换到上一个basket."
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "转到下一个basket"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
 msgstr "切换到下一个basket"
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr "插入文本贴示"
 
-#: bnpview.cpp:265
-msgid "Add a text note to the current basket without having to open the main window."
+#: bnpview.cpp:308
+msgid ""
+"Add a text note to the current basket without having to open the main window."
 msgstr "添加一个文本贴示到当前basket."
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr "插入图片贴示"
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
 msgstr "添加一个图片贴示到当前basket."
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr "插入链接贴示"
 
-#: bnpview.cpp:273
-msgid "Add a link note to the current basket without having to open the main window."
+#: bnpview.cpp:316
+msgid ""
+"Add a link note to the current basket without having to open the main window."
 msgstr "添加一个链接贴示到当前basket."
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr "插入贴示"
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
 msgstr "添加一个新贴示到当前文档."
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr "萃取颜色"
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
 msgstr "添加一个贴示到当前basket."
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr "抓取屏幕范围"
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
 msgstr "抓取屏幕范围"
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 msgid "Baskets"
 msgstr "Basket"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr "请使用英语或法语."
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -814,294 +859,299 @@ msgid ""
 "clicking a basket to open it, or reorganize them using drag and drop."
 msgstr ""
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 msgid "&Basket Archive..."
 msgstr "basket文档(&B)..."
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 msgid "&Hide Window"
 msgstr "隐藏主窗体(&H)"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr "HTML网页(&H)..."
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 msgid "K&Notes"
 msgstr "K&Notes"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr "K&Jots"
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr "&KnowIt..."
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr "Tux&Cards..."
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr "贴上贴示(&S)"
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 msgid "&Tomboy"
 msgstr "阿贴便签(&T)"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 msgid "Text &File..."
 msgstr "其它文档格式..."
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr "备份与还原(&B)..."
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr "删除(&e)"
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr "选择全部贴示"
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr "全部取消(&n)"
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr "取消所有选定的贴示"
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr "插入所选(&I)"
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr "插入当前选定的贴示"
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr "编辑(&E)..."
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 msgid "&Open"
 msgstr "打开(&O)"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 msgid "Open &With..."
 msgstr "打开方式(&W)"
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 msgid "&Save to File..."
 msgstr "保存到文档(&S)..."
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr "分组(&G)"
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr "解除分组(&n)"
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr "置顶(&T)"
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr "上移(&U)"
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr "下移(&D)"
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 msgid "Move on &Bottom"
 msgstr "置底(&B)"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "文字(&T)"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 msgid "&Link"
 msgstr "链接(&L)"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 msgid "&Image"
 msgstr "图片(&I)"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 msgid "&Color"
 msgstr "颜色(&C)"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr "运行程序(&a)"
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr "从K菜单运行程序(&K)"
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 msgid "Im&port Icon..."
 msgstr "载入图标(&p)..."
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 msgid "Load From &File..."
 msgstr "从文档载入(&F)..."
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr "抓取屏幕颜色(&o)"
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr "抓取屏幕范围(&Z)"
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 msgid "&New Basket..."
 msgstr "新建Basket(&N)..."
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 msgid "New &Sub-Basket..."
 msgstr "新建子Basket(&S)..."
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 msgid "New Si&bling Basket..."
 msgstr "新建兄弟Basket(&b)..."
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 msgid "&New"
 msgstr "新建(&N)"
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Basket喜好设置"
+
+#: bnpview.cpp:581
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "移除(&R)"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr "设置密码保护(&w)..."
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "锁定(&L)"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr "检索(&F)"
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 msgid "Filter all &Baskets"
 msgstr "检索全部Basket(&B)"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr "重置检索(&R)"
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 msgid "&Previous Basket"
 msgstr "上一个Basket(&P)"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 msgid "&Next Basket"
 msgstr "下一个Basket(&N)"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 msgid "&Fold Basket"
 msgstr "折叠Basket(&F)"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 msgid "&Expand Basket"
 msgstr "展开Basket(&E)"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 msgid "Configure &Global Shortcuts..."
 msgstr "设置全局快捷方式(&G)..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 msgid "&Welcome Baskets"
 msgstr "欢迎使用Basket(&W)"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr "纯文本贴示转换"
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr "转换纯文本贴示为..."
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr "已锁定"
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 msgid "No notes"
 msgstr "无贴示"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
 "%n notes"
 msgstr "%n条贴示"
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
 "%n selected"
 msgstr "%n条已选定"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr "所有符合"
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "no filter"
 msgstr "无符合"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr "%n条符合"
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr "%1, %2, %3"
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 msgid "Picked color to basket <i>%1</i>"
 msgstr "放置到basket <i>%1</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr "这条纯文本贴示已经转换完成."
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr "转换完成"
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr "没有待转换的纯文本贴示."
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1112,85 +1162,86 @@ msgid ""
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr "文件源不存在"
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr "无法添加贴示"
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "抓取屏幕到basket<i>%1</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 msgid "Delete Basket"
 msgstr "删除Basket"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 msgid "Delete Only that Basket"
 msgstr "只删除这个Basket"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr "删除贴示和内容"
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
-msgid "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
+#: bnpview.cpp:1703 bnpview.cpp:1709
+msgid ""
+"<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>你确定要删除<b>%1</b>和它里面的所有内容?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 msgid "Remove Basket"
 msgstr "移除Basket"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 msgid "&Remove Basket"
 msgstr "移除Basket(&R)"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
 msgstr "<qt><b>%1</b> 有子basket.<br>你要同时删除这些么?</qt>"
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 msgid "Remove Children Baskets"
 msgstr "移除子Basket"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 msgid "&Remove Children Baskets"
 msgstr "移除子Basket(&R)"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 msgid "Basket Archives"
 msgstr "Basket文档设置"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "粘贴所选内容到basket <i>%1</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "粘贴所选到basket <i>%1</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr "未添加贴示."
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr "文档 <i>%1</i> 被锁定"
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr "(已锁定)"
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr "分配新标记(&A)..."
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 msgid "&Remove All"
 msgstr "移除所有(&R)"
 
@@ -1267,11 +1318,11 @@ msgstr "标记(&a):"
 msgid "Filter all Baskets"
 msgstr "检索全部Bakset"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr "(未被标记)"
 
-#: filter.cpp:150
+#: filter.cpp:152
 msgid "(Tagged)"
 msgstr "(已标记)"
 
@@ -1355,35 +1406,35 @@ msgstr "(默认)"
 msgid "Other..."
 msgstr "其它..."
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr "私钥列表"
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr "Email"
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr "ID"
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 msgid "Choose a secret key:"
 msgstr "选择一个密钥:"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr ""
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr "解码的公钥不正确"
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr "不支持的规则"
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr "错误的密码."
 
@@ -1423,203 +1474,212 @@ msgstr "文件系统"
 msgid "File Types"
 msgstr "文件类型"
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "打开(&O)"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr ""
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr ""
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr "发送建议给开发者"
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr "欢迎使用测试版 %1"
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr "欢迎使用 %1"
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr "您的建议将有助于我们程序的改善."
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
 "or dislike and click Send."
 msgstr ""
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
 msgstr ""
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
 msgstr ""
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
 "Send."
 msgstr ""
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
 "and click Send."
 msgstr ""
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr "示例:"
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr ""
 
-#: likeback.cpp:469
-msgid "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
+#: likeback.cpp:470
+msgid ""
+"<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
 msgstr ""
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr "帮助改善程序"
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr "Email地址"
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr "请提交你的Email地址."
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
 "corrections for you to test, etc."
 msgstr ""
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
 msgstr ""
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr "发送建议给开发者"
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr "建议内容:"
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr "你喜欢的功能(&l)"
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr "你讨厌的功能(&d)"
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr "程序bug"
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr "一个新的灵感"
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr "在窗口的标题栏显示提交按钮(&w)"
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr "发送意见(&S)"
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr "Email地址(&E)..."
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr ""
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr "请使用英语."
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr ""
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
 msgstr ""
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr "<p>发送报告失败.</p><p>请稍后再试.</p>"
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr "传输错误"
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
 msgstr ""
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr "意见发送"
 
@@ -1706,26 +1766,26 @@ msgstr ""
 msgid "Example"
 msgstr "示例"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr "最小化"
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 msgid "Basket"
 msgstr "Basket"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "<p>你确定要退出%1？</p>"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
 "the application will be reloaded the next time you log in.</p>"
 msgstr ""
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 msgid "Quit Confirm"
 msgstr "确认退出"
 
@@ -1790,7 +1850,7 @@ msgstr "自由形状"
 msgid "Mind map"
 msgstr "思维脑图"
 
-#: note.cpp:2818
+#: note.cpp:2830
 msgid "(Image)"
 msgstr "(图片)"
 
@@ -1814,6 +1874,11 @@ msgstr "媒体"
 msgid "Sound"
 msgstr "声音"
 
+#: notecontent.cpp:178 systemtray.cpp:83
+#, fuzzy
+msgid "File"
+msgstr "文件(&F)"
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "链接"
@@ -1822,7 +1887,7 @@ msgstr "链接"
 msgid "Launcher"
 msgstr "运行"
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "颜色"
 
@@ -1870,370 +1935,402 @@ msgstr "更改颜色"
 msgid "Edit this unknown object"
 msgstr "编辑未知的对象"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 msgid "Opening plain text..."
 msgstr "打开纯文本文件..."
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 msgid "Opening plain texts..."
 msgstr "打开纯文本文件(多个)..."
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 msgid "Opening plain text with..."
 msgstr "用...打开纯文本文件"
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 msgid "Opening plain texts with..."
 msgstr "用...打开纯文本文件(多个)"
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 msgid "Open plain text with:"
 msgstr "打开纯文本:"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 msgid "Open plain texts with:"
 msgstr "打开纯文本(多个):"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 msgid "Opening text..."
 msgstr ""
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 msgid "Opening texts..."
 msgstr ""
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 msgid "Opening text with..."
 msgstr ""
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 msgid "Opening texts with..."
 msgstr ""
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 msgid "Open text with:"
 msgstr "打开文本贴示(多个):"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 msgid "Open texts with:"
 msgstr "打开多文本贴示:"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr "尺寸"
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 X %2 像素"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 msgid "Opening image..."
 msgstr ""
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 msgid "Opening images..."
 msgstr ""
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 msgid "Opening image with..."
 msgstr ""
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 msgid "Opening images with..."
 msgstr ""
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 msgid "Open image with:"
 msgstr ""
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 msgid "Open images with:"
 msgstr ""
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr "点击完整视图"
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 msgid "Opening animation..."
 msgstr ""
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 msgid "Opening animations..."
 msgstr ""
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 msgid "Opening animation with..."
 msgstr ""
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 msgid "Opening animations with..."
 msgstr ""
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr "打开媒体文件:"
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr "打开媒体文件:"
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr "格式"
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 msgid "Open this file"
 msgstr "打开这个文件"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 msgid "Opening file..."
 msgstr ""
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 msgid "Opening files..."
 msgstr ""
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 msgid "Opening file with..."
 msgstr ""
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 msgid "Opening files with..."
 msgstr ""
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 msgid "Open file with:"
 msgstr ""
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 msgid "Open files with:"
 msgstr ""
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 msgid "Open this sound"
 msgstr "打开这个声音"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 msgid "Opening sound..."
 msgstr ""
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 msgid "Opening sounds..."
 msgstr ""
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 msgid "Opening sound with..."
 msgstr ""
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 msgid "Opening sounds with..."
 msgstr ""
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 msgid "Open sound with:"
 msgstr "打开声音:"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 msgid "Open sounds with:"
 msgstr "打开声音(多个):"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 msgid "Target"
 msgstr "确定目标"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 msgid "Open this link"
 msgstr "打开这个链接"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr "链接缺乏地址"
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 msgid "Opening link target..."
 msgstr ""
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 msgid "Opening link targets..."
 msgstr ""
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 msgid "Opening link target with..."
 msgstr ""
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 msgid "Opening link targets with..."
 msgstr ""
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr "打开目标链接:"
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr "打开目标链接(多个):"
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr "%1 <i>(终端运行)</i>"
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr "注解"
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr "命令"
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr "运行程序"
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr "缺乏运行的命令"
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr "运行程序..."
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr "运行程序(多个)..."
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr "RGB"
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr "<i>红</i>: %1, <i>绿</i>: %2, <i>蓝</i>: %3,"
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr "色彩模式(HSV)"
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr "<i>色彩</i>: %1, <i>饱和度</i>: %2, <i>值</i>: %3,"
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr "CSS 颜色名"
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr "CSS Extended 颜色名"
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr "网页色彩模式"
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+#, fuzzy
+msgid "No"
+msgstr "无"
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
 "Do you want to open it with an application that understand it?"
 msgstr ""
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 msgid "Edit Image Note"
 msgstr "编辑图片"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
 msgstr ""
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 msgid "Edit Animation Note"
 msgstr "编辑媒体"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr "编辑颜色"
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
 "it."
 msgstr ""
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 msgid "Edit Unknown Note"
 msgstr "编辑未知的贴示"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 msgid "Edit Link Note"
 msgstr "编辑链接"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "自动"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 msgid "&Icon:"
 msgstr "图标(&I):"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 msgid "Ta&rget:"
 msgstr "确定目标(&r)"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 msgid "&Title:"
 msgstr "标题(&T):"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 msgid "Edit Launcher Note"
 msgstr "编辑运行程序"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr "选择要运行的命令:"
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr "推测(&G)"
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr "命令(&d):"
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 msgid "&Name:"
 msgstr "Name(&N):"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "字体(&F):"
+
+#: noteedit.cpp:815
+#, fuzzy
+msgid "Font Size"
+msgstr "尺寸"
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "粗体"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "斜体(&I)"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "下划线"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr "靠左对齐"
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "居中"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 msgid "Align Right"
 msgstr "靠右对齐"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 msgid "Justified"
 msgstr "两边对齐"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2275,8 +2372,7 @@ msgstr "选择将图标设置成图片的尺寸:"
 msgid "Load File Content into a Note"
 msgstr "将文件内容载人贴示"
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr "密码保护"
@@ -2285,135 +2381,39 @@ msgstr "密码保护"
 msgid "No private key selected."
 msgstr "未选择私钥."
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, no-c-format
-msgid "&Basket"
-msgstr "&BasKet"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr "导出(&E)"
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr "载人(&I)"
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr "转到(&G)"
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, no-c-format
-msgid "&Note"
-msgstr "贴示(&N)"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, no-c-format
-msgid "&Tags"
-msgstr "标记(&T)"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr "文本排版工具栏"
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr "TDEIconDialogUI"
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, no-c-format
-msgid "Fi&lter:"
-msgstr "检索(&l):"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr "Alt+O"
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr "未保护(&N)"
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr "Alt+N"
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr "密码保护basket(&k)"
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr "Alt+P"
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr "保护basket的私钥(&k):"
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr "Alt+K"
-
-#: settings.cpp:367
+#: settings.cpp:370
 msgid "On left"
 msgstr "靠左"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr "靠右"
 
-#: settings.cpp:369
+#: settings.cpp:372
 msgid "&Basket tree position:"
 msgstr "&Basket树:"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 msgid "On top"
 msgstr "置顶"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 msgid "On bottom"
 msgstr "置底"
 
-#: settings.cpp:378
+#: settings.cpp:381
 msgid "&Filter bar position:"
 msgstr "检索吧位置(&F):"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr "递归执行全局设定(&U)."
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr "应用到全部么?"
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2422,108 +2422,111 @@ msgid ""
 "middle mouse button on that icon to paste the current selection."
 msgstr ""
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
 msgstr ""
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
 "the main window."
 msgstr ""
 
-#: settings.cpp:402
+#: settings.cpp:405
 msgid "System Tray Icon"
 msgstr "托盘图标"
 
-#: settings.cpp:407
+#: settings.cpp:410
 msgid "&Dock in system tray"
 msgstr "放到系统托盘(&D)"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr "在托盘上显示当前basket图标(&S)"
 
-#: settings.cpp:426
+#: settings.cpp:429
 msgid "&Hide main window when mouse leaves it for"
 msgstr "鼠标离开后隐藏主窗体(&H)"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "秒"
 
-#: settings.cpp:437
+#: settings.cpp:440
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "鼠标移动到托盘图标时显示主窗体(&m)"
 
-#: settings.cpp:511
+#: settings.cpp:514
 msgid "Ani&mate changes in baskets"
 msgstr ""
 
-#: settings.cpp:514
+#: settings.cpp:517
 msgid "&Show tooltips in baskets"
 msgstr "显示技巧提示工具"
 
-#: settings.cpp:517
+#: settings.cpp:520
 msgid "&Big notes"
 msgstr "大量的贴示(&B)"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr "行为"
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr ""
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr "删除贴示前确认(&D)"
 
-#: settings.cpp:533
+#: settings.cpp:536
 msgid "&Export tags in texts"
 msgstr "导出标记到文本(&E)"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr "适用的情况?"
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
 msgstr "当你把一个贴示通过复制粘贴或拖动到文本编辑器时可以使用。"
 
-#: settings.cpp:541
-msgid "If enabled, this property lets you paste the tags as textual equivalents."
+#: settings.cpp:544
+msgid ""
+"If enabled, this property lets you paste the tags as textual equivalents."
 msgstr "如果开启，将会把你的同义标记转换成其相对应的内容."
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
 "empty checkbox and a checked box."
 msgstr ""
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr "当点击一行的右侧时对新建贴示进行分组."
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr "如何对新的贴示进行分组?"
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
 "with the one under the cursor:</p>"
-msgstr "<p>当开启这个选项后,插入行将不允许你在光标位置粘贴贴示,但是你依然可以在光标下内容使用新建分组功能:</p>"
+msgstr ""
+"<p>当开启这个选项后,插入行将不允许你在光标位置粘贴贴示,但是你依然可以在光标下"
+"内容使用新建分组功能:</p>"
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2531,207 +2534,207 @@ msgid ""
 "or above</b>, depending on where your mouse is.</p>"
 msgstr ""
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr "不操作"
 
-#: settings.cpp:575
+#: settings.cpp:578
 msgid "Paste clipboard"
 msgstr "粘贴"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr "插入运行程序贴示"
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr "从屏幕插入颜色"
 
-#: settings.cpp:582
+#: settings.cpp:585
 msgid "Load note from file"
 msgstr "从文档读取贴士"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr "从K菜单载人运行程序"
 
-#: settings.cpp:584
+#: settings.cpp:587
 msgid "Import icon"
 msgstr "载人图标"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr "&Shift+点击鼠标中键:"
 
-#: settings.cpp:588
+#: settings.cpp:591
 msgid "at cursor position"
 msgstr "光标位置"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr "关闭文档后自动锁定保护(&u)"
 
-#: settings.cpp:603
+#: settings.cpp:606
 msgid " minutes"
 msgstr "分钟"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr "使用GnuPG密钥来保护文档(&p)"
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr "新建贴示(&P):"
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr "当前贴示"
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr "新图片尺寸(&N):"
 
-#: settings.cpp:718
+#: settings.cpp:721
 msgid "&by"
 msgstr ""
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "像素"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "预览(&V)..."
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr "显示已添加文件的类型"
 
-#: settings.cpp:732
+#: settings.cpp:735
 msgid "&Plain text"
 msgstr "纯文本(&P)"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr "&HTML页面"
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr "图片或媒体(&I)"
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr "声音(&S)"
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr "录音"
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr "统计报告"
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr "Home目录"
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, c-format
 msgid "Launch %1"
 msgstr "运行%1"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr "多个声音(&S)"
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr "文件(&F)"
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr "本地链接(&L)"
 
-#: settings.cpp:802
+#: settings.cpp:805
 msgid "&Network Links"
 msgstr "网络链接(&N)"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr "执行程序"
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr "用自定义程序打开文本贴示(&t):"
 
-#: settings.cpp:841
+#: settings.cpp:844
 msgid "Open text notes with:"
 msgstr "打开文本贴示(多个):"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr "使用自定义程序打开贴示(&i):"
 
-#: settings.cpp:849
+#: settings.cpp:852
 msgid "Open image notes with:"
 msgstr "使用自定义程序打开图像贴示:"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr "使用自定义程序打开媒体贴示(&n):"
 
-#: settings.cpp:857
+#: settings.cpp:860
 msgid "Open animation notes with:"
 msgstr "使用自定义程序打开媒体贴示(&n):"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr "使用自定义程序打开声音贴示(&u);"
 
-#: settings.cpp:865
+#: settings.cpp:868
 msgid "Open sound notes with:"
 msgstr "打开声音贴示(&w):"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
 msgstr ""
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
 msgstr ""
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr "如何改变打开网页链接的程序?"
 
-#: settings.cpp:904
+#: settings.cpp:907
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
-msgstr ""
-
-#: settings.cpp:922
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
+msgstr ""
+
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr "如何改变打开文件和链接的程序?"
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2740,12 +2743,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 
 #: softwareimporters.cpp:45
@@ -2824,7 +2827,8 @@ msgid ""
 msgstr "源自%1"
 
 #: softwareimporters.cpp:643
-msgid "Can not import that file. It is either corrupted or not a TuxCards file."
+msgid ""
+"Can not import that file. It is either corrupted or not a TuxCards file."
 msgstr ""
 
 #: softwareimporters.cpp:643
@@ -2963,6 +2967,11 @@ msgstr "重要"
 msgid "Very Important"
 msgstr "非常重要"
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "媒体"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr "想法"
@@ -3031,6 +3040,11 @@ msgstr "上移(Ctrl+Shift+Up)"
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr "下移(Ctrl+Shift+Down)"
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "删除(&e)"
+
 #: tagsedit.cpp:375
 msgid "Tag"
 msgstr "标记"
@@ -3122,7 +3136,8 @@ msgid ""
 msgstr ""
 
 #: tagsedit.cpp:901
-msgid "Deleting the tag will remove it from every note it is currently assigned to."
+msgid ""
+"Deleting the tag will remove it from every note it is currently assigned to."
 msgstr ""
 
 #: tagsedit.cpp:902
@@ -3183,3 +3198,111 @@ msgstr ""
 "调整窗口到选择图片大小\n"
 "关闭退出后会自动保存改变."
 
+#: basket_part.rc:5 basketui.rc:5
+#, no-c-format
+msgid "&Basket"
+msgstr "&BasKet"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr "导出(&E)"
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr "载人(&I)"
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr "转到(&G)"
+
+#: basket_part.rc:58 basketui.rc:61
+#, no-c-format
+msgid "&Note"
+msgstr "贴示(&N)"
+
+#: basket_part.rc:73 basketui.rc:76
+#, no-c-format
+msgid "&Tags"
+msgstr "标记(&T)"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "文本排版工具栏"
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr "文本排版工具栏"
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr "TDEIconDialogUI"
+
+#: kicondialogui.ui:105
+#, no-c-format
+msgid "Fi&lter:"
+msgstr "检索(&l):"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "打开(&O)"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr "Alt+O"
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr "未保护(&N)"
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr "Alt+N"
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr "密码保护basket(&k)"
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr "Alt+P"
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr "保护basket的私钥(&k):"
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#~ msgid "Please write in English or French."
+#~ msgstr "请使用英语或法语."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f8bf900..495b265 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,22 +7,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
-"POT-Creation-Date: 2007-01-13 15:57+0100\n"
+"POT-Creation-Date: 2018-12-18 01:55+0100\n"
 "PO-Revision-Date: 2004-05-05 23:27+0800\n"
 "Last-Translator: Rex <rexforce@hotmail.com>\n"
 "Language-Team: 正體中文 <zh@li.org>\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.3.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "雷克斯"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -41,46 +42,50 @@ msgid "BasKet Note Pads"
 msgstr "Basket偏好設定"
 
 #: aboutdata.cpp:41
-msgid "Author, maintainer"
+msgid "Maintainer"
 msgstr ""
 
 #: aboutdata.cpp:45
-msgid "Basket encryption, Kontact integration, KnowIt importer"
+msgid "Original Author"
 msgstr ""
 
 #: aboutdata.cpp:49
+msgid "Basket encryption, Kontact integration, KnowIt importer"
+msgstr ""
+
+#: aboutdata.cpp:53
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
 msgstr ""
 
-#: aboutdata.cpp:53 basketproperties.cpp:61 newbasketdialog.cpp:103
+#: aboutdata.cpp:57 basketproperties.cpp:61 newbasketdialog.cpp:103
 #, fuzzy
 msgid "Icon"
 msgstr "圖示(&I):"
 
-#: archive.cpp:54 bnpview.cpp:1750
+#: archive.cpp:55 bnpview.cpp:1804
 msgid "Save as Basket Archive"
 msgstr ""
 
-#: archive.cpp:54
+#: archive.cpp:55
 msgid "Saving as basket archive. Please wait..."
 msgstr ""
 
-#: archive.cpp:258
+#: archive.cpp:259
 msgid "This file is not a basket archive."
 msgstr ""
 
-#: archive.cpp:258 archive.cpp:289 archive.cpp:316 archive.cpp:324
-#: archive.cpp:334 archive.cpp:381
+#: archive.cpp:259 archive.cpp:290 archive.cpp:317 archive.cpp:325
+#: archive.cpp:335 archive.cpp:385
 msgid "Basket Archive Error"
 msgstr ""
 
-#: archive.cpp:289 archive.cpp:334 archive.cpp:381
+#: archive.cpp:290 archive.cpp:335 archive.cpp:385
 msgid "This file is corrupted. It can not be opened."
 msgstr ""
 
-#: archive.cpp:311
+#: archive.cpp:312
 msgid ""
 "This file was created with a recent version of %1. It can be opened but not "
 "every information will be available to you. For instance, some notes may be "
@@ -89,40 +94,40 @@ msgid ""
 "original one."
 msgstr ""
 
-#: archive.cpp:322
+#: archive.cpp:323
 msgid ""
 "This file was created with a recent version of %1. Please upgrade to a newer "
 "version to be able to open that file."
 msgstr ""
 
-#: backup.cpp:56
+#: backup.cpp:58
 msgid "Backup & Restore"
 msgstr ""
 
-#: backup.cpp:65
+#: backup.cpp:67
 #, fuzzy
 msgid "Save Folder"
 msgstr "載入自檔案(&d)"
 
-#: backup.cpp:66
+#: backup.cpp:68
 msgid "Your baskets are currently stored in that folder:<br><b>%1</b>"
 msgstr ""
 
-#: backup.cpp:69
+#: backup.cpp:71
 #, fuzzy
 msgid "&Move to Another Folder..."
 msgstr "載入自檔案(&d)"
 
-#: backup.cpp:70
+#: backup.cpp:72
 msgid "&Use Another Existing Folder..."
 msgstr ""
 
-#: backup.cpp:71
+#: backup.cpp:73
 #, fuzzy
 msgid "Why to do that?"
 msgstr "貼上至所選擇"
 
-#: backup.cpp:72
+#: backup.cpp:74
 msgid ""
 "<p>You can move the folder where %1 store your baskets to:</p><ul><li>Store "
 "your baskets in a visible place in your home folder, like ~/Notes or ~/"
@@ -136,152 +141,152 @@ msgid ""
 "to the basket).</p>"
 msgstr ""
 
-#: backup.cpp:89
+#: backup.cpp:91
 msgid "Backups"
 msgstr ""
 
-#: backup.cpp:92
+#: backup.cpp:94
 msgid "&Backup..."
 msgstr ""
 
-#: backup.cpp:93
+#: backup.cpp:95
 msgid "&Restore a Backup..."
 msgstr ""
 
-#: backup.cpp:113
+#: backup.cpp:115
 msgid "Last backup: never"
 msgstr ""
 
-#: backup.cpp:115
+#: backup.cpp:117
 #, c-format
 msgid "Last backup: %1"
 msgstr ""
 
-#: backup.cpp:124
+#: backup.cpp:126
 #, fuzzy
 msgid "Choose a Folder Where to Move Baskets"
 msgstr "新建一個basket"
 
-#: backup.cpp:136
+#: backup.cpp:138
 msgid "The folder <b>%1</b> is not empty. Do you want to override it?"
 msgstr ""
 
-#: backup.cpp:137
+#: backup.cpp:139
 msgid "Override Folder?"
 msgstr ""
 
-#: backup.cpp:138 backup.cpp:190 bnpview.cpp:1759 htmlexporter.cpp:68
+#: backup.cpp:140 backup.cpp:192 bnpview.cpp:1813 htmlexporter.cpp:68
 msgid "&Override"
 msgstr ""
 
-#: backup.cpp:147
+#: backup.cpp:149
 msgid ""
 "Your baskets have been successfuly moved to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
 msgstr ""
 
-#: backup.cpp:155
+#: backup.cpp:157
 #, fuzzy
 msgid "Choose an Existing Folder to Store Baskets"
 msgstr "新建一個basket"
 
-#: backup.cpp:158
+#: backup.cpp:160
 msgid ""
 "Your basket save folder has been successfuly changed to <b>%1</b>. %2 is "
 "going to be restarted to take this change into account."
 msgstr ""
 
-#: backup.cpp:170
+#: backup.cpp:172
 msgid ""
 "_: Backup filename (without extension), %1 is the date\n"
 "Baskets_%1"
 msgstr ""
 
-#: backup.cpp:175 backup.cpp:230
+#: backup.cpp:177 backup.cpp:232
 msgid "Tar Archives Compressed by Gzip"
 msgstr ""
 
-#: backup.cpp:175 backup.cpp:230 bnpview.cpp:1747 bnpview.cpp:1785
+#: backup.cpp:177 backup.cpp:232 bnpview.cpp:1801 bnpview.cpp:1839
 #: htmlexporter.cpp:53
 msgid "All Files"
 msgstr ""
 
-#: backup.cpp:179 backup.cpp:200
+#: backup.cpp:181 backup.cpp:202
 #, fuzzy
 msgid "Backup Baskets"
 msgstr "(解除)鎖定basket"
 
-#: backup.cpp:187 bnpview.cpp:1756 htmlexporter.cpp:65
+#: backup.cpp:189 bnpview.cpp:1810 htmlexporter.cpp:65
 msgid "The file <b>%1</b> already exists. Do you really want to override it?"
 msgstr ""
 
-#: backup.cpp:189 bnpview.cpp:1758 htmlexporter.cpp:67
+#: backup.cpp:191 bnpview.cpp:1812 htmlexporter.cpp:67
 msgid "Override File?"
 msgstr ""
 
-#: backup.cpp:200
+#: backup.cpp:202
 msgid "Backing up baskets. Please wait..."
 msgstr ""
 
-#: backup.cpp:231 bnpview.cpp:1786
+#: backup.cpp:233 bnpview.cpp:1840
 msgid "Open Basket Archive"
 msgstr ""
 
-#: backup.cpp:242
+#: backup.cpp:244
 msgid "README.txt"
 msgstr ""
 
-#: backup.cpp:246
+#: backup.cpp:248
 #, c-format
 msgid ""
 "This is a safety copy of your baskets like they were before you started to "
 "restore the backup %1."
 msgstr ""
 
-#: backup.cpp:247
+#: backup.cpp:249
 msgid ""
 "If the restoration was a success and you restored what you wanted to "
 "restore, you can remove this folder."
 msgstr ""
 
-#: backup.cpp:248
+#: backup.cpp:250
 msgid ""
 "If something went wrong during the restoration process, you can re-use this "
 "folder to store your baskets and nothing will be lost."
 msgstr ""
 
-#: backup.cpp:249
+#: backup.cpp:251
 msgid ""
 "Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing "
 "Folder...\" and select that folder."
 msgstr ""
 
-#: backup.cpp:254
+#: backup.cpp:256
 msgid "Restoring <b>%1</b>. Please wait..."
 msgstr ""
 
-#: backup.cpp:255
+#: backup.cpp:257
 msgid ""
 "If something goes wrong during the restoration process, read the file <b>%1</"
 "b>."
 msgstr ""
 
-#: backup.cpp:257
+#: backup.cpp:259
 #, fuzzy
 msgid "Restore Baskets"
 msgstr "新建basket"
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid ""
 "This archive is either not a backup of baskets or is corrupted. It cannot be "
 "imported. Your old baskets have been preserved instead."
 msgstr ""
 
-#: backup.cpp:287
+#: backup.cpp:289
 msgid "Restore Error"
 msgstr ""
 
-#: backup.cpp:295
+#: backup.cpp:297
 msgid ""
 "Your backup has been successfuly restored to <b>%1</b>. %2 is going to be "
 "restarted to take this change into account."
@@ -303,261 +308,295 @@ msgid ""
 "Baskets Before Restoration (%1)"
 msgstr ""
 
-#: basket.cpp:523
+#: basket.cpp:529
 msgid "The new note does not match the filter and is hidden."
 msgstr ""
 
-#: basket.cpp:524
+#: basket.cpp:530
 msgid "A new note does not match the filter and is hidden."
 msgstr ""
 
-#: basket.cpp:525
+#: basket.cpp:531
 msgid "Some new notes do not match the filter and are hidden."
 msgstr ""
 
-#: basket.cpp:526
+#: basket.cpp:532
 msgid "The new notes do not match the filter and are hidden."
 msgstr ""
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Group New Note)\n"
 "Group"
 msgstr ""
 
-#: basket.cpp:1542
+#: basket.cpp:1585
 msgid ""
 "_: The verb (Insert New Note)\n"
 "Insert"
 msgstr ""
 
-#: basket.cpp:1968
+#: basket.cpp:2011
 #, fuzzy
 msgid "Dropped to basket <i>%1</i>"
 msgstr "放置(%1)至basket <i>%2</i>"
 
-#: basket.cpp:2338
+#: basket.cpp:2389
 msgid ""
 "This message should never appear. If it does, this program is buggy! Please "
 "report the bug to the developer."
 msgstr ""
 
-#: basket.cpp:2755 basket.cpp:2800 basket.cpp:2803
+#: basket.cpp:2806 basket.cpp:2851 basket.cpp:2854
 msgid ""
 "Insert note here\n"
 "Right click for more options"
 msgstr ""
 
-#: basket.cpp:2773
+#: basket.cpp:2824
 msgid "Resize those columns"
 msgstr ""
 
-#: basket.cpp:2775
+#: basket.cpp:2826
 msgid "Resize this group"
 msgstr ""
 
-#: basket.cpp:2776
+#: basket.cpp:2827
 #, fuzzy
 msgid "Resize this note"
 msgstr "確認刪除"
 
-#: basket.cpp:2777
+#: basket.cpp:2828
 #, fuzzy
 msgid "Select or move this note"
 msgstr "確認刪除"
 
-#: basket.cpp:2778
+#: basket.cpp:2829
 msgid "Select or move this group"
 msgstr ""
 
-#: basket.cpp:2779
+#: basket.cpp:2830
 #, fuzzy
 msgid "Assign or remove tags from this note"
 msgstr "確認刪除"
 
-#: basket.cpp:2781
+#: basket.cpp:2832
 #, c-format
 msgid "<b>Assigned Tags</b>: %1"
 msgstr ""
 
-#: basket.cpp:2788
+#: basket.cpp:2839
 msgid "%1, %2"
 msgstr ""
 
-#: basket.cpp:2795
+#: basket.cpp:2846
 msgid "Expand this group"
 msgstr ""
 
-#: basket.cpp:2796
+#: basket.cpp:2847
 msgid "Collapse this group"
 msgstr ""
 
-#: basket.cpp:2801
+#: basket.cpp:2852
 msgid ""
 "Group note with the one below\n"
 "Right click for more options"
 msgstr ""
 
-#: basket.cpp:2802
+#: basket.cpp:2853
 msgid ""
 "Group note with the one above\n"
 "Right click for more options"
 msgstr ""
 
-#: basket.cpp:2818
+#: basket.cpp:2869
 msgid "Added"
 msgstr ""
 
-#: basket.cpp:2819
+#: basket.cpp:2870
 msgid "Last Modification"
 msgstr ""
 
-#: basket.cpp:2827
+#: basket.cpp:2878
 msgid ""
 "_: of the form 'key: value'\n"
 "<b>%1</b>: %2"
 msgstr ""
 
-#: basket.cpp:2830
+#: basket.cpp:2881
 msgid "Click on the right to group instead of insert"
 msgstr ""
 
-#: basket.cpp:2832
+#: basket.cpp:2883
 msgid "Click on the left to insert instead of group"
 msgstr ""
 
-#: basket.cpp:3026
+#: basket.cpp:3077
 #, fuzzy
 msgid "&Unlock"
 msgstr "鎖定(&L)\"%1\""
 
-#: basket.cpp:3031
+#: basket.cpp:3082
 msgid "Password protected basket."
 msgstr ""
 
-#: basket.cpp:3033
+#: basket.cpp:3084
 msgid "Press Unlock to access it."
 msgstr ""
 
-#: basket.cpp:3035
+#: basket.cpp:3086
 #, c-format
 msgid "Encryption is not supported by<br/>this version of %1."
 msgstr ""
 
-#: basket.cpp:3047
+#: basket.cpp:3098
 msgid ""
 "To make baskets stay unlocked, change the automatic<br>locking duration in "
 "the application settings."
 msgstr ""
 
-#: basket.cpp:3082 basketstatusbar.cpp:83 bnpview.cpp:1293 bnpview.cpp:1957
+#: basket.cpp:3135 basketstatusbar.cpp:83 bnpview.cpp:1347 bnpview.cpp:2011
 msgid "Loading..."
 msgstr ""
 
-#: basket.cpp:3325 basket.cpp:3346 bnpview.cpp:2261
+#: basket.cpp:3380 basket.cpp:3401
+#, fuzzy
+msgid "&Remove"
+msgstr "新建basket"
+
+#: basket.cpp:3381 basket.cpp:3402 bnpview.cpp:2320
 #, fuzzy
 msgid "&Customize..."
 msgstr "預覽(&V)"
 
-#: basket.cpp:3327 basket.cpp:3348
+#: basket.cpp:3383 basket.cpp:3404
 msgid "&Filter by this Tag"
 msgstr ""
 
-#: basket.cpp:3349
+#: basket.cpp:3405
 msgid "Filter by this &State"
 msgstr ""
 
-#: basket.cpp:3429
+#: basket.cpp:3485
 #, fuzzy
 msgid "Tags"
 msgstr "儲存目標"
 
-#: basket.cpp:4065
+#: basket.cpp:4117
 #, fuzzy, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this note?</qt>\n"
 "<qt>Do you really want to delete those <b>%n</b> notes?</qt>"
 msgstr "<qt>您真的確定要刪除<b>%1</b> ?</qt>"
 
-#: basket.cpp:4067
+#: basket.cpp:4119
 msgid ""
 "_n: Delete Note\n"
 "Delete Notes"
 msgstr ""
 
-#: basket.cpp:4165
+#: basket.cpp:4217
 #, fuzzy
 msgid ""
 "_n: Copied note to clipboard.\n"
 "Copied notes to clipboard."
 msgstr "複製至剪貼簿"
 
-#: basket.cpp:4166
+#: basket.cpp:4218
 #, fuzzy
 msgid ""
 "_n: Cut note to clipboard.\n"
 "Cut notes to clipboard."
 msgstr "複製至剪貼簿"
 
-#: basket.cpp:4167
+#: basket.cpp:4219
 #, fuzzy
 msgid ""
 "_n: Copied note to selection.\n"
 "Copied notes to selection."
 msgstr "貼上至所選擇"
 
-#: basket.cpp:4213 basket.cpp:4262
+#: basket.cpp:4265 basket.cpp:4314
 #, fuzzy
 msgid "Unable to open this note."
 msgstr "確認刪除"
 
-#: basket.cpp:4237
+#: basket.cpp:4267 basket_part.rc:36 basketui.rc:39
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: basket.cpp:4289
 msgid "You are not authorized to open this file."
 msgstr ""
 
-#: basket.cpp:4279
+#: basket.cpp:4331
 #, fuzzy
 msgid "Save to File"
 msgstr "載入自檔案(&d)"
 
-#: basket.cpp:5219
+#: basket.cpp:5283
 msgid "Please enter the password for the following private key:"
 msgstr ""
 
-#: basket.cpp:5221
+#: basket.cpp:5285
 #, fuzzy
 msgid "Please enter the password for the basket <b>%1</b>:"
 msgstr "自剪貼簿(%1)貼上至basket<i>%2</i>"
 
-#: basket.cpp:5266
+#: basket.cpp:5330
 #, fuzzy
 msgid "Please assign a password to the basket <b>%1</b>:"
 msgstr "所選擇的(%1)貼上至basket<i>%2</i>"
 
-#: basket.cpp:5328
+#: basket.cpp:5392
 msgid "Insufficient Disk Space to Save Basket Data"
 msgstr ""
 
-#: basket.cpp:5329
+#: basket.cpp:5393
 msgid "Wrong Basket File Permissions"
 msgstr ""
 
-#: basket.cpp:5332
+#: basket.cpp:5396
 msgid ""
 "Please remove files on the disk <b>%1</b> to let the application safely save "
 "your changes."
 msgstr ""
 
-#: basket.cpp:5334
+#: basket.cpp:5398
 msgid ""
 "File permissions are bad for <b>%1</b>. Please check that you have write "
 "access to it and the parent folders."
 msgstr ""
 
-#: basket.cpp:5370
+#: basket.cpp:5434
 msgid "Save Error"
 msgstr ""
 
+#: basket_options.h:30
+msgid "Show the debug window"
+msgstr "顯示除錯視窗"
+
+#: basket_options.h:32
+msgid ""
+"Custom folder where to load and save basket data and application data "
+"(useful for debugging purpose)"
+msgstr ""
+
+#: basket_options.h:34
+#, fuzzy
+msgid "Hide the main window in the system tray icon on startup"
+msgstr "按下關閉鈕時隱藏主視窗(而非退出程式)(&H)"
+
+#: basket_options.h:37
+msgid ""
+"When crashing, use the standard TDE report dialog instead of sending an email"
+msgstr ""
+
+#: basket_options.h:39
+msgid "Open basket archive or template"
+msgstr ""
+
 #: basketfactory.cpp:60
 msgid "Sorry, but the folder creation for this new basket has failed."
 msgstr ""
@@ -592,11 +631,16 @@ msgstr ""
 msgid "Basket Properties"
 msgstr "Basket偏好設定"
 
-#: basketproperties.cpp:64 kgpgme.cpp:60 newbasketdialog.cpp:108
+#: basketproperties.cpp:64 kgpgme.cpp:62 newbasketdialog.cpp:108
 #, fuzzy
 msgid "Name"
 msgstr "名稱(&N):"
 
+#: basketproperties.cpp:70 settings.cpp:511 tagsedit.cpp:1033
+#, fuzzy
+msgid "Appearance"
+msgstr "註解(&p):"
+
 #: basketproperties.cpp:76
 #, fuzzy
 msgid "Background &image:"
@@ -687,162 +731,158 @@ msgstr ""
 msgid "<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>"
 msgstr ""
 
-#: bnpview.cpp:175 bnpview.cpp:1128
+#: bnpview.cpp:176 bnpview.cpp:1178
 #, fuzzy
 msgid "General"
 msgstr "置中"
 
-#: bnpview.cpp:231
+#: bnpview.cpp:274
 #, fuzzy
 msgid "Show/hide main window"
 msgstr "顯示/隱藏主視窗"
 
-#: bnpview.cpp:232
+#: bnpview.cpp:275
 #, fuzzy
 msgid ""
 "Allows you to show main Window if it is hidden, and to hide it if it is "
 "shown."
 msgstr "允許您在主視窗隱藏時顯示之,而在顯示時隱藏之。"
 
-#: bnpview.cpp:236
+#: bnpview.cpp:279
 #, fuzzy
 msgid "Paste clipboard contents in current basket"
 msgstr "貼上剪貼簿內容至目前的basket"
 
-#: bnpview.cpp:237
+#: bnpview.cpp:280
 #, fuzzy
 msgid ""
 "Allows you to paste clipboard contents in the current basket without having "
 "to open the main window."
 msgstr "允許您貼上剪貼簿內容至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:240
+#: bnpview.cpp:283
 msgid "Show current basket name"
 msgstr ""
 
-#: bnpview.cpp:241
+#: bnpview.cpp:284
 #, fuzzy
 msgid "Allows you to know basket is current without opening the main window."
 msgstr "允許您貼上剪貼簿內容至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:244
+#: bnpview.cpp:287
 msgid "Paste selection in current basket"
 msgstr "貼上所選擇在目前的basket"
 
-#: bnpview.cpp:245
+#: bnpview.cpp:288
 #, fuzzy
 msgid ""
 "Allows you to paste clipboard selection in the current basket without having "
 "to open the main window."
 msgstr "允許您貼上剪貼簿所選擇至目前的basket而不用另開新視窗"
 
-#: bnpview.cpp:248
+#: bnpview.cpp:291
 msgid "Create a new basket"
 msgstr "新建一個basket"
 
-#: bnpview.cpp:249
+#: bnpview.cpp:292
 msgid ""
 "Allows you to create a new basket without having to open the main window "
 "(you then can use the other global shortcuts to add a note, paste clipboard "
 "or paste selection in this new basket)."
 msgstr ""
 
-#: bnpview.cpp:252
+#: bnpview.cpp:295
 msgid "Go to previous basket"
 msgstr "切換至上一個basket"
 
-#: bnpview.cpp:253
+#: bnpview.cpp:296
 #, fuzzy
 msgid ""
 "Allows you to change current basket to the previous one without having to "
 "open the main window."
 msgstr "允許您切換目前的basket至上一個而不用另開新視窗。"
 
-#: bnpview.cpp:256
+#: bnpview.cpp:299
 msgid "Go to next basket"
 msgstr "切換至下一個basket"
 
-#: bnpview.cpp:257
+#: bnpview.cpp:300
 #, fuzzy
 msgid ""
 "Allows you to change current basket to the next one without having to open "
 "the main window."
 msgstr "允許您切換目前的basket至下一個而不用另開新視窗。"
 
-#: bnpview.cpp:264
+#: bnpview.cpp:307
 msgid "Insert text note"
 msgstr ""
 
-#: bnpview.cpp:265
+#: bnpview.cpp:308
 #, fuzzy
 msgid ""
 "Add a text note to the current basket without having to open the main window."
 msgstr "允許您建立一個新物件至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:268 settings.cpp:576
+#: bnpview.cpp:311 settings.cpp:579
 msgid "Insert image note"
 msgstr ""
 
-#: bnpview.cpp:269
+#: bnpview.cpp:312
 #, fuzzy
 msgid ""
 "Add an image note to the current basket without having to open the main "
 "window."
 msgstr "允許您建立一個新物件至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:272 settings.cpp:577
+#: bnpview.cpp:315 settings.cpp:580
 msgid "Insert link note"
 msgstr ""
 
-#: bnpview.cpp:273
+#: bnpview.cpp:316
 #, fuzzy
 msgid ""
 "Add a link note to the current basket without having to open the main window."
 msgstr "允許您建立一個新物件至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:276 settings.cpp:579
+#: bnpview.cpp:319 settings.cpp:582
 msgid "Insert color note"
 msgstr ""
 
-#: bnpview.cpp:277
+#: bnpview.cpp:320
 #, fuzzy
 msgid ""
 "Add a color note to the current basket without having to open the main "
 "window."
 msgstr "允許您建立一個新物件至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:280
+#: bnpview.cpp:323
 msgid "Pick color from screen"
 msgstr ""
 
-#: bnpview.cpp:281
+#: bnpview.cpp:324
 #, fuzzy
 msgid ""
 "Add a color note picked from one pixel on screen to the current basket "
 "without having to open the main window."
 msgstr "允許您建立一個新物件至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:285 settings.cpp:580
+#: bnpview.cpp:328 settings.cpp:583
 msgid "Grab screen zone"
 msgstr ""
 
-#: bnpview.cpp:286
+#: bnpview.cpp:329
 #, fuzzy
 msgid ""
 "Grab a screen zone as an image in the current basket without having to open "
 "the main window."
 msgstr "允許您建立一個新物件至目前的basket而不用另開新視窗。"
 
-#: bnpview.cpp:298
+#: bnpview.cpp:341
 #, fuzzy
 msgid "Baskets"
 msgstr "BasKet"
 
-#: bnpview.cpp:346
-msgid "Please write in English or French."
-msgstr ""
-
-#: bnpview.cpp:355
+#: bnpview.cpp:401
 msgid ""
 "<h2>Basket Tree</h2>Here is the list of your baskets. You can organize your "
 "data by putting them in different baskets. You can group baskets by subject "
@@ -850,324 +890,329 @@ msgid ""
 "clicking a basket to open it, or reorganize them using drag and drop."
 msgstr ""
 
-#: bnpview.cpp:366 bnpview.cpp:368
+#: bnpview.cpp:412 bnpview.cpp:414
 #, fuzzy
 msgid "&Basket Archive..."
 msgstr "新建basket"
 
-#: bnpview.cpp:371
+#: bnpview.cpp:417
 #, fuzzy
 msgid "&Hide Window"
 msgstr "隱藏主視窗(&H)"
 
-#: bnpview.cpp:375
+#: bnpview.cpp:421
 msgid "&HTML Web Page..."
 msgstr ""
 
-#: bnpview.cpp:377
+#: bnpview.cpp:423
 #, fuzzy
 msgid "K&Notes"
 msgstr "加入物件"
 
-#: bnpview.cpp:379
+#: bnpview.cpp:425
 msgid "K&Jots"
 msgstr ""
 
-#: bnpview.cpp:381
+#: bnpview.cpp:427
 msgid "&KnowIt..."
 msgstr ""
 
-#: bnpview.cpp:383
+#: bnpview.cpp:429
 msgid "Tux&Cards..."
 msgstr ""
 
-#: bnpview.cpp:385
+#: bnpview.cpp:431
 msgid "&Sticky Notes"
 msgstr ""
 
-#: bnpview.cpp:387
+#: bnpview.cpp:433
 #, fuzzy
 msgid "&Tomboy"
 msgstr "高"
 
-#: bnpview.cpp:389
+#: bnpview.cpp:435
 #, fuzzy
 msgid "Text &File..."
 msgstr "載入自檔案(&d)"
 
-#: bnpview.cpp:392
+#: bnpview.cpp:438
 msgid "&Backup && Restore..."
 msgstr ""
 
-#: bnpview.cpp:397
+#: bnpview.cpp:443
 msgid "D&elete"
 msgstr ""
 
-#: bnpview.cpp:403
+#: bnpview.cpp:449
 msgid "Selects all notes"
 msgstr ""
 
-#: bnpview.cpp:404
+#: bnpview.cpp:450
 msgid "U&nselect All"
 msgstr ""
 
-#: bnpview.cpp:406
+#: bnpview.cpp:452
 msgid "Unselects all selected notes"
 msgstr ""
 
-#: bnpview.cpp:407
+#: bnpview.cpp:453
 msgid "&Invert Selection"
 msgstr ""
 
-#: bnpview.cpp:410
+#: bnpview.cpp:456
 msgid "Inverts the current selection of notes"
 msgstr ""
 
-#: bnpview.cpp:412
+#: bnpview.cpp:458
 msgid ""
 "_: Verb; not Menu\n"
 "&Edit..."
 msgstr ""
 
-#: bnpview.cpp:417
+#: bnpview.cpp:463
 #, fuzzy
 msgid "&Open"
 msgstr "開啟(&O)%1"
 
-#: bnpview.cpp:420
+#: bnpview.cpp:466
 #, fuzzy
 msgid "Open &With..."
 msgstr "開啟自(&w),,,%1"
 
-#: bnpview.cpp:424
+#: bnpview.cpp:470
 #, fuzzy
 msgid "&Save to File..."
 msgstr "載入自檔案(&d)"
 
-#: bnpview.cpp:427
+#: bnpview.cpp:473
 msgid "&Group"
 msgstr ""
 
-#: bnpview.cpp:429
+#: bnpview.cpp:475
 msgid "U&ngroup"
 msgstr ""
 
-#: bnpview.cpp:432
+#: bnpview.cpp:478
 msgid "Move on &Top"
 msgstr ""
 
-#: bnpview.cpp:434
+#: bnpview.cpp:480
 msgid "Move &Up"
 msgstr ""
 
-#: bnpview.cpp:436
+#: bnpview.cpp:482
 msgid "Move &Down"
 msgstr ""
 
-#: bnpview.cpp:438
+#: bnpview.cpp:484
 #, fuzzy
 msgid "Move on &Bottom"
 msgstr "在底部"
 
-#: bnpview.cpp:454
+#: bnpview.cpp:500
 msgid "&Text"
 msgstr "文字(&T)"
 
-#: bnpview.cpp:455
+#: bnpview.cpp:501
 #, fuzzy
 msgid "&Link"
 msgstr "連結"
 
-#: bnpview.cpp:456
+#: bnpview.cpp:502
 #, fuzzy
 msgid "&Image"
 msgstr "影像"
 
-#: bnpview.cpp:457
+#: bnpview.cpp:503
 #, fuzzy
 msgid "&Color"
 msgstr "顏色"
 
-#: bnpview.cpp:458
+#: bnpview.cpp:504
 msgid "L&auncher"
 msgstr ""
 
-#: bnpview.cpp:460
+#: bnpview.cpp:506
 msgid "Import Launcher from &TDE Menu..."
 msgstr ""
 
-#: bnpview.cpp:461
+#: bnpview.cpp:507
 #, fuzzy
 msgid "Im&port Icon..."
 msgstr "匯入一個圖示(&p)"
 
-#: bnpview.cpp:462
+#: bnpview.cpp:508
 #, fuzzy
 msgid "Load From &File..."
 msgstr "載入自檔案(&d)"
 
-#: bnpview.cpp:485
+#: bnpview.cpp:531
 msgid "C&olor from Screen"
 msgstr ""
 
-#: bnpview.cpp:490
+#: bnpview.cpp:536
 msgid "Grab Screen &Zone"
 msgstr ""
 
-#: bnpview.cpp:520
+#: bnpview.cpp:566
 #, fuzzy
 msgid "&New Basket..."
 msgstr "新建basket"
 
-#: bnpview.cpp:522
+#: bnpview.cpp:568
 #, fuzzy
 msgid "New &Sub-Basket..."
 msgstr "新建basket"
 
-#: bnpview.cpp:524
+#: bnpview.cpp:570
 #, fuzzy
 msgid "New Si&bling Basket..."
 msgstr "新建basket"
 
-#: bnpview.cpp:527
+#: bnpview.cpp:573
 #, fuzzy
 msgid "&New"
 msgstr "新建basket(&N)..."
 
-#: bnpview.cpp:535
+#: bnpview.cpp:579
+#, fuzzy
+msgid "&Properties..."
+msgstr "Basket偏好設定"
+
+#: bnpview.cpp:581
 #, fuzzy
 msgid ""
 "_: Remove Basket\n"
 "&Remove"
 msgstr "新建basket"
 
-#: bnpview.cpp:538
+#: bnpview.cpp:584
 msgid ""
 "_: Password protection\n"
 "Pass&word..."
 msgstr ""
 
-#: bnpview.cpp:540
+#: bnpview.cpp:586
 #, fuzzy
 msgid ""
 "_: Lock Basket\n"
 "&Lock"
 msgstr "新建basket"
 
-#: bnpview.cpp:550
+#: bnpview.cpp:596
 msgid "&Filter"
 msgstr ""
 
-#: bnpview.cpp:554
+#: bnpview.cpp:600
 #, fuzzy
 msgid "Filter all &Baskets"
 msgstr "新建basket"
 
-#: bnpview.cpp:558
+#: bnpview.cpp:604
 msgid "&Reset Filter"
 msgstr ""
 
-#: bnpview.cpp:563
+#: bnpview.cpp:609
 #, fuzzy
 msgid "&Previous Basket"
 msgstr "切換至上一個basket"
 
-#: bnpview.cpp:565
+#: bnpview.cpp:611
 #, fuzzy
 msgid "&Next Basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:567
+#: bnpview.cpp:613
 #, fuzzy
 msgid "&Fold Basket"
 msgstr "BasKet"
 
-#: bnpview.cpp:569
+#: bnpview.cpp:615
 #, fuzzy
 msgid "&Expand Basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:579
+#: bnpview.cpp:625
 #, fuzzy
 msgid "Configure &Global Shortcuts..."
 msgstr "設定全域快捷鍵(&g)..."
 
-#: bnpview.cpp:583
+#: bnpview.cpp:629
 #, fuzzy
 msgid "&Welcome Baskets"
 msgstr "新建basket"
 
-#: bnpview.cpp:907
+#: bnpview.cpp:953
 msgid "Plain Text Notes Conversion"
 msgstr ""
 
-#: bnpview.cpp:908
+#: bnpview.cpp:954
 msgid "Converting plain text notes to rich text ones..."
 msgstr ""
 
-#: bnpview.cpp:1291
+#: bnpview.cpp:1345
 msgid "Locked"
 msgstr ""
 
-#: bnpview.cpp:1295
+#: bnpview.cpp:1349
 #, fuzzy
 msgid "No notes"
 msgstr "加入物件"
 
-#: bnpview.cpp:1297
+#: bnpview.cpp:1351
 #, c-format
 msgid ""
 "_n: %n note\n"
 "%n notes"
 msgstr ""
 
-#: bnpview.cpp:1298
+#: bnpview.cpp:1352
 #, c-format
 msgid ""
 "_n: %n selected\n"
 "%n selected"
 msgstr ""
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 msgid "all matches"
 msgstr ""
 
-#: bnpview.cpp:1299
+#: bnpview.cpp:1353
 #, fuzzy
 msgid "no filter"
 msgstr "加入物件"
 
-#: bnpview.cpp:1301
+#: bnpview.cpp:1355
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr ""
 
-#: bnpview.cpp:1303
+#: bnpview.cpp:1357
 msgid ""
 "_: e.g. '18 notes, 10 matches, 5 selected'\n"
 "%1, %2, %3"
 msgstr ""
 
-#: bnpview.cpp:1420
+#: bnpview.cpp:1474
 #, fuzzy
 msgid "Picked color to basket <i>%1</i>"
 msgstr "放置(%1)至basket <i>%2</i>"
 
-#: bnpview.cpp:1457
+#: bnpview.cpp:1511
 msgid "The plain text notes have been converted to rich text."
 msgstr ""
 
-#: bnpview.cpp:1457 bnpview.cpp:1459
+#: bnpview.cpp:1511 bnpview.cpp:1513
 msgid "Conversion Finished"
 msgstr ""
 
-#: bnpview.cpp:1459
+#: bnpview.cpp:1513
 msgid "There are no plain text notes to convert."
 msgstr ""
 
-#: bnpview.cpp:1484
+#: bnpview.cpp:1538
 msgid ""
 "<p><b>The file basketui.rc seems to not exist or is too old.<br>%1 cannot "
 "run without it and will stop.</b></p><p>Please check your installation of %2."
@@ -1178,97 +1223,97 @@ msgid ""
 "it, try to remove the file %5basketui.rc</p>"
 msgstr ""
 
-#: bnpview.cpp:1495
+#: bnpview.cpp:1549
 msgid "Ressource not Found"
 msgstr ""
 
-#: bnpview.cpp:1518 bnpview.cpp:1527
+#: bnpview.cpp:1572 bnpview.cpp:1581
 msgid "Cannot add note."
 msgstr ""
 
-#: bnpview.cpp:1589
+#: bnpview.cpp:1643
 #, fuzzy
 msgid "Grabbed screen zone to basket <i>%1</i>"
 msgstr "放置(%1)至basket <i>%2</i>"
 
-#: bnpview.cpp:1637
+#: bnpview.cpp:1691
 #, fuzzy
 msgid "Delete Basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:1640
+#: bnpview.cpp:1694
 #, fuzzy
 msgid "Delete Only that Basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:1641
+#: bnpview.cpp:1695
 msgid "Delete Note & Children"
 msgstr ""
 
-#: bnpview.cpp:1649 bnpview.cpp:1655
+#: bnpview.cpp:1703 bnpview.cpp:1709
 #, fuzzy
 msgid ""
 "<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>"
 msgstr "<qt>您真的確定要刪除<b>%1</b> ?</qt>"
 
-#: bnpview.cpp:1657
+#: bnpview.cpp:1711
 #, fuzzy
 msgid "Remove Basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:1659
+#: bnpview.cpp:1713
 #, fuzzy
 msgid "&Remove Basket"
 msgstr "新建basket"
 
-#: bnpview.cpp:1670
+#: bnpview.cpp:1724
 msgid ""
 "<qt><b>%1</b> have the following children baskets.<br>Do you want to remove "
 "them too?</qt>"
 msgstr ""
 
-#: bnpview.cpp:1673
+#: bnpview.cpp:1727
 #, fuzzy
 msgid "Remove Children Baskets"
 msgstr "新建basket"
 
-#: bnpview.cpp:1675
+#: bnpview.cpp:1729
 #, fuzzy
 msgid "&Remove Children Baskets"
 msgstr "新建basket"
 
-#: bnpview.cpp:1747 bnpview.cpp:1785
+#: bnpview.cpp:1801 bnpview.cpp:1839
 #, fuzzy
 msgid "Basket Archives"
 msgstr "Basket偏好設定"
 
-#: bnpview.cpp:1869
+#: bnpview.cpp:1923
 #, fuzzy
 msgid "Clipboard content pasted to basket <i>%1</i>"
 msgstr "自剪貼簿(%1)貼上至basket<i>%2</i>"
 
-#: bnpview.cpp:1877
+#: bnpview.cpp:1931
 #, fuzzy
 msgid "Selection pasted to basket <i>%1</i>"
 msgstr "所選擇的(%1)貼上至basket<i>%2</i>"
 
-#: bnpview.cpp:1889
+#: bnpview.cpp:1943
 msgid "No note was added."
 msgstr ""
 
-#: bnpview.cpp:1916
+#: bnpview.cpp:1970
 msgid "Basket <i>%1</i> is locked"
 msgstr ""
 
-#: bnpview.cpp:1941
+#: bnpview.cpp:1995
 msgid "(Locked)"
 msgstr ""
 
-#: bnpview.cpp:2259
+#: bnpview.cpp:2318
 msgid "&Assign new Tag..."
 msgstr ""
 
-#: bnpview.cpp:2260
+#: bnpview.cpp:2319
 #, fuzzy
 msgid "&Remove All"
 msgstr "新建basket"
@@ -1351,11 +1396,11 @@ msgstr "儲存目標"
 msgid "Filter all Baskets"
 msgstr "新建basket"
 
-#: filter.cpp:149
+#: filter.cpp:151
 msgid "(Not tagged)"
 msgstr ""
 
-#: filter.cpp:150
+#: filter.cpp:152
 #, fuzzy
 msgid "(Tagged)"
 msgstr "影像"
@@ -1440,36 +1485,36 @@ msgstr ""
 msgid "Other..."
 msgstr ""
 
-#: kgpgme.cpp:49
+#: kgpgme.cpp:51
 msgid "Private Key List"
 msgstr ""
 
-#: kgpgme.cpp:61
+#: kgpgme.cpp:63
 msgid "Email"
 msgstr ""
 
-#: kgpgme.cpp:62
+#: kgpgme.cpp:64
 msgid "ID"
 msgstr ""
 
-#: kgpgme.cpp:67
+#: kgpgme.cpp:69
 #, fuzzy
 msgid "Choose a secret key:"
 msgstr "新建一個basket"
 
-#: kgpgme.cpp:228
+#: kgpgme.cpp:230
 msgid "Key listing unexpectedly truncated."
 msgstr ""
 
-#: kgpgme.cpp:264
+#: kgpgme.cpp:266
 msgid "That public key is not meant for encryption"
 msgstr ""
 
-#: kgpgme.cpp:307
+#: kgpgme.cpp:309
 msgid "Unsupported algorithm"
 msgstr ""
 
-#: kgpgme.cpp:410
+#: kgpgme.cpp:412
 msgid "Wrong password."
 msgstr ""
 
@@ -1513,204 +1558,212 @@ msgstr "檔案名稱(&F):"
 msgid "File Types"
 msgstr ""
 
+#: kicondialog.cpp:140
+msgid "Miscellaneous"
+msgstr ""
+
 #: kicondialog.cpp:356
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr ""
 
-#: likeback.cpp:74
+#: kicondialog.cpp:359
+#, fuzzy
+msgid "Open"
+msgstr "開啟(&O)%1"
+
+#: likeback.cpp:75
 msgid "Send application developers a comment about something you like"
 msgstr ""
 
-#: likeback.cpp:81
+#: likeback.cpp:82
 msgid "Send application developers a comment about something you dislike"
 msgstr ""
 
-#: likeback.cpp:88
+#: likeback.cpp:89
 msgid ""
 "Send application developers a comment about an improper behavior of the "
 "application"
 msgstr ""
 
-#: likeback.cpp:95
+#: likeback.cpp:96
 msgid "Send application developers a comment about a new feature you desire"
 msgstr ""
 
-#: likeback.cpp:380
+#: likeback.cpp:381
 msgid "&Send a Comment to Developers"
 msgstr ""
 
-#: likeback.cpp:431
+#: likeback.cpp:432
 #, c-format
 msgid "Welcome to this testing version of %1."
 msgstr ""
 
-#: likeback.cpp:432
+#: likeback.cpp:433
 #, c-format
 msgid "Welcome to %1."
 msgstr ""
 
-#: likeback.cpp:434
+#: likeback.cpp:435
 msgid "To help us improve it, your comments are important."
 msgstr ""
 
-#: likeback.cpp:437
+#: likeback.cpp:438
 msgid ""
 "Each time you have a great or frustrating experience, please click the "
 "appropriate face below the window title-bar, briefly describe what you like "
 "or dislike and click Send."
 msgstr ""
 
-#: likeback.cpp:441
+#: likeback.cpp:442
 msgid ""
 "Each time you have a great experience, please click the smiling face below "
 "the window title-bar, briefly describe what you like and click Send."
 msgstr ""
 
-#: likeback.cpp:445
+#: likeback.cpp:446
 msgid ""
 "Each time you have a frustrating experience, please click the frowning face "
 "below the window title-bar, briefly describe what you dislike and click Send."
 msgstr ""
 
-#: likeback.cpp:454
+#: likeback.cpp:455
 msgid ""
 "Follow the same principle to quickly report a bug: just click the broken-"
 "object icon in the top-right corner of the window, describe it and click "
 "Send."
 msgstr ""
 
-#: likeback.cpp:457
+#: likeback.cpp:458
 msgid ""
 "Each time you discover a bug in the application, please click the broken-"
 "object icon below the window title-bar, briefly describe the mis-behaviour "
 "and click Send."
 msgstr ""
 
-#: likeback.cpp:462
+#: likeback.cpp:463
 msgid ""
 "_n: Example:\n"
 "Examples:"
 msgstr ""
 
-#: likeback.cpp:465
+#: likeback.cpp:466
 msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr ""
 
-#: likeback.cpp:469
+#: likeback.cpp:470
 msgid ""
 "<b>I dislike</b> the welcome page of that assistant. Too time consuming."
 msgstr ""
 
-#: likeback.cpp:473
+#: likeback.cpp:474
 msgid ""
 "<b>The application has an improper behaviour</b> when clicking the Add "
 "button. Nothing happens."
 msgstr ""
 
-#: likeback.cpp:477
+#: likeback.cpp:478
 msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 
-#: likeback.cpp:480
+#: likeback.cpp:481
 msgid "Help Improve the Application"
 msgstr ""
 
-#: likeback.cpp:557
+#: likeback.cpp:558
 msgid "Email Address"
 msgstr ""
 
-#: likeback.cpp:558
+#: likeback.cpp:559
 msgid "Please provide your email address."
 msgstr ""
 
-#: likeback.cpp:559
+#: likeback.cpp:560
 msgid ""
 "It will only be used to contact you back if more information is needed about "
 "your comments, ask you how to reproduce the bugs you report, send bug "
 "corrections for you to test, etc."
 msgstr ""
 
-#: likeback.cpp:560
+#: likeback.cpp:561
 msgid ""
 "The email address is optional. If you do not provide any, your comments will "
 "be sent anonymously."
 msgstr ""
 
-#: likeback.cpp:633
+#: likeback.cpp:634
 msgid "Send a Comment to Developers"
 msgstr ""
 
-#. i18n("Send Application Developers a Comment About:"), page);
-#: likeback.cpp:663
+#: likeback.cpp:664
 msgid "Send Application Developers a Comment About:"
 msgstr ""
 
-#: likeback.cpp:674
+#: likeback.cpp:675
 msgid "Something you &like"
 msgstr ""
 
-#: likeback.cpp:684
+#: likeback.cpp:685
 msgid "Something you &dislike"
 msgstr ""
 
-#: likeback.cpp:694
+#: likeback.cpp:695
 msgid "An improper &behavior of this application"
 msgstr ""
 
-#: likeback.cpp:704
+#: likeback.cpp:705
 msgid "A new &feature you desire"
 msgstr ""
 
-#: likeback.cpp:717
+#: likeback.cpp:718
 msgid "Show comment buttons below &window titlebars"
 msgstr ""
 
-#: likeback.cpp:722
+#: likeback.cpp:723
 msgid "&Send Comment"
 msgstr ""
 
-#: likeback.cpp:726
+#: likeback.cpp:727
 msgid "&Email Address..."
 msgstr ""
 
-#: likeback.cpp:743
+#: likeback.cpp:744
 #, c-format
 msgid "Please provide a brief description of your opinion of %1."
 msgstr ""
 
-#: likeback.cpp:756
+#: likeback.cpp:757
 msgid "Please write in English."
 msgstr ""
 
-#: likeback.cpp:762
+#: likeback.cpp:763
 msgid "You may be able to use an <a href=\"%1\">online translation tool</a>."
 msgstr ""
 
-#: likeback.cpp:768
+#: likeback.cpp:769
 msgid ""
 "To make the comments you send more useful in improving this application, try "
 "to send the same amount of positive and negative comments."
 msgstr ""
 
-#: likeback.cpp:771
+#: likeback.cpp:772
 msgid "Do <b>not</b> ask for new features: your requests will be ignored."
 msgstr ""
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "<p>Error while trying to send the report.</p><p>Please retry later.</p>"
 msgstr ""
 
-#: likeback.cpp:839
+#: likeback.cpp:840
 msgid "Transfer Error"
 msgstr ""
 
-#: likeback.cpp:843
+#: likeback.cpp:844
 msgid ""
 "<p>Your comment has been sent successfully. It will help improve the "
 "application.</p><p>Thanks for your time.</p>"
 msgstr ""
 
-#: likeback.cpp:844
+#: likeback.cpp:845
 msgid "Comment Sent"
 msgstr ""
 
@@ -1804,28 +1857,28 @@ msgstr ""
 msgid "Example"
 msgstr ""
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:139
 msgid "Minimize"
 msgstr ""
 
-#: mainwindow.cpp:301
+#: mainwindow.cpp:304
 #, fuzzy
 msgid "Basket"
 msgstr "BasKet"
 
-#: mainwindow.cpp:310
+#: mainwindow.cpp:313
 #, fuzzy
 msgid "<p>Do you really want to quit %1?</p>"
 msgstr "您真的確定要退出Basket?"
 
-#: mainwindow.cpp:312
+#: mainwindow.cpp:315
 msgid ""
 "<p>Notice that you do not have to quit the application before ending your "
 "TDE session. If you end your session while the application is still running, "
 "the application will be reloaded the next time you log in.</p>"
 msgstr ""
 
-#: mainwindow.cpp:315
+#: mainwindow.cpp:318
 #, fuzzy
 msgid "Quit Confirm"
 msgstr "確認退出"
@@ -1894,7 +1947,7 @@ msgstr ""
 msgid "Mind map"
 msgstr ""
 
-#: note.cpp:2818
+#: note.cpp:2830
 #, fuzzy
 msgid "(Image)"
 msgstr "影像"
@@ -1921,6 +1974,10 @@ msgstr "註解(&t):"
 msgid "Sound"
 msgstr ""
 
+#: notecontent.cpp:178 systemtray.cpp:83
+msgid "File"
+msgstr ""
+
 #: notecontent.cpp:179
 msgid "Link"
 msgstr "連結"
@@ -1929,7 +1986,7 @@ msgstr "連結"
 msgid "Launcher"
 msgstr ""
 
-#: notecontent.cpp:181 noteedit.cpp:817
+#: notecontent.cpp:181 noteedit.cpp:821
 msgid "Color"
 msgstr "顏色"
 
@@ -1980,423 +2037,453 @@ msgstr ""
 msgid "Edit this unknown object"
 msgstr "應用程式快捷列"
 
-#: notecontent.cpp:558
+#: notecontent.cpp:580
 #, fuzzy
 msgid "Opening plain text..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:559
+#: notecontent.cpp:581
 #, fuzzy
 msgid "Opening plain texts..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:560
+#: notecontent.cpp:582
 #, fuzzy
 msgid "Opening plain text with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:561
+#: notecontent.cpp:583
 #, fuzzy
 msgid "Opening plain texts with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:562
+#: notecontent.cpp:584
 #, fuzzy
 msgid "Open plain text with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:563
+#: notecontent.cpp:585
 #, fuzzy
 msgid "Open plain texts with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:649
+#: notecontent.cpp:688
 #, fuzzy
 msgid "Opening text..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:650
+#: notecontent.cpp:689
 #, fuzzy
 msgid "Opening texts..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:651
+#: notecontent.cpp:690
 #, fuzzy
 msgid "Opening text with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:652
+#: notecontent.cpp:691
 #, fuzzy
 msgid "Opening texts with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:653
+#: notecontent.cpp:692
 #, fuzzy
 msgid "Open text with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:654
+#: notecontent.cpp:693
 #, fuzzy
 msgid "Open texts with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:762 notecontent.cpp:973
+#: notecontent.cpp:806 notecontent.cpp:1024
 msgid "Size"
 msgstr ""
 
-#: notecontent.cpp:763 variouswidgets.cpp:147
+#: notecontent.cpp:807 variouswidgets.cpp:147
 msgid "%1 by %2 pixels"
 msgstr "%1 高 %2 像素"
 
-#: notecontent.cpp:769
+#: notecontent.cpp:813
 #, fuzzy
 msgid "Opening image..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:770
+#: notecontent.cpp:814
 #, fuzzy
 msgid "Opening images..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:771
+#: notecontent.cpp:815
 #, fuzzy
 msgid "Opening image with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:772
+#: notecontent.cpp:816
 #, fuzzy
 msgid "Opening images with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:773
+#: notecontent.cpp:817
 #, fuzzy
 msgid "Open image with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:774
+#: notecontent.cpp:818
 #, fuzzy
 msgid "Open images with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:798
+#: notecontent.cpp:842
 msgid "Click for full size view"
 msgstr ""
 
-#: notecontent.cpp:862
+#: notecontent.cpp:913
 #, fuzzy
 msgid "Opening animation..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:863
+#: notecontent.cpp:914
 #, fuzzy
 msgid "Opening animations..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:864
+#: notecontent.cpp:915
 #, fuzzy
 msgid "Opening animation with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:865
+#: notecontent.cpp:916
 #, fuzzy
 msgid "Opening animations with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:866
+#: notecontent.cpp:917
 msgid "Open animation with:"
 msgstr ""
 
-#: notecontent.cpp:867
+#: notecontent.cpp:918
 msgid "Open animations with:"
 msgstr ""
 
-#: notecontent.cpp:978
+#: notecontent.cpp:1029
 msgid "Type"
 msgstr ""
 
-#: notecontent.cpp:1016
+#: notecontent.cpp:1067
 #, fuzzy
 msgid "Open this file"
 msgstr "切換至下一個basket"
 
-#: notecontent.cpp:1035
+#: notecontent.cpp:1086
 #, fuzzy
 msgid "Opening file..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1036
+#: notecontent.cpp:1087
 #, fuzzy
 msgid "Opening files..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1037
+#: notecontent.cpp:1088
 #, fuzzy
 msgid "Opening file with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1038
+#: notecontent.cpp:1089
 #, fuzzy
 msgid "Opening files with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1039
+#: notecontent.cpp:1090
 #, fuzzy
 msgid "Open file with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1040
+#: notecontent.cpp:1091
 #, fuzzy
 msgid "Open files with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1111
+#: notecontent.cpp:1162
 #, fuzzy
 msgid "Open this sound"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1148
+#: notecontent.cpp:1199
 #, fuzzy
 msgid "Opening sound..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1149
+#: notecontent.cpp:1200
 #, fuzzy
 msgid "Opening sounds..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1150
+#: notecontent.cpp:1201
 #, fuzzy
 msgid "Opening sound with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1151
+#: notecontent.cpp:1202
 #, fuzzy
 msgid "Opening sounds with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1152
+#: notecontent.cpp:1203
 #, fuzzy
 msgid "Open sound with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1153
+#: notecontent.cpp:1204
 #, fuzzy
 msgid "Open sounds with:"
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1191
+#: notecontent.cpp:1242
 #, fuzzy
 msgid "Target"
 msgstr "儲存目標"
 
-#: notecontent.cpp:1214
+#: notecontent.cpp:1265
 #, fuzzy
 msgid "Open this link"
 msgstr "切換至下一個basket"
 
-#: notecontent.cpp:1240
+#: notecontent.cpp:1291
 msgid "Link have no URL to open."
 msgstr ""
 
-#: notecontent.cpp:1243
+#: notecontent.cpp:1294
 #, fuzzy
 msgid "Opening link target..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1244
+#: notecontent.cpp:1295
 #, fuzzy
 msgid "Opening link targets..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1245
+#: notecontent.cpp:1296
 #, fuzzy
 msgid "Opening link target with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1246
+#: notecontent.cpp:1297
 #, fuzzy
 msgid "Opening link targets with..."
 msgstr "開啟自(&w),,,%1"
 
-#: notecontent.cpp:1247
+#: notecontent.cpp:1298
 msgid "Open link target with:"
 msgstr ""
 
-#: notecontent.cpp:1248
+#: notecontent.cpp:1299
 msgid "Open link targets with:"
 msgstr ""
 
-#: notecontent.cpp:1379
+#: notecontent.cpp:1430
 msgid "%1 <i>(run in terminal)</i>"
 msgstr ""
 
-#: notecontent.cpp:1382
+#: notecontent.cpp:1433
 msgid "Comment"
 msgstr ""
 
-#: notecontent.cpp:1386
+#: notecontent.cpp:1437
 msgid "Command"
 msgstr ""
 
-#: notecontent.cpp:1409
+#: notecontent.cpp:1460
 msgid "Launch this application"
 msgstr ""
 
-#: notecontent.cpp:1430
+#: notecontent.cpp:1481
 msgid "The launcher have no command to run."
 msgstr ""
 
-#: notecontent.cpp:1433
+#: notecontent.cpp:1484
 msgid "Launching application..."
 msgstr ""
 
-#: notecontent.cpp:1434
+#: notecontent.cpp:1485
 msgid "Launching applications..."
 msgstr ""
 
-#: notecontent.cpp:1521
+#: notecontent.cpp:1572
 msgid ""
 "_: RGB Colorspace: Red/Green/Blue\n"
 "RGB"
 msgstr ""
 
-#: notecontent.cpp:1522
+#: notecontent.cpp:1573
 msgid "<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,"
 msgstr ""
 
-#: notecontent.cpp:1524
+#: notecontent.cpp:1575
 msgid ""
 "_: HSV Colorspace: Hue/Saturation/Value\n"
 "HSV"
 msgstr ""
 
-#: notecontent.cpp:1525
+#: notecontent.cpp:1576
 msgid "<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,"
 msgstr ""
 
-#: notecontent.cpp:1678
+#: notecontent.cpp:1729
 msgid "CSS Color Name"
 msgstr ""
 
-#: notecontent.cpp:1688
+#: notecontent.cpp:1739
 msgid "CSS Extended Color Name"
 msgstr ""
 
-#: notecontent.cpp:1694
+#: notecontent.cpp:1745
 msgid "Is Web Color"
 msgstr ""
 
-#: noteedit.cpp:381
+#: notecontent.cpp:1746
+msgid "Yes"
+msgstr ""
+
+#: notecontent.cpp:1746
+msgid "No"
+msgstr ""
+
+#: noteedit.cpp:385
 msgid ""
 "Images can not be edited here at the moment (the next version of BasKet Note "
 "Pads will include an image editor).\n"
 "Do you want to open it with an application that understand it?"
 msgstr ""
 
-#: noteedit.cpp:383
+#: noteedit.cpp:387
 #, fuzzy
 msgid "Edit Image Note"
 msgstr "編輯物件及偏好設定"
 
-#: noteedit.cpp:397
+#: noteedit.cpp:401
 msgid ""
 "This animated image can not be edited here.\n"
 "Do you want to open it with an application that understands it?"
 msgstr ""
 
-#: noteedit.cpp:399
+#: noteedit.cpp:403
 #, fuzzy
 msgid "Edit Animation Note"
 msgstr "註解(&t):"
 
-#: noteedit.cpp:476
+#: noteedit.cpp:480
 msgid "Edit Color Note"
 msgstr ""
 
-#: noteedit.cpp:499
+#: noteedit.cpp:503
 msgid ""
 "The type of this note is unknown and can not be edited here.\n"
 "You however can drag or copy the note into an application that understands "
 "it."
 msgstr ""
 
-#: noteedit.cpp:501
+#: noteedit.cpp:505
 #, fuzzy
 msgid "Edit Unknown Note"
 msgstr "註解(&t):"
 
-#: noteedit.cpp:530
+#: noteedit.cpp:534
 #, fuzzy
 msgid "Edit Link Note"
 msgstr "註解(&t):"
 
-#: noteedit.cpp:542 noteedit.cpp:555
+#: noteedit.cpp:546 noteedit.cpp:559
 msgid "Auto"
 msgstr "自動"
 
-#: noteedit.cpp:551 noteedit.cpp:704
+#: noteedit.cpp:555 noteedit.cpp:708
 #, fuzzy
 msgid "&Icon:"
 msgstr "圖示(&I):"
 
-#: noteedit.cpp:575
+#: noteedit.cpp:579
 #, fuzzy
 msgid "Ta&rget:"
 msgstr "儲存目標"
 
-#: noteedit.cpp:576
+#: noteedit.cpp:580
 #, fuzzy
 msgid "&Title:"
 msgstr "標題(&T):"
 
-#: noteedit.cpp:689
+#: noteedit.cpp:693
 #, fuzzy
 msgid "Edit Launcher Note"
 msgstr "應用程式快捷列"
 
-#: noteedit.cpp:698
+#: noteedit.cpp:702
 msgid "Choose a command to run:"
 msgstr ""
 
-#: noteedit.cpp:707
+#: noteedit.cpp:711
 msgid "&Guess"
 msgstr ""
 
-#: noteedit.cpp:723
+#: noteedit.cpp:727
 msgid "Comman&d:"
 msgstr ""
 
-#: noteedit.cpp:724 tagsedit.cpp:379
+#: noteedit.cpp:728 tagsedit.cpp:379
 #, fuzzy
 msgid "&Name:"
 msgstr "名稱(&N):"
 
-#: noteedit.cpp:819 tagsedit.cpp:437
+#: noteedit.cpp:810
+#, fuzzy
+msgid "Font"
+msgstr "圖示(&I):"
+
+#: noteedit.cpp:815
+msgid "Font Size"
+msgstr ""
+
+#: noteedit.cpp:823 tagsedit.cpp:437
 msgid "Bold"
 msgstr "粗體"
 
-#: noteedit.cpp:821 tagsedit.cpp:443
+#: noteedit.cpp:824 tagsedit.cpp:449
+#, fuzzy
+msgid "Italic"
+msgstr "斜體(&I)"
+
+#: noteedit.cpp:825 tagsedit.cpp:443
 msgid "Underline"
 msgstr "下劃線"
 
-#: noteedit.cpp:826
+#: noteedit.cpp:830
 msgid "Align Left"
 msgstr ""
 
-#: noteedit.cpp:827
+#: noteedit.cpp:831
 msgid "Centered"
 msgstr "置中"
 
-#: noteedit.cpp:828
+#: noteedit.cpp:832
 #, fuzzy
 msgid "Align Right"
 msgstr "靠右"
 
-#: noteedit.cpp:829
+#: noteedit.cpp:833
 #, fuzzy
 msgid "Justified"
 msgstr "兩端對齊"
 
+#: noteedit.cpp:840
+msgid "Undo"
+msgstr ""
+
+#: noteedit.cpp:841
+msgid "Redo"
+msgstr ""
+
 #: notefactory.cpp:445
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
@@ -2438,8 +2525,7 @@ msgstr ""
 msgid "Load File Content into a Note"
 msgstr ""
 
-#. i18n: file passwordlayout.ui line 16
-#: password.cpp:36 rc.cpp:105 settings.cpp:593
+#: password.cpp:36 passwordlayout.ui:16 settings.cpp:596
 #, no-c-format
 msgid "Password Protection"
 msgstr ""
@@ -2448,140 +2534,44 @@ msgstr ""
 msgid "No private key selected."
 msgstr ""
 
-#. i18n: file basket_part.rc line 5
-#: rc.cpp:3 rc.cpp:48
-#, fuzzy, no-c-format
-msgid "&Basket"
-msgstr "BasKet"
-
-#. i18n: file basket_part.rc line 10
-#: rc.cpp:6 rc.cpp:39 rc.cpp:51 rc.cpp:84
-#, no-c-format
-msgid "&Export"
-msgstr ""
-
-#. i18n: file basket_part.rc line 20
-#: rc.cpp:9 rc.cpp:42 rc.cpp:45 rc.cpp:54 rc.cpp:87 rc.cpp:90
-#, no-c-format
-msgid "&Import"
-msgstr ""
-
-#. i18n: file basket_part.rc line 51
-#: rc.cpp:15 rc.cpp:60
-#, no-c-format
-msgid "&Go"
-msgstr ""
-
-#. i18n: file basket_part.rc line 58
-#: rc.cpp:18 rc.cpp:63
-#, fuzzy, no-c-format
-msgid "&Note"
-msgstr "加入物件"
-
-#. i18n: file basket_part.rc line 73
-#: rc.cpp:21 rc.cpp:66
-#, fuzzy, no-c-format
-msgid "&Tags"
-msgstr "儲存目標"
-
-#. i18n: file basket_part.rc line 127
-#: rc.cpp:36 rc.cpp:81
-#, no-c-format
-msgid "Text Formating Toolbar"
-msgstr ""
-
-#. i18n: file kicondialogui.ui line 31
-#: rc.cpp:93
-#, no-c-format
-msgid "TDEIconDialogUI"
-msgstr ""
-
-#. i18n: file kicondialogui.ui line 105
-#: rc.cpp:96
-#, fuzzy, no-c-format
-msgid "Fi&lter:"
-msgstr "檔案名稱(&F):"
-
-#. i18n: file kicondialogui.ui line 160
-#: rc.cpp:102
-#, no-c-format
-msgid "Alt+O"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 44
-#: rc.cpp:109
-#, no-c-format
-msgid "&No protection"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 47
-#: rc.cpp:112
-#, no-c-format
-msgid "Alt+N"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 55
-#: rc.cpp:115
-#, no-c-format
-msgid "Protect basket with a &password"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 58
-#: rc.cpp:118
-#, no-c-format
-msgid "Alt+P"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 82
-#: rc.cpp:121
-#, no-c-format
-msgid "Protect basket with private &key:"
-msgstr ""
-
-#. i18n: file passwordlayout.ui line 85
-#: rc.cpp:124
-#, no-c-format
-msgid "Alt+K"
-msgstr ""
-
-#: settings.cpp:367
+#: settings.cpp:370
 #, fuzzy
 msgid "On left"
 msgstr "在頂端"
 
-#: settings.cpp:368
+#: settings.cpp:371
 msgid "On right"
 msgstr ""
 
-#: settings.cpp:369
+#: settings.cpp:372
 #, fuzzy
 msgid "&Basket tree position:"
 msgstr "於滑鼠指標位置放置物件(&D)"
 
-#: settings.cpp:376 settings.cpp:691
+#: settings.cpp:379 settings.cpp:694
 #, fuzzy
 msgid "On top"
 msgstr "在頂端"
 
-#: settings.cpp:377 settings.cpp:692
+#: settings.cpp:380 settings.cpp:695
 #, fuzzy
 msgid "On bottom"
 msgstr "在底部"
 
-#: settings.cpp:378
+#: settings.cpp:381
 #, fuzzy
 msgid "&Filter bar position:"
 msgstr "於滑鼠指標位置放置物件(&D)"
 
-#: settings.cpp:385
+#: settings.cpp:388
 msgid "&Use balloons to report results of global actions"
 msgstr ""
 
-#: settings.cpp:388
+#: settings.cpp:391
 msgid "What are global actions?"
 msgstr ""
 
-#: settings.cpp:389
+#: settings.cpp:392
 msgid ""
 "You can configure global shortcuts to do some actions without having to show "
 "the main window. For instance, you can paste the clipboard content, take a "
@@ -2590,117 +2580,117 @@ msgid ""
 "middle mouse button on that icon to paste the current selection."
 msgstr ""
 
-#: settings.cpp:392
+#: settings.cpp:395
 msgid ""
 "When doing so, %1 pops up a little balloon message to inform you the action "
 "has been successfully done. You can disable that balloon."
 msgstr ""
 
-#: settings.cpp:393
+#: settings.cpp:396
 msgid ""
 "Note that those messages are smart enough to not appear if the main window "
 "is visible. This is because you already see the result of your actions in "
 "the main window."
 msgstr ""
 
-#: settings.cpp:402
+#: settings.cpp:405
 #, fuzzy
 msgid "System Tray Icon"
 msgstr "系統列圖示"
 
-#: settings.cpp:407
+#: settings.cpp:410
 #, fuzzy
 msgid "&Dock in system tray"
 msgstr "置於系統列"
 
-#: settings.cpp:416
+#: settings.cpp:419
 msgid "&Show current basket icon in system tray icon"
 msgstr ""
 
-#: settings.cpp:426
+#: settings.cpp:429
 #, fuzzy
 msgid "&Hide main window when mouse leaves it for"
 msgstr "按下關閉鈕時隱藏主視窗(而非退出程式)(&H)"
 
-#: settings.cpp:428 settings.cpp:439
+#: settings.cpp:431 settings.cpp:442
 msgid " tenths of seconds"
 msgstr "/10 秒鐘後"
 
-#: settings.cpp:437
+#: settings.cpp:440
 #, fuzzy
 msgid "Show &main window when mouse hovers over the system tray icon for"
 msgstr "按下關閉鈕時隱藏主視窗(而非退出程式)(&H)"
 
-#: settings.cpp:511
+#: settings.cpp:514
 #, fuzzy
 msgid "Ani&mate changes in baskets"
 msgstr "新建一個basket"
 
-#: settings.cpp:514
+#: settings.cpp:517
 #, fuzzy
 msgid "&Show tooltips in baskets"
 msgstr "即刻顯示工具提示(包括了物件註釋...)(&i)"
 
-#: settings.cpp:517
+#: settings.cpp:520
 #, fuzzy
 msgid "&Big notes"
 msgstr "加入物件"
 
-#: settings.cpp:522
+#: settings.cpp:525
 msgid "Behavior"
 msgstr ""
 
-#: settings.cpp:525
+#: settings.cpp:528
 msgid "&Transform lines starting with * or - to lists in text editors"
 msgstr ""
 
-#: settings.cpp:528
+#: settings.cpp:531
 msgid "Ask confirmation before &deleting notes"
 msgstr ""
 
-#: settings.cpp:533
+#: settings.cpp:536
 #, fuzzy
 msgid "&Export tags in texts"
 msgstr "應用程式快捷列"
 
-#: settings.cpp:539 tagsedit.cpp:485
+#: settings.cpp:542 tagsedit.cpp:485
 msgid "When does this apply?"
 msgstr ""
 
-#: settings.cpp:540 tagsedit.cpp:486
+#: settings.cpp:543 tagsedit.cpp:486
 msgid ""
 "It does apply when you copy and paste, or drag and drop notes to a text "
 "editor."
 msgstr ""
 
-#: settings.cpp:541
+#: settings.cpp:544
 msgid ""
 "If enabled, this property lets you paste the tags as textual equivalents."
 msgstr ""
 
-#: settings.cpp:542 tagsedit.cpp:488
+#: settings.cpp:545 tagsedit.cpp:488
 msgid ""
 "For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are "
 "exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, representing an "
 "empty checkbox and a checked box."
 msgstr ""
 
-#: settings.cpp:552
+#: settings.cpp:555
 msgid "&Group a new note when clicking on the right of the insertion line"
 msgstr ""
 
-#: settings.cpp:556
+#: settings.cpp:559
 msgid "How to group a new note?"
 msgstr ""
 
-#: settings.cpp:557
+#: settings.cpp:560
 msgid ""
 "<p>When this option is enabled, the insertion-line not only allows you to "
 "insert notes at the cursor position, but also allows you to group a new note "
 "with the one under the cursor:</p>"
 msgstr ""
 
-#: settings.cpp:559
+#: settings.cpp:562
 msgid ""
 "<p>Place your mouse between notes, where you want to add a new one.<br>Click "
 "on the <b>left</b> of the insertion-line middle-mark to <b>insert</b> a note."
@@ -2708,219 +2698,219 @@ msgid ""
 "or above</b>, depending on where your mouse is.</p>"
 msgstr ""
 
-#: settings.cpp:574
+#: settings.cpp:577
 msgid "Do nothing"
 msgstr ""
 
-#: settings.cpp:575
+#: settings.cpp:578
 #, fuzzy
 msgid "Paste clipboard"
 msgstr "複製至剪貼簿"
 
-#: settings.cpp:578
+#: settings.cpp:581
 msgid "Insert launcher note"
 msgstr ""
 
-#: settings.cpp:581
+#: settings.cpp:584
 msgid "Insert color from screen"
 msgstr ""
 
-#: settings.cpp:582
+#: settings.cpp:585
 #, fuzzy
 msgid "Load note from file"
 msgstr "載入自檔案(&d)"
 
-#: settings.cpp:583
+#: settings.cpp:586
 msgid "Import Launcher from TDE Menu"
 msgstr ""
 
-#: settings.cpp:584
+#: settings.cpp:587
 #, fuzzy
 msgid "Import icon"
 msgstr "匯入一個圖示(&p)"
 
-#: settings.cpp:585
+#: settings.cpp:588
 msgid "&Shift+middle-click anywhere:"
 msgstr ""
 
-#: settings.cpp:588
+#: settings.cpp:591
 #, fuzzy
 msgid "at cursor position"
 msgstr "於滑鼠指標位置放置物件(&D)"
 
-#: settings.cpp:599
+#: settings.cpp:602
 msgid "A&utomatically lock protected baskets when closed for"
 msgstr ""
 
-#: settings.cpp:603
+#: settings.cpp:606
 #, fuzzy
 msgid " minutes"
 msgstr "加入物件"
 
-#: settings.cpp:614
+#: settings.cpp:617
 msgid "Use GnuPG agent for &private/public key protected baskets"
 msgstr ""
 
-#: settings.cpp:690
+#: settings.cpp:693
 msgid "&Place of new notes:"
 msgstr ""
 
-#: settings.cpp:693
+#: settings.cpp:696
 msgid "At current note"
 msgstr ""
 
-#: settings.cpp:710
+#: settings.cpp:713
 msgid "&New images size:"
 msgstr ""
 
-#: settings.cpp:718
+#: settings.cpp:721
 #, fuzzy
 msgid "&by"
 msgstr "高"
 
-#: settings.cpp:721
+#: settings.cpp:724
 msgid "pixels"
 msgstr "像素"
 
-#: settings.cpp:723
+#: settings.cpp:726
 msgid "&Visualize..."
 msgstr "預覽(&V)"
 
-#: settings.cpp:731
+#: settings.cpp:734
 msgid "View Content of Added Files for the Following Types"
 msgstr ""
 
-#: settings.cpp:732
+#: settings.cpp:735
 #, fuzzy
 msgid "&Plain text"
 msgstr "豐富文字(HTML)"
 
-#: settings.cpp:733
+#: settings.cpp:736
 msgid "&HTML page"
 msgstr ""
 
-#: settings.cpp:734
+#: settings.cpp:737
 msgid "&Image or animation"
 msgstr ""
 
-#: settings.cpp:735
+#: settings.cpp:738
 msgid "&Sound"
 msgstr ""
 
-#: settings.cpp:794
+#: settings.cpp:797
 msgid "Conference audio record"
 msgstr ""
 
-#: settings.cpp:795
+#: settings.cpp:798
 msgid "Annual report"
 msgstr ""
 
-#: settings.cpp:796
+#: settings.cpp:799
 msgid "Home folder"
 msgstr ""
 
-#: settings.cpp:798
+#: settings.cpp:801
 #, fuzzy, c-format
 msgid "Launch %1"
 msgstr "BasKet"
 
-#: settings.cpp:799
+#: settings.cpp:802
 msgid "&Sounds"
 msgstr ""
 
-#: settings.cpp:800
+#: settings.cpp:803
 msgid "&Files"
 msgstr ""
 
-#: settings.cpp:801
+#: settings.cpp:804
 msgid "&Local Links"
 msgstr ""
 
-#: settings.cpp:802
+#: settings.cpp:805
 #, fuzzy
 msgid "&Network Links"
 msgstr "尋找網路上的連結(&n)"
 
-#: settings.cpp:803
+#: settings.cpp:806
 msgid "Launc&hers"
 msgstr ""
 
-#: settings.cpp:840
+#: settings.cpp:843
 msgid "Open &text notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:841
+#: settings.cpp:844
 #, fuzzy
 msgid "Open text notes with:"
 msgstr "開啟自(&w),,,%1"
 
-#: settings.cpp:848
+#: settings.cpp:851
 msgid "Open &image notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:849
+#: settings.cpp:852
 #, fuzzy
 msgid "Open image notes with:"
 msgstr "開啟自(&w),,,%1"
 
-#: settings.cpp:856
+#: settings.cpp:859
 msgid "Open a&nimation notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:857
+#: settings.cpp:860
 #, fuzzy
 msgid "Open animation notes with:"
 msgstr "開啟自(&w),,,%1"
 
-#: settings.cpp:864
+#: settings.cpp:867
 msgid "Open so&und notes with a custom application:"
 msgstr ""
 
-#: settings.cpp:865
+#: settings.cpp:868
 #, fuzzy
 msgid "Open sound notes with:"
 msgstr "開啟自(&w),,,%1"
 
-#: settings.cpp:873
+#: settings.cpp:876
 msgid ""
 "<p>If checked, the application defined below will be used when opening that "
 "type of note.</p><p>Otherwise, the application you've configured in "
 "Konqueror will be used.</p>"
 msgstr ""
 
-#: settings.cpp:882
+#: settings.cpp:885
 msgid ""
 "<p>Define the application to use for opening that type of note instead of "
 "the application configured in Konqueror.</p>"
 msgstr ""
 
-#: settings.cpp:903
+#: settings.cpp:906
 msgid "How to change the application used to open Web links?"
 msgstr ""
 
-#: settings.cpp:904
+#: settings.cpp:907
 msgid ""
 "<p>When opening Web links, they are opened in different applications, "
 "depending on the content of the link (a Web page, an image, a PDF "
 "document...), such as if they were files on your computer.</p><p>Here is how "
 "to do if you want every Web addresses to be opened in your Web browser. It "
 "is useful if you are not using TDE (if you are using eg. GNOME, XFCE...).</"
-"p><ul><li>Open the Trinity Control Center (if it is not available, try to type "
-"\"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE Components"
-"\" and then \"Components Selector\" section;</li><li>Choose \"Web Browser\", "
-"check \"In the following browser:\" and enter the name of your Web browser "
-"(like \"firefox\" or \"epiphany\").</li></ul><p>Now, when you click <i>any</"
-"i> link that start with \"http://...\", it will be opened in your Web "
-"browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more fine-grained "
-"configuration (like opening only Web pages in your Web browser), read the "
-"second help link.</p>"
-msgstr ""
-
-#: settings.cpp:922
+"p><ul><li>Open the Trinity Control Center (if it is not available, try to "
+"type \"kcontrol\" in a command line terminal);</li><li>Go to the \"TDE "
+"Components\" and then \"Components ChooserSelector\" section;</li><li>Choose "
+"\"Web Browser\", check \"In the following browser:\" and enter the name of "
+"your Web browser (like \"firefox\" or \"epiphany\").</li></ul><p>Now, when "
+"you click <i>any</i> link that start with \"http://...\", it will be opened "
+"in your Web browser (eg. Mozilla Firefox or Epiphany or...).</p><p>For more "
+"fine-grained configuration (like opening only Web pages in your Web "
+"browser), read the second help link.</p>"
+msgstr ""
+
+#: settings.cpp:925
 msgid "How to change the applications used to open files and links?"
 msgstr ""
 
-#: settings.cpp:923
+#: settings.cpp:926
 msgid ""
 "<p>Here is how to set the application to be used for each type of file. This "
 "also applies to Web links if you choose not to open them systematically in a "
@@ -2929,12 +2919,12 @@ msgid ""
 "another environment than TDE.</p><p>This is an example of how to open HTML "
 "pages in your Web browser (and keep using the other applications for other "
 "addresses or files). Repeat these steps for each type of file you want to "
-"open in a specific application.</p><ul><li>Open the Trinity Control Center (if "
-"it is not available, try to type \"kcontrol\" in a command line terminal);</"
-"li><li>Go to the \"TDE Components\" and then \"File Associations\" section;</"
-"li><li>In the tree, expand \"text\" and click \"html\";</li><li>In the "
-"applications list, add your Web browser as the first entry;</li><li>Do the "
-"same for the type \"application -> xhtml+xml\".</li></ul>"
+"open in a specific application.</p><ul><li>Open the Trinity Control Center "
+"(if it is not available, try to type \"kcontrol\" in a command line "
+"terminal);</li><li>Go to the \"TDE Components\" and then \"File Associations"
+"\" section;</li><li>In the tree, expand \"text\" and click \"html\";</"
+"li><li>In the applications list, add your Web browser as the first entry;</"
+"li><li>Do the same for the type \"application -> xhtml+xml\".</li></ul>"
 msgstr ""
 
 #: softwareimporters.cpp:45
@@ -3159,6 +3149,11 @@ msgstr ""
 msgid "Very Important"
 msgstr ""
 
+#: tag.cpp:667
+#, fuzzy
+msgid "Information"
+msgstr "註解(&t):"
+
 #: tag.cpp:668
 msgid "Idea"
 msgstr ""
@@ -3229,6 +3224,11 @@ msgstr ""
 msgid "Move Down (Ctrl+Shift+Down)"
 msgstr ""
 
+#: tagsedit.cpp:352
+#, fuzzy
+msgid "Delete"
+msgstr "新建basket"
+
 #: tagsedit.cpp:375
 #, fuzzy
 msgid "Tag"
@@ -3402,6 +3402,112 @@ msgid ""
 "and close it or press Escape to accept changes."
 msgstr ""
 
+#: basket_part.rc:5 basketui.rc:5
+#, fuzzy, no-c-format
+msgid "&Basket"
+msgstr "BasKet"
+
+#: basket_part.rc:10 basket_part.rc:157 basketui.rc:10 basketui.rc:161
+#, no-c-format
+msgid "&Export"
+msgstr ""
+
+#: basket_part.rc:20 basket_part.rc:167 basket_part.rc:185 basketui.rc:20
+#: basketui.rc:171 basketui.rc:189
+#, no-c-format
+msgid "&Import"
+msgstr ""
+
+#: basket_part.rc:51 basketui.rc:54
+#, no-c-format
+msgid "&Go"
+msgstr ""
+
+#: basket_part.rc:58 basketui.rc:61
+#, fuzzy, no-c-format
+msgid "&Note"
+msgstr "加入物件"
+
+#: basket_part.rc:73 basketui.rc:76
+#, fuzzy, no-c-format
+msgid "&Tags"
+msgstr "儲存目標"
+
+#: basket_part.rc:76 basketui.rc:79
+#, no-c-format
+msgid "&Insert"
+msgstr ""
+
+#: basket_part.rc:91 basketui.rc:94
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: basket_part.rc:102 basketui.rc:105
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: basket_part.rc:117 basketui.rc:120
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: basket_part.rc:128 basketui.rc:132
+#, no-c-format
+msgid "Text Formating Toolbar"
+msgstr ""
+
+#: kicondialogui.ui:31
+#, no-c-format
+msgid "TDEIconDialogUI"
+msgstr ""
+
+#: kicondialogui.ui:105
+#, fuzzy, no-c-format
+msgid "Fi&lter:"
+msgstr "檔案名稱(&F):"
+
+#: kicondialogui.ui:157
+#, fuzzy, no-c-format
+msgid "&Open..."
+msgstr "開啟(&O)%1"
+
+#: kicondialogui.ui:160
+#, no-c-format
+msgid "Alt+O"
+msgstr ""
+
+#: passwordlayout.ui:44
+#, no-c-format
+msgid "&No protection"
+msgstr ""
+
+#: passwordlayout.ui:47
+#, no-c-format
+msgid "Alt+N"
+msgstr ""
+
+#: passwordlayout.ui:55
+#, no-c-format
+msgid "Protect basket with a &password"
+msgstr ""
+
+#: passwordlayout.ui:58
+#, no-c-format
+msgid "Alt+P"
+msgstr ""
+
+#: passwordlayout.ui:82
+#, no-c-format
+msgid "Protect basket with private &key:"
+msgstr ""
+
+#: passwordlayout.ui:85
+#, no-c-format
+msgid "Alt+K"
+msgstr ""
+
 #, fuzzy
 #~ msgid "I dislike..."
 #~ msgstr "預覽(&V)"
@@ -3411,10 +3517,6 @@ msgstr ""
 #~ msgstr "預覽(&V)"
 
 #, fuzzy
-#~ msgid "Remo&ve"
-#~ msgstr "新建basket"
-
-#, fuzzy
 #~ msgid ""
 #~ "Add a rich text note to the current basket without having to open main "
 #~ "window."
@@ -3452,13 +3554,6 @@ msgstr ""
 #~ msgid "Open rich text notes with:"
 #~ msgstr "開啟自(&w),,,%1"
 
-#~ msgid "Show the debug window"
-#~ msgstr "顯示除錯視窗"
-
-#, fuzzy
-#~ msgid "Hide the main window in the system tray icon on startup"
-#~ msgstr "按下關閉鈕時隱藏主視窗(而非退出程式)(&H)"
-
 #, fuzzy
 #~ msgid "C&hange..."
 #~ msgstr "瀏覽(&B)..."
@@ -3695,10 +3790,6 @@ msgstr ""
 #~ msgstr "新建basket..."
 
 #, fuzzy
-#~ msgid "A&ppearance:"
-#~ msgstr "註解(&p):"
-
-#, fuzzy
 #~ msgid "Icon name: %1"
 #~ msgstr "圖示(&I):"