Automated l10n update (.po files)

author: Automated System <kb9vqf@pearsoncomputing.net> 2014-09-29 12:26:02 -0500
committer: Automated System <kb9vqf@pearsoncomputing.net> 2014-09-29 12:26:02 -0500
commit: ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c (patch)
tree: bf4fc5ad5f5d27517ae17ce5d396e492aafde6eb /tde-i18n-is/messages/tdesdk
parent: dde6a6f118e2358c2aace236dd18d5bca405381c (diff)
download: tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.tar.gz
tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.zip
16 files changed, 6900 insertions, 6900 deletions
diff --git a/tde-i18n-is/messages/tdesdk/cervisia.po b/tde-i18n-is/messages/tdesdk/cervisia.po
index 4fd77aea8ca..f9346fcca1b 100644
--- a/tde-i18n-is/messages/tdesdk/cervisia.po
+++ b/tde-i18n-is/messages/tdesdk/cervisia.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cervisa\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/cvsservice.po b/tde-i18n-is/messages/tdesdk/cvsservice.po
index 1837d47b09c..edabd8e59e7 100644
--- a/tde-i18n-is/messages/tdesdk/cvsservice.po
+++ b/tde-i18n-is/messages/tdesdk/cvsservice.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cvsservice\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-27 20:26+0000\n"
 "Last-Translator: Stígur Snæsson <stigur@vortex.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/kbabel.po b/tde-i18n-is/messages/tdesdk/kbabel.po
index 337983877ba..80c811baf69 100644
--- a/tde-i18n-is/messages/tdesdk/kbabel.po
+++ b/tde-i18n-is/messages/tdesdk/kbabel.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbabel\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2007-05-02 15:53+0200\n"
 "Last-Translator: Arnar Leósson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -17,6 +17,288 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: commonui/projectpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Identity"
+msgstr "Auðkenni"
+
+#: commonui/projectpref.cpp:72
+msgid "Information About You and Translation Team"
+msgstr "Upplýsingar um þig og þýðingarhópinn"
+
+#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
+msgid ""
+"_: title of page in preferences dialog\n"
+"Save"
+msgstr "Vistun"
+
+#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
+msgid "Options for File Saving"
+msgstr "Valkostir fyrir vistun"
+
+#: commonui/projectpref.cpp:82
+msgid ""
+"_: title of page in preferences dialog\n"
+"Spelling"
+msgstr "Leiðréttingar"
+
+#: commonui/projectpref.cpp:84
+msgid "Options for Spell Checking"
+msgstr "Valkostir á stafsetningarleiðréttingum"
+
+#: commonui/projectpref.cpp:89
+msgid ""
+"_: title of page in preferences dialog\n"
+"Source"
+msgstr "Kóði"
+
+#: commonui/projectpref.cpp:91
+msgid "Options for Showing Source Context"
+msgstr "Möguleikar við sýningu á kóða samhengi"
+
+#: commonui/projectpref.cpp:96
+msgid ""
+"_: title of page in preferences dialog\n"
+"Miscellaneous"
+msgstr "Ýmislegt"
+
+#: commonui/projectpref.cpp:98
+msgid "Miscellaneous Settings"
+msgstr "Ýmsar stillingar"
+
+#: commonui/projectpref.cpp:101
+msgid ""
+"_: title of page in preferences dialog\n"
+"Folders"
+msgstr "Möppur"
+
+#: commonui/projectpref.cpp:103
+msgid "Paths to Message Catalogs & Catalog Templates"
+msgstr "Slóð að skilaboðamöppum & sniðskrám"
+
+#: commonui/projectpref.cpp:106
+msgid ""
+"_: title of page in preferences dialog\n"
+"Folder Commands"
+msgstr "Möppuskipanir"
+
+#: commonui/projectpref.cpp:108
+msgid "User-Defined Commands for Folder Items"
+msgstr "Notandaskilgreindar möppuskipanir"
+
+#: commonui/projectpref.cpp:113
+msgid ""
+"_: title of page in preferences dialog\n"
+"File Commands"
+msgstr "Skráarskipanir"
+
+#: commonui/projectpref.cpp:115
+msgid "User-Defined Commands for File Items"
+msgstr "Notandaskilgreindar skráaskipanir"
+
+#: commonui/projectpref.cpp:120
+msgid ""
+"_: title of page in preferences dialog\n"
+"Catalog Manager"
+msgstr "Skráarstjóri"
+
+#: commonui/projectpref.cpp:122
+msgid "Catalog Manager View Settings"
+msgstr "Stillingar sýnar"
+
+#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
+msgid ""
+"_: title of page in preferences dialog\n"
+"Diff"
+msgstr "Diff"
+
+#: commonui/projectpref.cpp:127
+msgid "Searching for Differences"
+msgstr "Leita eftir mismun"
+
+#: commonui/roughtransdlg.cpp:69
+msgid ""
+"_: Caption of dialog\n"
+"Rough Translation"
+msgstr "Gróf þýðing"
+
+#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
+msgid "S&top"
+msgstr "Hæ&tta"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:157
+#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
+msgid "C&ancel"
+msgstr "H&ætta við"
+
+#: commonui/roughtransdlg.cpp:96
+msgid "What to Translate"
+msgstr "Hvað á að þýða"
+
+#: commonui/roughtransdlg.cpp:102
+msgid "U&ntranslated entries"
+msgstr "Óþý&ddar færslur"
+
+#: commonui/roughtransdlg.cpp:103
+msgid "&Fuzzy entries"
+msgstr "Loðnar &færslur"
+
+#: commonui/roughtransdlg.cpp:104
+msgid "T&ranslated entries"
+msgstr "Þýdda&r færslur"
+
+#: commonui/roughtransdlg.cpp:108
+msgid ""
+"<qt>"
+"<p><b>What entries to translate</b></p>"
+"<p>Choose here, for which entries of the file KBabel tries to find a "
+"translation. Changed entries are always marked as fuzzy, no matter which option "
+"you choose.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Hvaða færslur á að þýða</b></p> "
+"<p>Veldu hér hvaða hluta skráarinnar KBabel reynir að finna þýðingu fyrir. "
+"Breyttar færslur eru alltaf merktar sem loðnar, óháð hvaða valmöguleika þú "
+"velur.</p></qt>"
+
+#: commonui/roughtransdlg.cpp:113
+msgid "How to Translate"
+msgstr "Hvernig á að þýða"
+
+#: commonui/roughtransdlg.cpp:118
+msgid "&Use dictionary settings"
+msgstr "Nota &orðabókarstillingar"
+
+#: commonui/roughtransdlg.cpp:121
+msgid "Fu&zzy translation (slow)"
+msgstr "Lo&ðin þýðing (hægvirkt)"
+
+#: commonui/roughtransdlg.cpp:123
+msgid "&Single word translation"
+msgstr "Leyfa þýðingu á &stökum orðum"
+
+#: commonui/roughtransdlg.cpp:126
+msgid ""
+"<qt>"
+"<p><b>How messages get translated</b></p>"
+"<p>Here you can define if a message can only get translated completely, if "
+"similar messages are acceptable or if KBabel is supposed to try translating the "
+"single words of a message if no translation of the complete message or similar "
+"message was found.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Hvernig skilaboð eru þýdd</b></p>"
+"<p>Hér getur þú skilgreint hvort einungis sé hægt að þýða allt skilaboðið, "
+"hvort lík skilaboð eru leyfileg eða hvort KBabel á að reyna að þýða stök orð ef "
+"engin þýðing finnst fyrir allt skilaboðið, eða líkt skilaboð.</p></qt>"
+
+#: commonui/roughtransdlg.cpp:136
+msgid "&Mark changed entries as fuzzy"
+msgstr "&Merkja breyttar færslur sem loðnar"
+
+#: commonui/roughtransdlg.cpp:139
+msgid ""
+"<qt>"
+"<p><b>Mark changed entries as fuzzy</b></p>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Merkja breyttar færslur sem loðnar</b></p>"
+"<p>Þegar þýðing finnst fyrir skilaboð, er færslan sjálfkrafa merkt sem <b>"
+"loðin</b>. Ástæðan er að KBabel bara giskar á þýðinguna og þú ættir alltaf að "
+"skoða niðurstöðuna vandlega. Aftengdu þennan valmöguleika aðeins ef þú veist "
+"hvað þú ert að gera.</p></qt>"
+
+#: commonui/roughtransdlg.cpp:150
+msgid "Initialize &TDE-specific entries"
+msgstr "Frumstilla sértækar &TDE færslur"
+
+#: commonui/roughtransdlg.cpp:153
+msgid ""
+"<qt>"
+"<p><b>Initialize TDE-specific entries</b></p>"
+"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
+"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
+"identity settings.</p></qt>"
+msgstr ""
+"<qt> "
+"<p><b>Frumstilla sértækar TDE færslur</b></p> "
+"<p>Frumstilla \"Athugasemd=\" og \"Nafn=\" færslur ef engin þýðing finnst. "
+"Einnig verður \"NAME OF TRANSLATORS\" og \"EMAIL OF TRANSLATORS\" fyllt með "
+"auðkennisstillingum.</p></qt>"
+
+#: commonui/roughtransdlg.cpp:158
+msgid "Dictionaries"
+msgstr "Orðabækur"
+
+#: commonui/roughtransdlg.cpp:177
+msgid ""
+"<qt>"
+"<p><b>Dictionaries</b></p>"
+"<p>Choose here, which dictionaries have to be used for finding a translation. "
+"If you select more than one dictionary, they are used in the same order as they "
+"are displayed in the list.</p>"
+"<p>The <b>Configure</b> button allows you to temporarily configure selected "
+"dictionary. The original settings will be restored after closing the dialog.</p>"
+"</qt>"
+msgstr ""
+"<qt>"
+"<p><b>Orðabækur</b></p>"
+"<p>Veldur hér hvaða orðabækur á að nota til að leita að þýðingu. Veljirðu "
+"fleiri en eina orðabók, þá eru þær notaðar í sömu röð og þær standa á "
+"listanum.</p> "
+"<p><b>Stillingar</b> hnappurinn leyfir þér að breyta tímabundið stillingum "
+"valinnar orðabókar. Upprunalegar stillingar verða enduræstar eftir að þessum "
+"glugga er lokað.</p></qt>"
+
+#: commonui/roughtransdlg.cpp:186
+msgid "Messages:"
+msgstr "Skilaboð:"
+
+#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
+msgid ""
+"Result of the translation:\n"
+"Edited entries: %1\n"
+"Exact translations: %2 (%3%)\n"
+"Approximate translations: %4 (%5%)\n"
+"Nothing found: %6 (%7%)"
+msgstr ""
+"Niðurstaða þýðingar:\n"
+"Breyttar færslur: %1\n"
+"Nákvæmar þýðingar: %2 (%3%)\n"
+"Áætlaðar þýðingar: %4 (%5%)\n"
+"Ekkert fannst: %6 (%7%)"
+
+#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
+msgid "Rough Translation Statistics"
+msgstr "Tölfræði yfir grófa þýðingu"
+
+#: commonui/roughtransdlg.cpp:744
+msgid ""
+"<qt>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>Þegar þýðing finnst fyrir skilaboð, er færslan sjálfkrafa merkt sem <b>"
+"loðin</b>. Ástæðan er að KBabel bara giskar á þýðinguna og þú ættir alltaf að "
+"skoða niðurstöðuna vandlega. Aftengdu þennan valmöguleika aðeins ef þú veist "
+"hvað þú ert að gera.</p></qt>"
+
+#: commonui/tdeactionselector.cpp:81
+msgid "&Available:"
+msgstr "&Tiltækt:"
+
+#: commonui/tdeactionselector.cpp:96
+msgid "&Selected:"
+msgstr "&Valinn:"
+
 #: commonui/context.cpp:97
 msgid "Corresponding source file not found"
 msgstr "Samsvarandi kóðaskrá fannst ekki"
@@ -29,18 +311,6 @@ msgstr ""
 "KBabel getur ekki ræst ritileiningu.\n"
 "Athugaðu TDE uppsetninguna þína."
 
-#: commonui/cmdedit.cpp:51
-msgid "Command &Label:"
-msgstr "S&kipun:"
-
-#: commonui/cmdedit.cpp:52
-msgid "Co&mmand:"
-msgstr "S&kipun:"
-
-#: commonui/cmdedit.cpp:66
-msgid "&Add"
-msgstr "Bæt&a við"
-
 #: commonui/finddialog.cpp:62
 msgid "&Find:"
 msgstr "&Finna:"
@@ -113,7 +383,7 @@ msgstr ""
 "<p>Veldu hér í hvaða hlutum á að leita.</p></qt>"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 54
-#: commonui/finddialog.cpp:124 rc.cpp:1219
+#: commonui/finddialog.cpp:124 rc.cpp:1237
 #, no-c-format
 msgid "C&ase sensitive"
 msgstr "&Háð há-/lágstöfum"
@@ -139,7 +409,7 @@ msgid "F&ind backwards"
 msgstr "Leita &aftur á bak"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 86
-#: commonui/finddialog.cpp:133 rc.cpp:1231
+#: commonui/finddialog.cpp:133 rc.cpp:1249
 #, no-c-format
 msgid "Use regu&lar expression"
 msgstr "Nota reg&lulega segð"
@@ -236,6 +506,26 @@ msgstr "Skipta út ö&llum"
 msgid "Replace this string?"
 msgstr "Skipta út þessum streng?"
 
+#: commonui/projectwizard.cpp:78
+msgid "Basic Project Information"
+msgstr "Upplýsingar um verkefnið"
+
+#: commonui/projectwizard.cpp:83
+msgid "Translation Files"
+msgstr "Þýðingarskrár"
+
+#: commonui/projectwizard.cpp:140
+msgid ""
+"The file '%1' already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"Skráin %1 er þegar til.\n"
+"Viltu yfirskrifa hana?"
+
+#: commonui/projectwizard.cpp:141
+msgid "File Exists"
+msgstr "Skrá þegar til"
+
 #: commonui/projectprefwidgets.cpp:138
 msgid "&Update header when saving"
 msgstr "&Uppfæra haus við vistun"
@@ -287,7 +577,7 @@ msgid "No autosave"
 msgstr "Ekki virk"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 29
-#: commonui/projectprefwidgets.cpp:188 rc.cpp:271
+#: commonui/projectprefwidgets.cpp:188 rc.cpp:360
 #, no-c-format
 msgid "&General"
 msgstr "&Almennt"
@@ -767,13 +1057,13 @@ msgstr ""
 "Hunsa allt</i> í stafsetningarleiðréttingunni.</p></qt>"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 68
-#: commonui/projectprefwidgets.cpp:890 rc.cpp:199
+#: commonui/projectprefwidgets.cpp:890 rc.cpp:173
 #, no-c-format
 msgid "&Base folder of PO files:"
 msgstr "&Grunnmappa fyrir PO-skrár:"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 110
-#: commonui/projectprefwidgets.cpp:903 rc.cpp:202
+#: commonui/projectprefwidgets.cpp:903 rc.cpp:176
 #, no-c-format
 msgid "Ba&se folder of POT files:"
 msgstr "Grunnmappa fyrir POT-&skrár:"
@@ -1016,336 +1306,1827 @@ msgstr "&Grunnmappa fyrir frumkóða:"
 msgid "Path Patterns"
 msgstr "Slóðarmynstur"
 
-#: commonui/tdeactionselector.cpp:81
-msgid "&Available:"
-msgstr "&Tiltækt:"
+#: commonui/cmdedit.cpp:51
+msgid "Command &Label:"
+msgstr "S&kipun:"
 
-#: commonui/tdeactionselector.cpp:96
-msgid "&Selected:"
-msgstr "&Valinn:"
+#: commonui/cmdedit.cpp:52
+msgid "Co&mmand:"
+msgstr "S&kipun:"
 
-#: commonui/projectpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Identity"
-msgstr "Auðkenni"
+#: commonui/cmdedit.cpp:66
+msgid "&Add"
+msgstr "Bæt&a við"
 
-#: commonui/projectpref.cpp:72
-msgid "Information About You and Translation Team"
-msgstr "Upplýsingar um þig og þýðingarhópinn"
+#. i18n: file ./commonui/tdelisteditor.ui line 94
+#: rc.cpp:3 rc.cpp:578 rc.cpp:1264
+#, no-c-format
+msgid "New Item"
+msgstr "Nýr hlutur"
 
-#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
-msgid ""
-"_: title of page in preferences dialog\n"
-"Save"
-msgstr "Vistun"
+#. i18n: file ./commonui/tdelisteditor.ui line 151
+#: rc.cpp:12
+#, no-c-format
+msgid "Up"
+msgstr "Upp"
 
-#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
-msgid "Options for File Saving"
-msgstr "Valkostir fyrir vistun"
+#. i18n: file ./commonui/tdelisteditor.ui line 162
+#: rc.cpp:15
+#, no-c-format
+msgid "Down"
+msgstr "Niður"
 
-#: commonui/projectpref.cpp:82
+#. i18n: file ./commonui/projectwizardwidget.ui line 38
+#: rc.cpp:18
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Spelling"
-msgstr "Leiðréttingar"
-
-#: commonui/projectpref.cpp:84
-msgid "Options for Spell Checking"
-msgstr "Valkostir á stafsetningarleiðréttingum"
+"<font size=\"+1\">Welcome to Project Wizard!</font>\n"
+"<br/>\n"
+"<p>\n"
+"The wizard will help you to setup a new translation\n"
+"project for KBabel.\n"
+"</p>\n"
+"<p>\n"
+"First of all, you need to choose the project name\n"
+"and the file, where the configuration should be stored.\n"
+"</p>\n"
+"<p>\n"
+"You should also choose a language to translate into\n"
+"and also a type of the translation project.\n"
+"</p>"
+msgstr ""
+"<font size=\"+1\">Velkomin(n) í verkefna álfinn!</font>\n"
+"<br/>\n"
+"<p>\n"
+"Álfurinn aðstoðar þig að útbúa nýtt þýðingarverkefni\n"
+"fyrir KBabel.\n"
+"</p>\n"
+"<p>\n"
+"Fyrsta sem þú þarft að gera er að velja nafn á verkefnið\n"
+"og skrána sem á að vista stillingarnar í.\n"
+"</p>\n"
+"<p>\n"
+"Einnig ættir þú að velja hvaða tungumál þú ætlar að þýða í\n"
+"og tegund verkefnisins.\n"
+"</p>"
 
-#: commonui/projectpref.cpp:89
+#. i18n: file ./commonui/projectwizardwidget.ui line 66
+#: rc.cpp:34 rc.cpp:111
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Source"
-msgstr "Kóði"
+"<qt>\n"
+"<p><b>Configuration File Name</b>"
+"<br/>\n"
+"The name of a file to store the configuration of the\n"
+"project.</p>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<p><b>Nafn á stillingarskrá</b>"
+"<br/>\n"
+"Nafnið á skránni sem á að vista stillingar verkefnisins í\n"
+"</p>\n"
+"</qt>"
 
-#: commonui/projectpref.cpp:91
-msgid "Options for Showing Source Context"
-msgstr "Möguleikar við sýningu á kóða samhengi"
+#. i18n: file ./commonui/projectwizardwidget.ui line 74
+#: rc.cpp:41
+#, no-c-format
+msgid "&Language:"
+msgstr "Tungumá&l:"
 
-#: commonui/projectpref.cpp:96
+#. i18n: file ./commonui/projectwizardwidget.ui line 86
+#: rc.cpp:44 rc.cpp:66
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Miscellaneous"
-msgstr "Ýmislegt"
+"<qt>\n"
+"<p>\n"
+"<b>Language</b>"
+"<br/>\n"
+"The destination language of the project, i.e., the language\n"
+"to translate into. It should follow the ISO 631 language naming\n"
+"standard.</p>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<p>\n"
+"<b>Tungumál</b>"
+"<br/>\n"
+"Tungumálið sem á að þýða í. Það ætti að fylgja\n"
+"ISO 631 tungumála nafnastaðlinum.</p>\n"
+"</qt>"
 
-#: commonui/projectpref.cpp:98
-msgid "Miscellaneous Settings"
-msgstr "Ýmsar stillingar"
+#. i18n: file ./commonui/projectwizardwidget.ui line 97
+#: rc.cpp:53
+#, no-c-format
+msgid "Project &name:"
+msgstr "&Nafn verkefnis:"
 
-#: commonui/projectpref.cpp:101
+#. i18n: file ./commonui/projectwizardwidget.ui line 110
+#: rc.cpp:56 rc.cpp:98
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Folders"
-msgstr "Möppur"
+"<qt>"
+"<p><b>Project name</b>"
+"<br/>\n"
+"The project name is an identification of a project for\n"
+"you. It is shown in the project configuration dialog\n"
+"as well as in the title of windows opened for the project.\n"
+"<br/>\n"
+"<br/>\n"
+"<b>Note:</b> The project name cannot be later changed.<\n"
+"</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Nafn verkefnis</b>"
+"<br/>\n"
+"Nafnið er notað til að auðkenna verkefnið með.\n"
+"Það er sýnt í verkefna stillingarglugganum, ásamt\n"
+"í KBabel gluggunum sem eru opnaðir í því.\n"
+"<br/>\n"
+"<br/>\n"
+"<b>Athugaðu:</b> Það er ekki hægt að breyta nafninu seinna.<\n"
+"</p></qt>"
 
-#: commonui/projectpref.cpp:103
-msgid "Paths to Message Catalogs & Catalog Templates"
-msgstr "Slóð að skilaboðamöppum & sniðskrám"
+#. i18n: file ./commonui/projectwizardwidget.ui line 135
+#: rc.cpp:75
+#, no-c-format
+msgid "Project &type:"
+msgstr "&Tegund verkefnis:"
 
-#: commonui/projectpref.cpp:106
+#. i18n: file ./commonui/projectwizardwidget.ui line 158
+#: rc.cpp:78 rc.cpp:130
+#, fuzzy, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Folder Commands"
-msgstr "Möppuskipanir"
+"<qt>\n"
+"<p>\n"
+"<b>Project Type</b>\n"
+"The project type allows to tune the settings for the\n"
+"particular type of the well-known translation projects.\n"
+"For example, it sets up the validation tools,\n"
+"an accelerator marker and formatting of the header.\n"
+"</p>\n"
+"<p>Currently known types:\n"
+"<ul>\n"
+"<li><b>TDE</b>: Trinity Desktop Environment Internalization project</li>\n"
+"<li><b>GNOME</b>: GNOME Translation project</li>\n"
+"<li><b>Translation Robot</b>: Translation Project Robot</li>\n"
+"<li><b>Other</b>: Other kind of project. No tuning will be\n"
+"done</li>\n"
+"</ul>\n"
+"</p>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<p>\n"
+"<b>Tegund verkefnis</b>\n"
+"Tegund verkefnis leyfir fínstillingu á þekktum verkefnum.\n"
+"T.d. eru prófunartólin sett upp og hraðvalsmerkingar og snið\n"
+"hausa stillt.\n"
+"</p>\n"
+"<p>Þekktar verkefnategundir eru:\n"
+"<ul>\n"
+"<li><b>TDE</b>:Alþjóðlegt K skjáborðs umhverfisverkefni</li>\n"
+"<li><b>GNOME</b>: GNOME þýðingarverkefni</li>\n"
+"<li><b>Þýðingar róbóti</b>: Þýðingarverkefnis róbóti</li>\n"
+"<li><b>Annað</b>: Annað þýðingarverkefni. Ekki eru gerðar neinar stillingar</li>"
+"\n"
+"</ul>\n"
+"</p>\n"
+"</qt>"
 
-#: commonui/projectpref.cpp:108
-msgid "User-Defined Commands for Folder Items"
-msgstr "Notandaskilgreindar möppuskipanir"
+#. i18n: file ./commonui/projectwizardwidget.ui line 184
+#: rc.cpp:108
+#, no-c-format
+msgid "Configuration &file name:"
+msgstr "Na&fn á stillingaskrá:"
 
-#: commonui/projectpref.cpp:113
+#. i18n: file ./commonui/projectwizardwidget.ui line 200
+#: rc.cpp:118
+#, no-c-format
+msgid "TDE"
+msgstr "TDE"
+
+#. i18n: file ./commonui/projectwizardwidget.ui line 205
+#: rc.cpp:121
+#, no-c-format
+msgid "GNOME"
+msgstr "GNOME"
+
+#. i18n: file ./commonui/projectwizardwidget.ui line 210
+#: rc.cpp:124
+#, no-c-format
+msgid "Translation Project Robot"
+msgstr "Þýðingarverkefnis róbóti"
+
+#. i18n: file ./commonui/projectwizardwidget.ui line 215
+#: rc.cpp:127
+#, no-c-format
+msgid "Other"
+msgstr "Annað"
+
+#. i18n: file ./commonui/projectwizardwidget2.ui line 18
+#: rc.cpp:150
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"File Commands"
-msgstr "Skráarskipanir"
+"<qt>"
+"<p><b>Translation Files</b></p>\n"
+"<p>Type in the folders which contain all your PO and POT files.\n"
+"The files and the folders in these folders will then be merged into one "
+"tree.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Grunnmöppur</b></p>\n"
+"<p>Skrifaðu inn möppurnar sem innihalda allar PO og POT skrárnar.\n"
+"Skrárnar og undirmöppurnar verða síðan sýndar í einu tré.</p></qt>"
 
-#: commonui/projectpref.cpp:115
-msgid "User-Defined Commands for File Items"
-msgstr "Notandaskilgreindar skráaskipanir"
+#. i18n: file ./commonui/projectwizardwidget2.ui line 44
+#: rc.cpp:155
+#, no-c-format
+msgid ""
+"<font size=\"+1\">The Translation Files</font>\n"
+"<br/>"
+"<br/>\n"
+"If the project contains more than one file to translate, it\n"
+"better to organize the files. \n"
+"\n"
+"KBabel distinguishes two kind of the translation files:\n"
+"\n"
+"<ul>\n"
+"<li><b>Templates</b>: the files to be translated</li>\n"
+"<li><b>Translated files</b>: the files already translated (at least\n"
+"partially)</li>\n"
+"</ul>\n"
+"\n"
+"Choose the folders to store the files. If you\n"
+"leave the entries empty, the Catalog Manager\n"
+"will not work."
+msgstr ""
+"<font size=\"+1\">Þýðingarskrárnar</font>\n"
+"<br/>"
+"<br/>\n"
+"Ef verkefnið inniheldur fleiri en eina skrá sem á að þýða er\n"
+"betra að skipuleggja þær. \n"
+"\n"
+"KBabel gerir greinamun á tveimur tegundum skráa:\n"
+"\n"
+"<ul>\n"
+"<li><b>Snið</b>: skrárnar sem á að þýða</li>\n"
+"<li><b>Þýddar skrár</b>: skrár sem er þegar búið að þýða (að minnsta\n"
+"kosti að hluta)</li>\n"
+"</ul>\n"
+"\n"
+"Veldu möppuna sem inniheldur skrárnar. Ef þessar\n"
+"færslur eru tómar, virkar ekki Þýðingarstjórinn."
 
-#: commonui/projectpref.cpp:120
+#. i18n: file ./commonui/diffpreferences.ui line 25
+#: rc.cpp:179
+#, no-c-format
+msgid "Diff Source"
+msgstr "Staðsetning samanburðaskráa"
+
+#. i18n: file ./commonui/diffpreferences.ui line 41
+#: rc.cpp:182
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Catalog Manager"
-msgstr "Skráarstjóri"
+"<qt>"
+"<p><b>Source for difference lookup</b></p>\n"
+"<p>Here you can select a source, which should be used\n"
+"for finding a difference.</p>\n"
+"<p>You can select file, translation database or\n"
+"corresponding msgstr.</p>\n"
+"<p>If you choose the translation database, the messages to diff with are\n"
+"taken from the Translation Database; to be useful, you have\n"
+"to enable <i>Auto add entry to database</i> in its\n"
+"preferences dialog.</p>\n"
+"<p>The last option is useful for those using PO-files\n"
+"for proofreading.</p>\n"
+"<p>You can temporarily diff with messages from a file\n"
+"by choosing <i>Tools->Diff->Open file for diff</i>\n"
+"in KBabel's main window.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Staðsetning samanburðaskráa</b></p>\n"
+"<p>Hér getur þú skilgreint uppruna sem á að bera saman við\n"
+"til að finna mismun í skrám.</p>\n"
+"<p>Þú getur valið skrá, gagnagrunn eða\n"
+"samsvarandi msgstr færslu.</p>\n"
+"<p>Ef þú velur að nota gagnagrunn, eru færslurnar sem á að bera saman við\n"
+"teknar úr þýðingargagnagrunninum, og til að vera gagnlegt verður\n"
+"þú að haka við <i>Bæta sjálfkrafa við nýjum færslum</i>\n"
+"í stillingarglugga hans.</p>\n"
+"<p>Seinasti valkosturinn er gagnlegur fyrir þá sem nota PO skrár til að\n"
+"lesa yfir með.</p>\n"
+"<p>Þú getur borið tímabundið saman við færslur í skrá\n"
+"með að velja <i>Tól->Samanburður->Opna skrá til samanburðar</i>\n"
+"í aðalglugga KBabel.</p></qt>"
 
-#: commonui/projectpref.cpp:122
-msgid "Catalog Manager View Settings"
-msgstr "Stillingar sýnar"
+#. i18n: file ./commonui/diffpreferences.ui line 52
+#: rc.cpp:198
+#, no-c-format
+msgid "Use &file"
+msgstr "&Nota skrá"
 
-#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
+#. i18n: file ./commonui/diffpreferences.ui line 60
+#: rc.cpp:201
+#, no-c-format
+msgid "Use messages from &translation database"
+msgstr "No&ta skilaboð frá þýðingargagnagrunni"
+
+#. i18n: file ./commonui/diffpreferences.ui line 68
+#: rc.cpp:204
+#, no-c-format
+msgid "Use &msgstr from the same file"
+msgstr "Nota &msgstr frá sömu skrá"
+
+#. i18n: file ./commonui/diffpreferences.ui line 86
+#: rc.cpp:207
+#, no-c-format
+msgid "Base folder for diff files:"
+msgstr "Grunnmappa fyrir samanburðarskrár:"
+
+#. i18n: file ./commonui/diffpreferences.ui line 104
+#: rc.cpp:210
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Diff"
-msgstr "Diff"
+"<qt><q><b>Base folder for diff files</b></q>\n"
+"<p>Here you can define a folder in which the files to\n"
+"diff with are stored. If the files are stored at the same\n"
+"place beneath this folder as the original files beneath\n"
+"their base folder, KBabel can automatically open the correct\n"
+"file to diff with.</p>\n"
+"<p>Note that this option has no effect if messages from\n"
+"the database are used for diffing.</p></qt>"
+msgstr ""
+"<qt><q><b>Grunnmappa fyrir samanburðarskrár</b></q>\n"
+"<p>Hér getur þú tilgreint möppuna sem inniheldur skrárnar\n"
+"sem á að bera saman við. Ef skránum er raðað á sama máta\n"
+"undir þessari möppu og upprunalegu skránum er raðað í sinni grunnmöppu, getur "
+"KBabel sjálfvirkt opnað réttar skrár til að\n"
+"bera saman við.</p>\n"
+"<p>Athugið að þessi valkostur hefur engin áhrif ef notast er\n"
+"við færslur frá gagnagrunni til að bera saman við.</p></qt>"
 
-#: commonui/projectpref.cpp:127
-msgid "Searching for Differences"
-msgstr "Leita eftir mismun"
+#. i18n: file ./kbabel/editordiffpreferences.ui line 36
+#: rc.cpp:223
+#, no-c-format
+msgid "Added Characters"
+msgstr "Viðbættir stafir"
 
-#: commonui/roughtransdlg.cpp:69
+#. i18n: file ./kbabel/editordiffpreferences.ui line 44
+#: rc.cpp:226
+#, no-c-format
+msgid "Ho&w to display:"
+msgstr "H&vernig á að sýna:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 55
+#: rc.cpp:229
+#, no-c-format
+msgid "Co&lor:"
+msgstr "&Litur:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 66
+#: rc.cpp:232
+#, no-c-format
+msgid "Removed Characters"
+msgstr "Fjarlægðir stafir"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 74
+#: rc.cpp:235
+#, no-c-format
+msgid "How &to display:"
+msgstr "Hv&ernig á að sýna:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 85
+#: rc.cpp:238 rc.cpp:431
+#, no-c-format
+msgid "Colo&r:"
+msgstr "Litu&r:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 94
+#: rc.cpp:241 rc.cpp:247
+#, no-c-format
+msgid "Highlighted"
+msgstr "Litað"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 99
+#: rc.cpp:244
+#, no-c-format
+msgid "Underlined"
+msgstr "Undirstrikað"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 129
+#: rc.cpp:250
+#, no-c-format
+msgid "Stroked Out"
+msgstr "Yfirstrikaðir"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 41
+#: rc.cpp:253
+#, no-c-format
+msgid "&Background color:"
+msgstr "&Bakgrunnslitur:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 52
+#: rc.cpp:256
+#, no-c-format
+msgid "Color for &quoted characters:"
+msgstr "Litur á \"&gæsalöppuðum\" stöfum:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 63
+#: rc.cpp:259
+#, no-c-format
+msgid "Color for &syntax errors:"
+msgstr "Litur á &málfræðivillum:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 82
+#: rc.cpp:262
+#, no-c-format
+msgid "Color for s&pellcheck errors:"
+msgstr "Litur á st&afsetningarvillum:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 97
+#: rc.cpp:265
+#, no-c-format
 msgid ""
-"_: Caption of dialog\n"
-"Rough Translation"
-msgstr "Gróf þýðing"
+"<qt>Here you can setup a color to display identified <b>mispelled</b> "
+"words and\n"
+"phrases.</qt>"
+msgstr ""
+"<qt>Hér getur þú skilgreint lit sem sýnir <b>misrituð</b> orð og\n"
+"setningar sem finnast.</qt>"
 
-#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
-msgid "S&top"
-msgstr "Hæ&tta"
+#. i18n: file ./kbabel/colorpreferences.ui line 105
+#: rc.cpp:269
+#, no-c-format
+msgid "Color for &keyboard accelerators:"
+msgstr "Litur á ly&klaborð flýtilyklum:"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:157
-#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
-msgid "C&ancel"
-msgstr "H&ætta við"
+#. i18n: file ./kbabel/colorpreferences.ui line 132
+#: rc.cpp:272
+#, no-c-format
+msgid "Color for c-for&mat characters:"
+msgstr "Litun á &c-viðföngum:"
 
-#: commonui/roughtransdlg.cpp:96
-msgid "What to Translate"
-msgstr "Hvað á að þýða"
+#. i18n: file ./kbabel/colorpreferences.ui line 151
+#: rc.cpp:275
+#, no-c-format
+msgid "Color for &tags:"
+msgstr "Litur á &tögum:"
 
-#: commonui/roughtransdlg.cpp:102
-msgid "U&ntranslated entries"
-msgstr "Óþý&ddar færslur"
+#. i18n: file ./kbabel/fontpreferences.ui line 25
+#: rc.cpp:278
+#, no-c-format
+msgid "Font for Messages"
+msgstr "Leturgerð skilaboða"
 
-#: commonui/roughtransdlg.cpp:103
-msgid "&Fuzzy entries"
-msgstr "Loðnar &færslur"
+#. i18n: file ./kbabel/fontpreferences.ui line 36
+#: rc.cpp:281
+#, no-c-format
+msgid "&Show only fixed font"
+msgstr "Aðeins &sýna jafnbreitt letur"
 
-#: commonui/roughtransdlg.cpp:104
-msgid "T&ranslated entries"
-msgstr "Þýdda&r færslur"
+#. i18n: file ./kbabel/searchpreferences.ui line 39
+#: rc.cpp:284
+#, no-c-format
+msgid "Au&tomatically start search"
+msgstr "Sjálfvirk lei&t"
 
-#: commonui/roughtransdlg.cpp:108
+#. i18n: file ./kbabel/searchpreferences.ui line 49
+#: rc.cpp:287
+#, no-c-format
 msgid ""
 "<qt>"
-"<p><b>What entries to translate</b></p>"
-"<p>Choose here, for which entries of the file KBabel tries to find a "
-"translation. Changed entries are always marked as fuzzy, no matter which option "
-"you choose.</p></qt>"
+"<p><b>Automatically start search</b></p>\n"
+"<p>If this is activated, the search is automatically started \n"
+"whenever you switch to another entry in the editor. You can \n"
+"choose where to search with the combo box <b>Default Dictionary</b>.\n"
+"</p>"
+"<p>You can also start searching manually by choosing an entry in \n"
+"the popup menu that appears either when clicking \n"
+"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
+"in the toolbar pressed for a while.</p></qt>"
 msgstr ""
 "<qt>"
-"<p><b>Hvaða færslur á að þýða</b></p> "
-"<p>Veldu hér hvaða hluta skráarinnar KBabel reynir að finna þýðingu fyrir. "
-"Breyttar færslur eru alltaf merktar sem loðnar, óháð hvaða valmöguleika þú "
-"velur.</p></qt>"
+"<p><b>Hefja sjálfvirkt leit</b></p>\n"
+"<p>Ef þetta er valið, hefst leit sjálfkrafa í hvert sinn sem\n"
+"þú skiptir á milli færsla í ritlinum. Þú getur valið hvar á að leita\n"
+"með fellilistanum <b>Sjálfgefin orðabók</b>.\n"
+"</p>"
+"<p>Einnig getur þú leitað handvirkt með því að velja færslu í\n"
+"glugganum sem birtist annaðhvort þegar smellt er á <b>Orðabækur->Finna...</b> "
+"eða þegar orðabókarhnappinum í aðaltækjaslánni er haldið niðri um stund.</p>"
+"</qt>"
 
-#: commonui/roughtransdlg.cpp:113
-msgid "How to Translate"
-msgstr "Hvernig á að þýða"
+#. i18n: file ./kbabel/searchpreferences.ui line 65
+#: rc.cpp:297
+#, no-c-format
+msgid "D&efault dictionary:"
+msgstr "Sjálfg&efin orðabók:"
 
-#: commonui/roughtransdlg.cpp:118
-msgid "&Use dictionary settings"
-msgstr "Nota &orðabókarstillingar"
+#. i18n: file ./kbabel/searchpreferences.ui line 82
+#: rc.cpp:300
+#, no-c-format
+msgid ""
+"<qt>"
+"<p><b>Default Dictionary</b></p>\n"
+"<p>Choose here where to search as default. \n"
+"This setting is used when searching is started automatically \n"
+"or when pressing the dictionary button in the toolbar.</p>\n"
+"<p>You can configure the different dictionaries by selecting \n"
+"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
+"</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Sjálfgefin orðabók</b></p>\n"
+"<p>Veldu hér hvar á sjálfgefið að leita. Þessi stilling er notuð þegar leit "
+"hefst sjálfkrafa, og þegar ýtt er á orðabókar táknmyndina í tækjaslánni.</p>"
+"<p>Þú getur sett upp orðabækurnar með því að velja <b>Stillingar->"
+"Stilla orðabók</b>. </p></qt>"
 
-#: commonui/roughtransdlg.cpp:121
-msgid "Fu&zzy translation (slow)"
-msgstr "Lo&ðin þýðing (hægvirkt)"
+#. i18n: file ./kbabel/spelldlgwidget.ui line 24
+#: rc.cpp:309
+#, no-c-format
+msgid "Choose What You Want to Spell Check"
+msgstr "Veldu hvað þú vilt leiðrétta"
 
-#: commonui/roughtransdlg.cpp:123
-msgid "&Single word translation"
-msgstr "Leyfa þýðingu á &stökum orðum"
+#. i18n: file ./kbabel/spelldlgwidget.ui line 30
+#: rc.cpp:312 rc.cpp:324
+#, no-c-format
+msgid "Spell check only the current message."
+msgstr "Skoða einungis stafsetningu í núverandi skilaboðum."
 
-#: commonui/roughtransdlg.cpp:126
+#. i18n: file ./kbabel/spelldlgwidget.ui line 41
+#: rc.cpp:315
+#, no-c-format
+msgid "A&ll messages"
+msgstr "Ö&ll skilaboð"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 44
+#: rc.cpp:318
+#, no-c-format
+msgid "Spell check all translated messages of this file."
+msgstr "Skoða stafsetningu í öllum skilaboðum í þessari skrá."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 52
+#: rc.cpp:321
+#, no-c-format
+msgid "C&urrent message only"
+msgstr "Ein&ungis núverandi skilaboð"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 66
+#: rc.cpp:327
+#, no-c-format
+msgid "Fro&m beginning of current message to end of file"
+msgstr "Frá &byrjun núverandi skilaboðs til enda skráar"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 74
+#: rc.cpp:330
+#, no-c-format
+msgid "&From beginning of file to cursor position"
+msgstr "&Frá byrjun skráar til stöðu bendils"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 77
+#: rc.cpp:333
+#, no-c-format
+msgid ""
+"Spell check all text from the beginning of the file to the current cursor "
+"position."
+msgstr ""
+"Skoða stafsetningu í öllum texta frá byrjun á skrá að núverandi stöðu bendils."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 85
+#: rc.cpp:336
+#, no-c-format
+msgid "F&rom cursor position to end of file"
+msgstr "Frá &bendli til enda skráar"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 88
+#: rc.cpp:339
+#, no-c-format
+msgid ""
+"Spell check all text from the current cursor position to the end of the file."
+msgstr ""
+"Skoða stafsetningu í öllum texta frá núverandi stöðu bendils að lokum skrár."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 96
+#: rc.cpp:342
+#, no-c-format
+msgid "S&elected text only"
+msgstr "&Einungis valinn texti"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 99
+#: rc.cpp:345
+#, no-c-format
+msgid "Spell check only the selected text."
+msgstr "Skoða einungis stafsetningu á völdum texta."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 109
+#: rc.cpp:348
+#, no-c-format
+msgid "U&se this selection as default"
+msgstr "Nota þetta val sem &sjálfgefið"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 112
+#: rc.cpp:351
+#, no-c-format
+msgid "Check this, to store the current selection as default selection."
+msgstr "Hakaðu við hér til að geyma núverandi val sem sjálfgefið."
+
+#. i18n: file ./kbabel/headerwidget.ui line 24
+#: kbabel/commentview.cpp:78 rc.cpp:354
+#, no-c-format
+msgid "&Comment:"
+msgstr "&Athugasemdir:"
+
+#. i18n: file ./kbabel/headerwidget.ui line 43
+#: rc.cpp:357
+#, no-c-format
+msgid "&Header:"
+msgstr "&Haus:"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 54
+#: rc.cpp:363
+#, no-c-format
+msgid "A&utomatically unset fuzzy status"
+msgstr "Fjarlægja loðna stöð&u sjálfkrafa"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 60
+#: rc.cpp:366
+#, no-c-format
 msgid ""
 "<qt>"
-"<p><b>How messages get translated</b></p>"
-"<p>Here you can define if a message can only get translated completely, if "
-"similar messages are acceptable or if KBabel is supposed to try translating the "
-"single words of a message if no translation of the complete message or similar "
-"message was found.</p></qt>"
+"<p><b>Automatically unset fuzzy status</b></p>\n"
+"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
+"automatically\n"
+"unset (this means the string <i>, fuzzy</i>\n"
+"is removed from the entry's comment).</p></qt>"
 msgstr ""
 "<qt>"
-"<p><b>Hvernig skilaboð eru þýdd</b></p>"
-"<p>Hér getur þú skilgreint hvort einungis sé hægt að þýða allt skilaboðið, "
-"hvort lík skilaboð eru leyfileg eða hvort KBabel á að reyna að þýða stök orð ef "
-"engin þýðing finnst fyrir allt skilaboðið, eða líkt skilaboð.</p></qt>"
+"<p><b>Fjarlægja loðna stöðu sjálfkrafa</b></p>\n"
+"<p>Ef þetta er valið og þú breytir loðinni færslu, mun staða hennar verða\n"
+"sjálfkrafa sett sem <i>óloðin</i>.</p></qt>"
 
-#: commonui/roughtransdlg.cpp:136
-msgid "&Mark changed entries as fuzzy"
-msgstr "&Merkja breyttar færslur sem loðnar"
+#. i18n: file ./kbabel/editorpreferences.ui line 68
+#: rc.cpp:372
+#, no-c-format
+msgid "Use cle&ver editing"
+msgstr "Nota &snjalla ritstýringu"
 
-#: commonui/roughtransdlg.cpp:139
+#. i18n: file ./kbabel/editorpreferences.ui line 79
+#: rc.cpp:375
+#, no-c-format
 msgid ""
 "<qt>"
-"<p><b>Mark changed entries as fuzzy</b></p>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
+"<p><b>Use clever editing</b></p>\n"
+"<p>Check this to make typing text more comfortable and let \n"
+"KBabel take care of some special characters that have to \n"
+"be quoted. For example typing '\\\"' will result in \n"
+"'\\\\\\\"', pressing Return will automatically add whitespace \n"
+"at the end of the line, pressing Shift+Return will add \n"
+"'\\\\n' at the end of the line.</p>\n"
+"<p>Note that this is just a hint: it is still possible to \n"
+"generate syntactically incorrect text.</p></qt>"
 msgstr ""
 "<qt>"
-"<p><b>Merkja breyttar færslur sem loðnar</b></p>"
-"<p>Þegar þýðing finnst fyrir skilaboð, er færslan sjálfkrafa merkt sem <b>"
-"loðin</b>. Ástæðan er að KBabel bara giskar á þýðinguna og þú ættir alltaf að "
-"skoða niðurstöðuna vandlega. Aftengdu þennan valmöguleika aðeins ef þú veist "
-"hvað þú ert að gera.</p></qt>"
+"<p><b>Nota snjalla ritstýringu</b></p>\n"
+"<p>Veldu þennan möguleika til að láta KBabel sjá um að setja \n"
+"gæsalappir þar sem það er nauðsynlegt. T.d. þegar þú \n"
+"skrifar '\\\"' birtist '\\\\\\\"', þegar þú slærð á Enter er bili sjálfkrafa "
+"bætt \n"
+"við enda línunar, Shift+Return bætir '\\\\n' við enda línunar.</p>\n"
+"<p>Athugaðu að þetta er einungis hjálparfítus, það er ennþá mögulegt \n"
+"að skrifa rangan texta.</p></qt>"
 
-#: commonui/roughtransdlg.cpp:150
-msgid "Initialize &TDE-specific entries"
-msgstr "Frumstilla sértækar &TDE færslur"
+#. i18n: file ./kbabel/editorpreferences.ui line 89
+#: rc.cpp:386
+#, no-c-format
+msgid "Automatic Checks"
+msgstr "Sjálfvirk skoðun"
 
-#: commonui/roughtransdlg.cpp:153
+#. i18n: file ./kbabel/editorpreferences.ui line 97
+#: rc.cpp:389
+#, no-c-format
 msgid ""
 "<qt>"
-"<p><b>Initialize TDE-specific entries</b></p>"
-"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
-"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
-"identity settings.</p></qt>"
+"<p><b>Error recognition</b></p>\n"
+"<p>Here you can set how to show that an error occurred. \n"
+"<b>Beep on error</b> beeps and <b>Change text color on error\n"
+"</b> changes the color of the translated text. If none is \n"
+"activated, you will still see a message in the statusbar.\n"
+"</p></qt>"
 msgstr ""
-"<qt> "
-"<p><b>Frumstilla sértækar TDE færslur</b></p> "
-"<p>Frumstilla \"Athugasemd=\" og \"Nafn=\" færslur ef engin þýðing finnst. "
-"Einnig verður \"NAME OF TRANSLATORS\" og \"EMAIL OF TRANSLATORS\" fyllt með "
-"auðkennisstillingum.</p></qt>"
+"<qt>"
+"<p><b>Villusýning</b></p>"
+"<p>Hér getur þú valið um hvernig villuboð eru sýnd. <b>Flauta við villu</b> "
+"gefur hljóðmerki og <b>Breyta textalit við villu</b> "
+"breytir lit þýdda textans. Ef ekkert er valið, muntu eftir sem áður sjá "
+"skilaboð í stöðuslánni.</p></qt>"
 
-#: commonui/roughtransdlg.cpp:158
-msgid "Dictionaries"
-msgstr "Orðabækur"
+#. i18n: file ./kbabel/editorpreferences.ui line 113
+#: rc.cpp:397
+#, no-c-format
+msgid "&Beep on error"
+msgstr "&Flauta við villu"
 
-#: commonui/roughtransdlg.cpp:177
+#. i18n: file ./kbabel/editorpreferences.ui line 121
+#: rc.cpp:400
+#, no-c-format
+msgid "Change te&xt color on error"
+msgstr "Breyta te&xtalit við villu"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 150
+#: rc.cpp:403
+#, no-c-format
+msgid "A&ppearance"
+msgstr "Ú&tlit"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 175
+#: rc.cpp:406
+#, no-c-format
+msgid "H&ighlight syntax"
+msgstr "Málfræð&ilitun"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 183
+#: rc.cpp:409
+#, no-c-format
+msgid "Highlight backgrou&nd"
+msgstr "Lita bakgru&nn"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 191
+#: rc.cpp:412
+#, no-c-format
+msgid "Mark &whitespaces with points"
+msgstr "Sýna &bil með punkti"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 199
+#: rc.cpp:415
+#, no-c-format
+msgid "&Show surrounding quotes"
+msgstr "&Sýna gæsalappir"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 209
+#: rc.cpp:418
+#, no-c-format
+msgid "Status LEDs"
+msgstr "Stöðuljós"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 213
+#: rc.cpp:421
+#, no-c-format
 msgid ""
 "<qt>"
-"<p><b>Dictionaries</b></p>"
-"<p>Choose here, which dictionaries have to be used for finding a translation. "
-"If you select more than one dictionary, they are used in the same order as they "
-"are displayed in the list.</p>"
-"<p>The <b>Configure</b> button allows you to temporarily configure selected "
-"dictionary. The original settings will be restored after closing the dialog.</p>"
+"<p><b>Status LEDs</b></p>\n"
+"<p>Choose here where the status LEDs are displayed and what color they have.</p>"
 "</qt>"
 msgstr ""
 "<qt>"
-"<p><b>Orðabækur</b></p>"
-"<p>Veldur hér hvaða orðabækur á að nota til að leita að þýðingu. Veljirðu "
-"fleiri en eina orðabók, þá eru þær notaðar í sömu röð og þær standa á "
-"listanum.</p> "
-"<p><b>Stillingar</b> hnappurinn leyfir þér að breyta tímabundið stillingum "
-"valinnar orðabókar. Upprunalegar stillingar verða enduræstar eftir að þessum "
-"glugga er lokað.</p></qt>"
+"<p><b>Stöðuljós</b></p>\n"
+"<p>Veldu hér hvar á að sýna stöðuljós, og hvaða lit á að nota á þau.</p></qt>"
 
-#: commonui/roughtransdlg.cpp:186
-msgid "Messages:"
-msgstr "Skilaboð:"
+#. i18n: file ./kbabel/editorpreferences.ui line 224
+#: rc.cpp:425
+#, no-c-format
+msgid "Display in stat&usbar"
+msgstr "Sýna í stöð&uslá"
 
-#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
+#. i18n: file ./kbabel/editorpreferences.ui line 232
+#: rc.cpp:428
+#, no-c-format
+msgid "Display in edi&tor"
+msgstr "Sýna í ri&tli"
+
+#. i18n: file ./kbabel/kbabelui.rc line 29
+#: rc.cpp:440 rc.cpp:1189
+#, no-c-format
+msgid "&Go"
+msgstr "&Fara"
+
+#. i18n: file ./kbabel/kbabelui.rc line 50
+#: rc.cpp:443 rc.cpp:1195
+#, no-c-format
+msgid "&Project"
+msgstr "Verk&efni"
+
+#. i18n: file ./kbabel/kbabelui.rc line 58
+#: rc.cpp:449
+#, no-c-format
+msgid "&Spelling"
+msgstr "&Stafsetning"
+
+#. i18n: file ./kbabel/kbabelui.rc line 68
+#: rc.cpp:452
+#, no-c-format
+msgid "D&iff"
+msgstr "Saman&burður"
+
+#. i18n: file ./kbabel/kbabelui.rc line 82
+#: rc.cpp:455
+#, no-c-format
+msgid "&Dictionaries"
+msgstr "&Orðabækur"
+
+#. i18n: file ./kbabel/kbabelui.rc line 100
+#: rc.cpp:467 rc.cpp:1213
+#, no-c-format
+msgid "Main"
+msgstr "Aðal"
+
+#. i18n: file ./kbabel/kbabelui.rc line 113
+#: rc.cpp:470 rc.cpp:1216
+#, no-c-format
+msgid "Navigationbar"
+msgstr "Leiðarstýrislá"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
+#: rc.cpp:473
+#, no-c-format
+msgid "General"
+msgstr "Almennt"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 39
+#: rc.cpp:476 rc.cpp:746 rc.cpp:1077
+#, no-c-format
+msgid "Database"
+msgstr "Gagnagrunnur"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
+#: rc.cpp:479
+#, no-c-format
+msgid "DB folder:"
+msgstr "DB mappa:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
+#: rc.cpp:482
+#, no-c-format
+msgid "Automatic update in kbabel"
+msgstr "Sjálfvirk uppfærsla í kbabel"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
+#: rc.cpp:485
+#, no-c-format
+msgid "New Entries"
+msgstr "Nýjar færslur"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
+#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:488
+#, no-c-format
+msgid "Author:"
+msgstr "Höfundur:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
+#: rc.cpp:491
+#, no-c-format
+msgid "From kbabel"
+msgstr "Frá kbabel"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
+#: rc.cpp:494
+#, no-c-format
+msgid "Algorithm"
+msgstr "Algrím"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
+#: rc.cpp:497
+#, no-c-format
+msgid "Minimum score:"
+msgstr "Lágmarksstig:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
+#: rc.cpp:500
+#, no-c-format
+msgid "Algorithms to Use"
+msgstr "Algrími sem á að nota"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
+#: rc.cpp:503 rc.cpp:506 rc.cpp:524 rc.cpp:527 rc.cpp:530 rc.cpp:533
+#: rc.cpp:536
+#, no-c-format
+msgid "Score:"
+msgstr "Stig:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
+#: rc.cpp:509
+#, no-c-format
+msgid "Fuzzy sentence archive"
+msgstr "Safn yfir loðnar setningar"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
+#: rc.cpp:512
+#, no-c-format
+msgid "Glossary"
+msgstr "Orðasafn"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
+#: rc.cpp:515
+#, no-c-format
+msgid "Exact "
+msgstr "Nákvæmt "
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
+#: rc.cpp:518
+#, no-c-format
+msgid "Sentence by sentence"
+msgstr "Setningu fyrir setningu"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
+#: rc.cpp:521
+#, no-c-format
+msgid "Alphanumeric"
+msgstr "Tölur og bókstafir"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
+#: rc.cpp:539
+#, no-c-format
+msgid "Word by word"
+msgstr "Orð fyrir orð"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
+#: rc.cpp:542
+#, no-c-format
+msgid "Dynamic dictionary"
+msgstr "Breytileg orðabók"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
+#: rc.cpp:545
+#, no-c-format
+msgid "Preferred number of results:"
+msgstr "Fjöldi óskaðra niðurstaðna:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
+#: rc.cpp:548
+#, no-c-format
+msgid "Output"
+msgstr "Úttak"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
+#: rc.cpp:551
+#, no-c-format
+msgid "Output Processing"
+msgstr "Vinn með skrá"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
+#: rc.cpp:554
+#, no-c-format
+msgid "First capital letter match"
+msgstr "Fyrsti hástafur stemmir"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
+#: rc.cpp:557
+#, no-c-format
+msgid "All capital letter match"
+msgstr "Allir hástafir stemma"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
+#: rc.cpp:560
+#, no-c-format
+msgid "Accelerator symbol (&&)"
+msgstr "Hraðvalstákn (&&)"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
+#: rc.cpp:563
+#, no-c-format
+msgid "Try to use same letter"
+msgstr "Reyna að nota sama staf"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
+#: rc.cpp:566
+#, no-c-format
+msgid "Custom Rules"
+msgstr "Sérsniðnar reglur"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
+#: rc.cpp:569
+#, no-c-format
+msgid "Original string regexp:"
+msgstr "Upphafleg regluleg segð:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
+#: rc.cpp:572
+#, no-c-format
+msgid "Enabled"
+msgstr "Virkt"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
+#: rc.cpp:575
+#, no-c-format
+msgid "Description"
+msgstr "Lýsing"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
+#: rc.cpp:587
+#, no-c-format
+msgid "Replace string:"
+msgstr "Skipta út streng:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
+#: rc.cpp:590
+#, no-c-format
+msgid "Translated regexp(search):"
+msgstr "Þýdd regluleg segð (leit):"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
+#: rc.cpp:599
+#, no-c-format
+msgid "Check language"
+msgstr "Athugaðu tungumálið"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
+#: rc.cpp:602
+#, no-c-format
+msgid "Use current filters"
+msgstr "Nota núverandi síur"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
+#: rc.cpp:605
+#, no-c-format
+msgid "Set date to today"
+msgstr "Nota núverandi dags."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
+#: rc.cpp:608
+#, no-c-format
+msgid "Sources"
+msgstr "Kóði"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
+#: rc.cpp:617
+#, no-c-format
+msgid "Scan Now"
+msgstr "Leita núna"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
+#: rc.cpp:623
+#, no-c-format
+msgid "Scan All"
+msgstr "Leita í öllum"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
+#: rc.cpp:626
+#, no-c-format
+msgid "Filters"
+msgstr "Síur"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
+#: rc.cpp:629
+#, no-c-format
+msgid "DBSEPrefWidget"
+msgstr "DBSEPrefWidget"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 41
+#: rc.cpp:632 rc.cpp:800 rc.cpp:963 rc.cpp:1131
+#, no-c-format
+msgid "Generic"
+msgstr "Almennt"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 58
+#: rc.cpp:635 rc.cpp:966
+#, no-c-format
+msgid "Search Mode"
+msgstr "Leitarskilyrði"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 75
+#: rc.cpp:638 rc.cpp:969
+#, no-c-format
+msgid "Search in whole database (slow)"
+msgstr "Leita í öllum gagnagrunni (hægvirkt)"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 80
+#: rc.cpp:641 rc.cpp:972
+#, no-c-format
 msgid ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
+"<qml>Scroll the whole database and return everything that matches \n"
+"according to the rules defined in tabs <strong> Generic </strong>\n"
+"and <strong>Match</strong>"
 msgstr ""
-"Niðurstaða þýðingar:\n"
-"Breyttar færslur: %1\n"
-"Nákvæmar þýðingar: %2 (%3%)\n"
-"Áætlaðar þýðingar: %4 (%5%)\n"
-"Ekkert fannst: %6 (%7%)"
+"<qml>Leita í öllum gagnagrunninum og skila færslum sem passa við \n"
+"skilyrðin í <strong> Alment </strong> og <strong>Leita</strong> flipunum"
 
-#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
-msgid "Rough Translation Statistics"
-msgstr "Tölfræði yfir grófa þýðingu"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
+#: rc.cpp:646 rc.cpp:977
+#, no-c-format
+msgid "Search in list of \"good keys\" (best)"
+msgstr "Leita í \"góðir lyklar\" (best)"
 
-#: commonui/roughtransdlg.cpp:744
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 95
+#: rc.cpp:649 rc.cpp:980
+#, no-c-format
+msgid ""
+"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
+"tab) with rules defined in <strong>Search</strong> tab.\n"
+"This is the best way to search because the <em>good keys</em> "
+"list probably contains all the keys that match with your query. However, it is "
+"smaller than the whole database."
+msgstr ""
+"<qml> Leita í <em>góðum lyklum</em> (skoðaðu <strong>Góðir lyklar</strong> "
+"flipann) með reglunum sem eru skilgreindar í <strong>Leitar</strong> flipanum.\n"
+"Þetta er besta leitaraðferðin þar sem <em>góðir lyklar</em> "
+"listinn inniheldur trúlega alla lyklana sem passa við leitina þína. Hinsvegar "
+"er hann minni en allur gagnagrunnurinn."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 103
+#: rc.cpp:653 rc.cpp:984
+#, no-c-format
+msgid "Return the list of \"good keys\" (fast)"
+msgstr "Skila listanum með \"góðum lyklum\" (hraðvirkt)"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 106
+#: rc.cpp:656 rc.cpp:987
+#, no-c-format
+msgid ""
+"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
+"Search</strong> tab are ignored."
+msgstr ""
+"<qml>Skilar öllum <em>góðir lyklar</em> listanum. Reglur sem eru skilgreindar í "
+"<strong>Leita</strong> flipanum eru hunsaðar."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 116
+#: rc.cpp:659 rc.cpp:990
+#, no-c-format
+msgid "Case sensitive"
+msgstr "Háð há/lágstöfum"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 119
+#: rc.cpp:662 rc.cpp:993
+#, no-c-format
+msgid ""
+"<qml>If it is checked the search will be case sensitive. It is ignored if you "
+"use <em>Return the list of \"good keys\"</em> search mode."
+msgstr ""
+"<qml>Ef valið, er leitin háð stafastöðunni. Þetta er hunsað ef þú notar <em>"
+"Skila listanum með \"góðum lyklum\"</em>."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 127
+#: rc.cpp:665 rc.cpp:996
+#, no-c-format
+msgid "Normalize white space"
+msgstr "Lagfæra orðabil"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 134
+#: rc.cpp:668 rc.cpp:999
+#, no-c-format
+msgid ""
+"Remove white spaces at the beginning and at the end of the phrase.\n"
+"It also substitutes groups of more than one space character with only one space "
+"character."
+msgstr ""
+"Fjarlægja orðabil við upphaf og enda setningarinnar.Skiptir einnig fleiri en "
+"einu\n"
+"bili út með einu."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 142
+#: rc.cpp:672 rc.cpp:1003
+#, no-c-format
+msgid "Remove context comment"
+msgstr "Fjarlægja samhengis athugasemdir"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 148
+#: rc.cpp:675 rc.cpp:1006
+#, no-c-format
+msgid "Remove, if exists, the _:comment"
+msgstr "Fjarlægir, ef finnst, _:athugasemd"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 170
+#: rc.cpp:678 rc.cpp:1009
+#, no-c-format
+msgid "Character to be ignored:"
+msgstr "Stafir sem á að hunsa:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 212
+#: rc.cpp:681 rc.cpp:1012
+#, no-c-format
+msgid "Search"
+msgstr "Leita"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 229
+#: rc.cpp:684 rc.cpp:1015
+#, no-c-format
+msgid "Matching Method"
+msgstr "Leitarskilyrði"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 280
+#: rc.cpp:687 rc.cpp:1018
+#, no-c-format
+msgid "Query is contained"
+msgstr "Inniheldur leitarstreng"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 283
+#: rc.cpp:690 rc.cpp:1021
+#, no-c-format
+msgid "Match if query is contained in database string"
+msgstr "Passar ef færsla í gagnagrunni inniheldur leitarstrenginn"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 291
+#: rc.cpp:693 rc.cpp:1024
+#, no-c-format
+msgid "Query contains"
+msgstr "Inniheldur færslu"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 294
+#: rc.cpp:696 rc.cpp:1027
+#, no-c-format
+msgid "Match if query contains the database string"
+msgstr "Passar ef leitarstrengur inniheldur færslu í gagnagrunni"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 302
+#: rc.cpp:699 rc.cpp:1030
+#, no-c-format
+msgid "Normal text"
+msgstr "Venjulegur texti"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 308
+#: rc.cpp:702 rc.cpp:1033
+#, no-c-format
+msgid "Consider the search string as normal text."
+msgstr "Nota leitarstrengin sem venjulegan texta"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 316
+#: rc.cpp:705 rc.cpp:1036
+#, no-c-format
+msgid "Equal"
+msgstr "Líkt"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 325
+#: rc.cpp:708 rc.cpp:1039
+#, no-c-format
+msgid "Match if query and database string are equal"
+msgstr "Passar ef leitarstrengur og færsla í gagnagrunni eru lík"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 350
+#: rc.cpp:711 rc.cpp:1042
+#, no-c-format
+msgid "Regular expression"
+msgstr "Regluleg segð"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 353
+#: rc.cpp:714 rc.cpp:1045
+#, no-c-format
+msgid "Consider the search string as a regular expression"
+msgstr "Nota leitarstrengin sem reglulega segð"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 363
+#: rc.cpp:717 rc.cpp:1048
+#, no-c-format
+msgid "Word Substitution"
+msgstr "Orðaskipting"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 368
+#: rc.cpp:720 rc.cpp:1051
+#, no-c-format
+msgid ""
+"<qml>If you use one or two <em>word substitution</em> "
+"each time you search a phrase with less than the specified number of words, the "
+"search engine will also search for all phrases that differ from the original "
+"one in one or two words."
+"<p>\n"
+"<strong>Example:</strong>"
+"<br>\n"
+"If you search for <em>My name is Andrea</em> and you have activated <em>"
+"one word substitution</em> you may also find phrases like <em>"
+"My name is Joe</em> or <em>Your name is Andrea</em>."
+msgstr ""
+"<qml>Ef þú notar eins eða tveggja <em>orðaskiptingu</em> "
+"mun leitarvélin leita eftir líkum setningum sem innihalda eitt eða tvö ólík "
+"orð."
+"<p>\n"
+"<strong>Dæmi:</strong>"
+"<br>\n"
+"Ef að þú leitaðir eftir <em>Ég heiti María</em> með <em>eins orðaskiptingu</em> "
+"gæti leitarniðurstaðan einnig fundið <em>Ég heiti Ásbjörn</em>."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 402
+#: rc.cpp:725 rc.cpp:1056
+#, no-c-format
+msgid "Use one word substitution"
+msgstr "Nota eins orðaskiptingu"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 433
+#: rc.cpp:728 rc.cpp:734 rc.cpp:1059 rc.cpp:1065
+#, no-c-format
+msgid "Max number of words in the query:"
+msgstr "Hámarksfjöldi af orðum í fyrirspurninni:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 458
+#: rc.cpp:731 rc.cpp:1062
+#, no-c-format
+msgid "Use two word substitution"
+msgstr "Nota tveggja orðaskiptingu"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 491
+#: rc.cpp:737 rc.cpp:1068
+#, no-c-format
+msgid "[A-Za-z0-9_%"
+msgstr "[A-Za-z0-9_%"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 509
+#: rc.cpp:740 rc.cpp:1071
+#, no-c-format
+msgid "]"
+msgstr "]"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 519
+#: rc.cpp:743 rc.cpp:1074
+#, no-c-format
+msgid "Local characters for regular expressions:"
+msgstr "Staðbundin tákn fyrir reglulega segð:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 573
+#: rc.cpp:749 rc.cpp:1080
+#, no-c-format
+msgid "Database folder:"
+msgstr "Mappa fyrir gagnagrunn:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 589
+#: rc.cpp:752 rc.cpp:1083
+#, no-c-format
+msgid "Auto add entry to database"
+msgstr "Bætja sjálfkrafa við nýjum færslum"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 595
+#: rc.cpp:755 rc.cpp:1086
+#, no-c-format
+msgid ""
+"Automatically add an entry to the database if a new translation is notified by "
+"someone (may be kbabel)"
+msgstr ""
+"Bæta sjálfkrafa við færslum í gagnagrunn ef ný þýðing er tilkynnt af einhverjum "
+"(getur verið KBabel)"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 617
+#: rc.cpp:758 rc.cpp:1089
+#, no-c-format
+msgid "Auto added entry author:"
+msgstr "Höfundur:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 625
+#: rc.cpp:761 rc.cpp:1092
+#, no-c-format
+msgid ""
+"<qml>Put here the name and email address that you want to use as <em>"
+"last translator</em> filed when you auto-add entry to the database (e.g. when "
+"you modify a translation with kbabel)."
+"<p>"
+msgstr ""
+"<qml>Settu hér nafn og netfang sem þú vilt nota sem <em>síðasti þýðandi</em> "
+"þegar þú bætir sjálfkrafa færslum í gagnarunninn (þ.e.a.s. þegar þú breytir "
+"þýðingu með kbabel)."
+"<p>"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
+#: rc.cpp:764
+#, no-c-format
+msgid "Scan Single PO File"
+msgstr "Leita í einni PO skrá"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
+#: rc.cpp:767
+#, no-c-format
+msgid "Scan Folder"
+msgstr "Leita í möppu"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
+#: rc.cpp:770
+#, no-c-format
+msgid "Scan Folder && Subfolders"
+msgstr "Leita í möppu og undirmöppum hennar"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
+#: rc.cpp:773 rc.cpp:1104
+#, no-c-format
+msgid "Scanning file:"
+msgstr "Skoða skrá:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 681
+#: rc.cpp:776 rc.cpp:1107
+#, no-c-format
+msgid "Entries added:"
+msgstr "Reitir sem bætt hefur verið við:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 722
+#: rc.cpp:779 rc.cpp:1110
+#, no-c-format
+msgid "Total progress:"
+msgstr "Heildarframför:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 730
+#: rc.cpp:782 rc.cpp:1113
+#, no-c-format
+msgid "Processing file:"
+msgstr "Vinn með skrá:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 766
+#: rc.cpp:785 rc.cpp:1116
+#, no-c-format
+msgid "Loading file:"
+msgstr "Hleð inn skrá:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 779
+#: rc.cpp:788 rc.cpp:1119
+#, no-c-format
+msgid "Export..."
+msgstr "Flytja út..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
+#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:791 rc.cpp:1122
+#, no-c-format
+msgid "Statistics"
+msgstr "Tölfræði"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
+#: rc.cpp:794 rc.cpp:1125
+#, no-c-format
+msgid "Repeated Strings"
+msgstr "Endurteknir strengir"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 808
+#: rc.cpp:797 rc.cpp:1128
+#, no-c-format
+msgid "Good Keys"
+msgstr "Góðir lyklar"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 832
+#: rc.cpp:803 rc.cpp:1134
+#, no-c-format
+msgid ""
+"<qml>Here you can define how to fill the <em>good keys list</em>."
+"<p>\n"
+"You can set the minimum number of words of the query that a key must have to be "
+"inserted in the <em>good keys list</em>."
+"<p>\n"
+"You can also set the minimum number of words of the key that the query must "
+"have to insert the key in the list."
+"<p>\n"
+"These two numbers are the percentage of the total number of words. If the "
+"result of this percentage is less than one, the engine will set it to one."
+"<p>\n"
+"Finally you can set the maximum number of entries in the list."
+msgstr ""
+"<qml>Hér getur þú skilgreint hvernig á að fylla <em>góðir lyklar</em> listann."
+"<p>\n"
+"Þú getur sett inn lágmarksfjölda af orðum sem leitarstrengurinn verður að "
+"innihalda til að vera bætt í <em>góðir lyklar</em> listann."
+"<p>\n"
+"Einnig getur þú sett inn lágmarksfjölda af orðum sem leitarstrengurinn verður "
+"að innihalda til að vera settur í listann."
+"<p>\n"
+"Þessar tvær tölur eru prósentan af heildar orðafjöldanum. Ef niðurstaða "
+"prósentunar er minni en einn, verður vélin sett á einn. "
+"<p>\n"
+"Að lokum getur þú sett inn hámarksfjölda af færslum í listann."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 849
+#: rc.cpp:810 rc.cpp:1141
+#, no-c-format
+msgid "Minimum number of words of the key also in the query (%):"
+msgstr ""
+"Lágmarksfjöldi af orðum í leitarstreng sem einnig finnast í færslu (%):"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 874
+#: rc.cpp:813 rc.cpp:819 rc.cpp:1144 rc.cpp:1150
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 888
+#: rc.cpp:816 rc.cpp:1147
+#, no-c-format
+msgid "Minimum number of query words in the key (%):"
+msgstr "Lágmarskfjöldi af leitarorðum í lykli (%):"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 921
+#: rc.cpp:822 rc.cpp:1153
+#, no-c-format
+msgid "Max list length:"
+msgstr "Hámarkslengd lista:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 945
+#: rc.cpp:825 rc.cpp:1156
+#, no-c-format
+msgid "Frequent Words"
+msgstr "Algeng orð"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 962
+#: rc.cpp:828 rc.cpp:1159
+#, no-c-format
+msgid "Discard words more frequent than:"
+msgstr "Sleppa orðum sem eru algengari en:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 970
+#: rc.cpp:831 rc.cpp:1162
+#, no-c-format
+msgid "/10000"
+msgstr "/10000"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 987
+#: rc.cpp:834 rc.cpp:1165
+#, no-c-format
+msgid "Frequent words are considered as in every key"
+msgstr "Algeng orð eru þau sem koma fyrir í öllum lyklum"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
+#: rc.cpp:837
+#, no-c-format
+msgid "Edit Source"
+msgstr "Breyta uppruna"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
+#: rc.cpp:846
+#, no-c-format
+msgid "Additional Informations"
+msgstr "Viðbótarupplýsingar"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
+#: kbabel/kbabel.cpp:713 rc.cpp:849
+#, no-c-format
+msgid "Status: "
+msgstr "Staða: "
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
+#: rc.cpp:852
+#, no-c-format
+msgid "Project name:"
+msgstr "Nafn verkefnis:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
+#: rc.cpp:855
+#, no-c-format
+msgid "Project keywords:"
+msgstr "Stikkorð verkefnis:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
+#: rc.cpp:858
+#, no-c-format
+msgid "General Info"
+msgstr "Almennar upplýsingar"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
+#: rc.cpp:861
+#, no-c-format
+msgid "Single File"
+msgstr "Ein skrá"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
+#: rc.cpp:864
+#, no-c-format
+msgid "Single Folder"
+msgstr "Ein mappa"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
+#: rc.cpp:867
+#, no-c-format
+msgid "Recursive Folder"
+msgstr "Arfgeng mappa"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
+#: rc.cpp:870
+#, no-c-format
+msgid "Source name:"
+msgstr "Kóði:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
+#: rc.cpp:873
+#, no-c-format
+msgid "Type:"
+msgstr "Tegund:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
+#: rc.cpp:876
+#, no-c-format
+msgid "Setup Filter..."
+msgstr "Setja upp síu..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
+#: rc.cpp:879
+#, no-c-format
+msgid "Location:"
+msgstr "Staðsetning:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
+#: rc.cpp:882
+#, no-c-format
+msgid "Use filter"
+msgstr "Nota síu"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 40
+#: rc.cpp:885 rc.cpp:933
+#, no-c-format
+msgid "&Path to Compendium File"
+msgstr "Slóð að ágri&paskrá"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
+#: rc.cpp:891
+#, no-c-format
+msgid "Ignore &fuzzy strings"
+msgstr "Hunsa &loðna strengi"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 113
+#: rc.cpp:894 rc.cpp:939
+#, no-c-format
+msgid "Onl&y whole words"
+msgstr "Einung&is heil orð"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 124
+#: rc.cpp:897 rc.cpp:942
+#, no-c-format
+msgid "Case sensiti&ve"
+msgstr "Háð há/lágstöfum"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 148
+#: rc.cpp:900 rc.cpp:945
+#, no-c-format
+msgid "A text matches if:"
+msgstr "Texti passar ef:"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 174
+#: rc.cpp:903 rc.cpp:948
+#, no-c-format
+msgid "E&qual to searched text"
+msgstr "&Eins og leitartextinn"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 185
+#: rc.cpp:906 rc.cpp:951
+#, no-c-format
+msgid "Contains a &word of searched text"
+msgstr "inniheldur &orð af leitartextanum"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 196
+#: rc.cpp:909 rc.cpp:954
+#, no-c-format
+msgid "Co&ntained in searched text"
+msgstr "Er í leitartexta&num"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 207
+#: rc.cpp:912 rc.cpp:957
+#, no-c-format
+msgid "&Similar to searched text"
+msgstr "&Svipað og leitartextinn"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 218
+#: rc.cpp:915 rc.cpp:960
+#, no-c-format
+msgid "Contains searched te&xt"
+msgstr "inniheldur leitarte&xtann"
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
+#: rc.cpp:918
+#, no-c-format
+msgid "&Path to auxiliary file:"
+msgstr "&Slóð að viðbótarskrá:"
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
+#: rc.cpp:921
+#, no-c-format
+msgid "&Ignore fuzzy entries"
+msgstr "&Hunsa loðnar færslur"
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
+#: rc.cpp:924
+#, no-c-format
 msgid ""
 "<qt>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
+"<p>\n"
+"The following variables will be replaced in the path if available:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
+"package</li>\n"
+"<li><b>@LANG@</b>: the language code</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
+"nth folder counted from the filename</li>\n"
+"</ul></p></qt>"
 msgstr ""
 "<qt>"
-"<p>Þegar þýðing finnst fyrir skilaboð, er færslan sjálfkrafa merkt sem <b>"
-"loðin</b>. Ástæðan er að KBabel bara giskar á þýðinguna og þú ættir alltaf að "
-"skoða niðurstöðuna vandlega. Aftengdu þennan valmöguleika aðeins ef þú veist "
-"hvað þú ert að gera.</p></qt>"
+"<p>\n"
+"Eftirfarandi færslum verður skipt út í slóðinni ef þær finnast:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: nafnið á þýdda forritinu eða pakkanum</li>\n"
+"<li><b>@LANG@</b>: tungumálakóðinn</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: þar sem n er jákvæð heiltala. Farið er þá í "
+"uppgefna fjöldann undir skráarnafninu</li>\n"
+"</ul></p></qt>"
 
-#: commonui/projectwizard.cpp:78
-msgid "Basic Project Information"
-msgstr "Upplýsingar um verkefnið"
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
+#: rc.cpp:1095
+#, no-c-format
+msgid "Scan Single PO File..."
+msgstr "Leita í einni PO skrá..."
 
-#: commonui/projectwizard.cpp:83
-msgid "Translation Files"
-msgstr "Þýðingarskrár"
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
+#: rc.cpp:1098
+#, no-c-format
+msgid "Scan Folder..."
+msgstr "Leita í möppu..."
 
-#: commonui/projectwizard.cpp:140
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
+#: rc.cpp:1101
+#, no-c-format
+msgid "Scan Folder && Subfolders..."
+msgstr "Leita í möppu og undirmöppum hennar..."
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 32
+#: rc.cpp:1168
+#, no-c-format
+msgid "Mark invalid as &fuzzy"
+msgstr "Merkja ógildar &færslur sem loðnar"
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 39
+#: rc.cpp:1171
+#, no-c-format
 msgid ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
+"<qt>"
+"<p><b>Mark invalid as fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items,\n"
+"which identifies the tool as invalid, will be\n"
+"marked as fuzzy and the resulting file\n"
+"will be saved.</p></qt>"
 msgstr ""
-"Skráin %1 er þegar til.\n"
-"Viltu yfirskrifa hana?"
+"<qt>"
+"<p><b>Merkja ógildar færslur sem loðnar</b>"
+"<p>\n"
+"<p>Ef þú velur þennan valkost, verða allar\n"
+"færslur sem eru ógildar merktar sem loðnar\n"
+"og skráin verður vistuð.</p></qt>"
 
-#: commonui/projectwizard.cpp:141
-msgid "File Exists"
-msgstr "Skrá þegar til"
+#. i18n: file ./catalogmanager/validationoptions.ui line 47
+#: rc.cpp:1178
+#, no-c-format
+msgid "&Do not validate fuzzy"
+msgstr "&Ekki staðfesta loðnar færslur"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:50
-msgid "Catalog Information"
-msgstr "Upplýsingar"
+#. i18n: file ./catalogmanager/validationoptions.ui line 52
+#: rc.cpp:1181
+#, no-c-format
+msgid ""
+"<qt>"
+"<p><b>Do not validate fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items\n"
+"marked as fuzzy will not be validated at all.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Ekki staðfesta loðnar færslur</b>"
+"<p>\n"
+"<p>Ef þú velur þennan valkost, verða færslur\n"
+"sem eru merktar loðnar ekki staðfestar.</p></qt>"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:53
-msgid "Total Messages"
-msgstr "Fjöldi skilaboða"
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
+#: rc.cpp:1192
+#, no-c-format
+msgid "&Markings"
+msgstr "&Merkingar"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:54
-msgid "Fuzzy Messages"
-msgstr "Loðin skilaboð"
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
+#: rc.cpp:1201 rc.cpp:1219 rc.cpp:1225
+#, no-c-format
+msgid "CVS"
+msgstr "CVS"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:55
-msgid "Untranslated Messages"
-msgstr "Óþýdd skilaboð"
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
+#: catalogmanager/future.cpp:4 rc.cpp:1204 rc.cpp:1222 rc.cpp:1228
+#, no-c-format
+msgid "SVN"
+msgstr "SVN"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:56
-#: catalogmanager/catalogmanagerview.cpp:96
-msgid "Last Translator"
-msgstr "Síðasti þýðandi"
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
+#: rc.cpp:1231
+#, no-c-format
+msgid "To be set dynamically:"
+msgstr "Sett breytilega:"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:57
-msgid "Language Team"
-msgstr "Tungumálahópur"
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
+#: rc.cpp:1240
+#, no-c-format
+msgid "&Include templates"
+msgstr "Taka með sn&iðskrár"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:58
-msgid "Revision"
-msgstr "Síðast yfirfarið"
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
+#: rc.cpp:1243
+#, no-c-format
+msgid "Use &wildcards"
+msgstr "Nota &algildisstafi"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
+#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1252
+#, no-c-format
+msgid "Current:"
+msgstr "Núverandi:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
+#: rc.cpp:1255
+#, no-c-format
+msgid "Overall:"
+msgstr "Allt:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
+#: rc.cpp:1258
+#, no-c-format
+msgid "Current file:"
+msgstr "Núverandi skrá:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
+#: rc.cpp:1261
+#, no-c-format
+msgid "Validation:"
+msgstr "Prófun:"
 
 #: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
 msgid ""
@@ -1359,93 +3140,354 @@ msgid ""
 "Your emails"
 msgstr "throstur@bylur.net, leosson@frisurf.no, stigur@vortex.is"
 
-#: datatools/punctuation/main.cc:58
+#: kbabel/kbabelview2.cpp:538
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"punctuation"
-msgstr "greinamerki"
+"An error occurred while trying to get the list of messages for this file from "
+"the database:\n"
+"%1"
+msgstr ""
+"Villa kom upp þegar reynt var að fá lista yfir skilaboð í þessari skrá frá "
+"gagnagrunninum:\n"
+"%1"
 
-#: datatools/whitespace/main.cc:60
+#: kbabel/kbabelview2.cpp:624
+msgid "No difference found"
+msgstr "Engin mismunur fannst"
+
+#: kbabel/kbabelview2.cpp:628
+msgid "Difference found"
+msgstr "Mismunur fannst"
+
+#: kbabel/kbabelview2.cpp:636
+msgid "No corresponding message found."
+msgstr "Samsvarandi skilaboðaskrá fannst ekki."
+
+#: kbabel/kbabelview2.cpp:641
+msgid "No corresponding message found"
+msgstr "Samsvarandi skilaboðaskrá fannst ekki"
+
+#: kbabel/kbabelview2.cpp:696
+msgid "Select File to Diff With"
+msgstr "Veldu skrá til að samanbera við"
+
+#: kbabel/kbabelview2.cpp:710
+msgid "loading file for diff"
+msgstr "Hleð inn skrá til samanburðar"
+
+#: catalogmanager/multiroughtransdlg.cpp:84
+#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
+#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
 msgid ""
-"_: which check found errors\n"
-"whitespace only translation"
-msgstr "tóm þýðing"
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid PO file."
+msgstr ""
+"Villa við lestur skráar:\n"
+" %1\n"
+"Kannski er þetta ekki gild PO-skrá."
 
-#: datatools/equations/main.cc:58
+#: kbabel/kbabelview.cpp:1207 kbabel/kbabelview.cpp:1325
+#: kbabel/kbabelview2.cpp:731
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"equations"
-msgstr "jöfnur"
+"You do not have permissions to read file:\n"
+" %1"
+msgstr ""
+"Þú hefur ekki réttindi til að lesa skrána:\n"
+" %1"
 
-#: datatools/not-translated/main.cc:60
+#: kbabel/kbabelview.cpp:1213 kbabel/kbabelview.cpp:1330
+#: kbabel/kbabelview2.cpp:738
+#, c-format
 msgid ""
-"_: which check found errors\n"
-"English text in translation"
-msgstr "Enskur texti í þýðingum"
+"You have not specified a valid file:\n"
+" %1"
+msgstr ""
+"Þú hefur ekki tilgreint gilda skrá:\n"
+" %1"
 
-#: datatools/xml/main.cc:60
+#: kbabel/kbabelview.cpp:1219 kbabel/kbabelview.cpp:1336
+#: kbabel/kbabelview.cpp:1488 kbabel/kbabelview2.cpp:745
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"XML tags"
-msgstr "XML tög"
+"KBabel cannot find a corresponding plugin for the MIME type of the file:\n"
+" %1"
+msgstr ""
+"KBabel fann ekkert viðbótaríforrit fyrir MIME tegundina:\n"
+" %1"
 
-#: datatools/accelerators/main.cc:58
+#: kbabel/kbabelview.cpp:1225 kbabel/kbabelview.cpp:1342
+#: kbabel/kbabelview2.cpp:751
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"accelerator"
-msgstr "hröðunartákn"
+"The import plugin cannot handle this type of the file:\n"
+" %1"
+msgstr ""
+"Innflutningsíforritið getur ekki höndlað skrár af tegundinni:\n"
+" %1"
 
-#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
+#: catalogmanager/catalogmanagerview.cpp:448
+#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
+#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
+#, c-format
 msgid ""
-"_: which check found errors\n"
-"translation has inconsistent length"
-msgstr "lengd þýðingar passar ekki"
+"Error while trying to open file:\n"
+" %1"
+msgstr ""
+"Villa við opnun skráar:\n"
+" %1"
 
-#: datatools/regexp/main.cc:58
-msgid "Error loading data (%1)"
-msgstr "Villa við hleðslu af gögnum (%1)"
+#: kbabel/kbabelview2.cpp:801
+msgid ""
+"The search string has not been found yet.\n"
+"However, the string might be found in the files being searched at the moment.\n"
+"Please try later."
+msgstr ""
+"Leitarstrengurinn hefur ekki fundist ennþá.\n"
+"Hann gæti hinsvegar fundist í skránum sem er verið að leita í núna.\n"
+"Vinsamlega reyndu aftur seinna."
 
-#: datatools/regexp/main.cc:118
-msgid "File not found"
-msgstr "Skrá fannst ekki"
+#: kbabel/kbabelview2.cpp:810
+msgid "Do not show in this find/replace session again"
+msgstr "Ekki sýna þessi skilaboð aftur í þessari lotu"
 
-#: datatools/regexp/main.cc:123
-msgid "The file is not a XML"
-msgstr "Skráin er ekki XML"
+#: kbabel/kbabelview2.cpp:825
+msgid "Enter new package for the current file:"
+msgstr "Sláðu inn nýja pakkann fyrir skrána sem er opin:"
 
-#: datatools/regexp/main.cc:147
-msgid "Expected tag 'item'"
-msgstr "Átti von á taginu 'item'"
+#: kbabel/kbabelview.cpp:1769 kbabel/kbabelview2.cpp:948
+msgid "No mismatch has been found."
+msgstr "Enginn mismunur fannst."
 
-#: datatools/regexp/main.cc:153
-msgid "First child of 'item' is not a node"
-msgstr "Fyrsti undirflokkur 'item' er ekki hnúður"
+#: kbabel/kbabelview.cpp:1784 kbabel/kbabelview2.cpp:965
+msgid ""
+"Some mismatches have been found.\n"
+"Please check the questionable entries by using Go->Next error"
+msgstr ""
+"Nokkrar villur fundust.\n"
+"Vinsamlegast athugaðu vafasömu reitina með því að nota\n"
+"Fara->Næsta villa"
 
-#: datatools/regexp/main.cc:159
-msgid "Expected tag 'name'"
-msgstr "Átti von á taginu 'name'"
+#: kbabel/kbabelview2.cpp:1021
+msgid ""
+"Total words: %1\n"
+"\n"
+"Words in untranslated messages: %2\n"
+"\n"
+"Words in fuzzy messages: %3"
+msgstr ""
+"Fjöldi orða: %1\n"
+"\n"
+"Orð í óþýddum skilaboðum: %2\n"
+"\n"
+"Orð í loðnum skilaboðum: %3"
 
-#: datatools/regexp/main.cc:167
-msgid "Expected tag 'exp'"
-msgstr "Átti von á taginu 'exp'"
+#: kbabel/kbabelview2.cpp:1024
+msgid "Word Count"
+msgstr "Fjöldi orða"
 
-#: datatools/pluralforms/main.cc:59
+#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
+msgid "Table:"
+msgstr "Tafla:"
+
+#: kbabel/charselectview.cpp:84
 msgid ""
-"_: what check found errors\n"
-"plural forms"
-msgstr "fleirtöluform"
+"<qt>"
+"<p><b>Character Selector</b></p>"
+"<p>This tool allows to insert special characters using double click.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Stafaveljari</b></p>"
+"<p>Þetta tól leyfir þér að setja inn sérstaka stafi með því að tvísmella á "
+"þá.</p></qt>"
 
-#: datatools/context/main.cc:58
+#: kbabel/headereditor.cpp:60
+msgid "&Apply Settings"
+msgstr "Virkja stilling&ar"
+
+#: kbabel/headereditor.cpp:61
 msgid ""
-"_: what check found errors\n"
-"context info"
-msgstr "Samhengisupplýsingar"
+"<qt>"
+"<p>This button updates the header using the current settings. The resulting "
+"header is the one that would be written into the PO file on saving.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>Þessi hnappur uppfærir hausinn með núverandi stillingum. Hann verður síðan "
+"skrifaður í PO skránna við vistun.</p></qt>"
 
-#: datatools/arguments/main.cc:57
+#: kbabel/headereditor.cpp:65
+msgid "&Reset"
+msgstr "F&rumstilla"
+
+#: kbabel/headereditor.cpp:66
+msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>>Þessi hnappur tekur til baka allar breytingar sem hafa verið gerðar.</p>"
+"</qt>"
+
+#: kbabel/headereditor.cpp:111
+#, c-format
+msgid "Header Editor for %1"
+msgstr "Hausaritill fyrir %1"
+
+#: kbabel/headereditor.cpp:136
 msgid ""
-"_: what check found errors\n"
-"arguments"
-msgstr "breytur"
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
+msgstr ""
+"<qt>"
+"<p>Þetta er ekki gildur haus</p>\n"
+"<p>Vinsamlegast breyttu honum áður en þú uppfærir.</p></qt>"
+
+#: kbabel/headereditor.cpp:172
+msgid ""
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>Þetta er ekki gildur haus</p>\n"
+"<p>Vinsamlegast breyttu honum áður en þú uppfærir.</p></qt>"
+
+#: kbabel/commentview.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Comment Editor</b></p>\n"
+"This edit window shows you the comments of the currently displayed message."
+"<p>\n"
+"<p>The comments normally contain information about where the message is found "
+"in the source\n"
+"code and status information about this message (fuzzy, c-format).\n"
+"Hints from other translators are also sometimes contained in comments.</p>\n"
+"<p>You can hide the comment editor by deactivating\n"
+"<b>Options->Show Comments</b>.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Athugasemdaritill</b></p>\n"
+"Hér sérðu athugasemdir virku færslunar."
+"<p>\n"
+"<p>Athugasemdirnar segja vanalega hvar skilaboðin er að finna í kóðanum,\n"
+"og sýna stöðu færslunar (loðin, c-viðföng).\n"
+"Einnig geta þýðendur sett sínar athugasemdir inn hér.</p>\n"
+"<p>Þú getur falið athugasemdaritilinn með því að afvelja\n"
+"<b>Stillingar->Sýna athugasemdir</b>.</p></qt>"
+
+#: kbabel/main.cpp:537
+msgid "Go to entry with msgid <msgid>"
+msgstr "Fara að færslu með msgid <msgid>"
+
+#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
+msgid "Disable splashscreen at startup"
+msgstr "Ekki sýna ræsiskjá í upphafi"
+
+#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
+msgid "File to load configuration from"
+msgstr "Skrá sem inniheldur stillingar"
+
+#: kbabel/main.cpp:540
+msgid "Files to open"
+msgstr "skrár til að opna"
+
+#: kbabel/main.cpp:547
+msgid "KBabel"
+msgstr "KBabel"
+
+#: kbabel/main.cpp:548
+msgid "An advanced PO file editor"
+msgstr "Þróaður PO-ritill"
+
+#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
+msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
+msgstr "(c) 1999,2000,2001,2002,2003,2004,2005,2006 KBabel forritararnir"
+
+#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
+msgid "Original author"
+msgstr "Upprunalegur höfundur"
+
+#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
+msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
+msgstr "Skrifaði diff algrími, lagaði KSpell og kom með mörg góð ráð."
+
+#: kbabel/main.cpp:555
+msgid ""
+"Wrote the dictionary plugin for searching in a database and some other code."
+msgstr "Skrifaði orðabókaríforritið til að leita í gagnagrunni og annan kóða."
+
+#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
+#, fuzzy
+msgid "Current maintainer, porting to KDE3/Qt3."
+msgstr "Núverandi umsjónarmaður, flutningur í TDE3/Qt3."
+
+#: kbabel/main.cpp:560
+msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
+msgstr ""
+"Villuleiðréttingar, KFilePlugin fyrir PO skrár, CVS stuðningur, póstsending af "
+"skrám"
+
+#: kbabel/main.cpp:562
+msgid "Translation List View"
+msgstr "Þýðingalistasýn"
+
+#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
+msgid "Current maintainer"
+msgstr "Núverandi umsjónarmaður"
+
+#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
+msgid ""
+"Wrote documentation and sent many bug reports and suggestions for improvements."
+msgstr ""
+"Skrifaði skjöl og kom með margar villuskýrslur og tillögur að endurbætum."
+
+#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
+msgid ""
+"Gave many suggestions for the GUI and the behavior of KBabel. He also "
+"contributed the beautiful splash screen."
+msgstr ""
+"Kom með margar hugmyndir um viðmótið og hegðun KBabel. Hannaði einnig "
+"upphafsskjáinn."
+
+#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
+#, fuzzy
+msgid ""
+"Helped keep KBabel up to date with the KDE API and gave a lot of other help."
+msgstr ""
+"Hjálpaði við að halda KBabel í takt við TDE API og kom með mikla aðra hjálp."
+
+#: kbabel/main.cpp:574
+msgid "Implemented XML validation/highlighting plus other small fixes."
+msgstr "Útfærði XML staðfestingu/litun, ásamt öðrum smálagfæringum."
+
+#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
+msgid "Various validation plugins."
+msgstr "Ýmis prófunaríforrit"
+
+#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
+msgid "Sponsored development of KBabel for a while."
+msgstr "Studdi við bakið á hönnun KBabel um stund."
+
+#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
+#, fuzzy
+msgid "KBabel contains code from TQt"
+msgstr "KBabel inniheldur kóða frá Qt"
+
+#: kbabel/main.cpp:583
+msgid "String distance algorithm implementation"
+msgstr "Algrímis útfærsla fyrir mismun strengja"
+
+#: kbabel/main.cpp:585
+msgid "Error list for current entry, regexp data tool"
+msgstr "Villulisti yfir núverandi færslu, regexp gagnatól"
+
+#: kbabel/main.cpp:587
+msgid "Word-by-word string difference algorithm implementation"
+msgstr "Algrímis útfærsla fyrir mismun orð-fyrir-orð strengja"
+
+#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
+msgid "Go to Entry"
+msgstr "Fara að færslu"
 
 #: kbabel/kbabelview.cpp:185
 msgid ""
@@ -1678,18 +3720,6 @@ msgid ""
 "There was an error while reading the file header. Please check the header."
 msgstr "Villa kom upp við lestur á haus skráarinnar."
 
-#: catalogmanager/multiroughtransdlg.cpp:84
-#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
-#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid PO file."
-msgstr ""
-"Villa við lestur skráar:\n"
-" %1\n"
-"Kannski er þetta ekki gild PO-skrá."
-
 #: kbabel/kbabelview.cpp:1189 kbabel/kbabelview.cpp:1311
 msgid ""
 "Error while reading the file:\n"
@@ -1708,57 +3738,6 @@ msgstr ""
 "Skráin inniheldur villur og reynt hefur verið að laga hana.\n"
 "Athugaðu vafasömu reitina með því að nota Fara->Næsta villa"
 
-#: kbabel/kbabelview.cpp:1207 kbabel/kbabelview.cpp:1325
-#: kbabel/kbabelview2.cpp:731
-#, c-format
-msgid ""
-"You do not have permissions to read file:\n"
-" %1"
-msgstr ""
-"Þú hefur ekki réttindi til að lesa skrána:\n"
-" %1"
-
-#: kbabel/kbabelview.cpp:1213 kbabel/kbabelview.cpp:1330
-#: kbabel/kbabelview2.cpp:738
-#, c-format
-msgid ""
-"You have not specified a valid file:\n"
-" %1"
-msgstr ""
-"Þú hefur ekki tilgreint gilda skrá:\n"
-" %1"
-
-#: kbabel/kbabelview.cpp:1219 kbabel/kbabelview.cpp:1336
-#: kbabel/kbabelview.cpp:1488 kbabel/kbabelview2.cpp:745
-#, c-format
-msgid ""
-"KBabel cannot find a corresponding plugin for the MIME type of the file:\n"
-" %1"
-msgstr ""
-"KBabel fann ekkert viðbótaríforrit fyrir MIME tegundina:\n"
-" %1"
-
-#: kbabel/kbabelview.cpp:1225 kbabel/kbabelview.cpp:1342
-#: kbabel/kbabelview2.cpp:751
-#, c-format
-msgid ""
-"The import plugin cannot handle this type of the file:\n"
-" %1"
-msgstr ""
-"Innflutningsíforritið getur ekki höndlað skrár af tegundinni:\n"
-" %1"
-
-#: catalogmanager/catalogmanagerview.cpp:448
-#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
-#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
-#, c-format
-msgid ""
-"Error while trying to open file:\n"
-" %1"
-msgstr ""
-"Villa við opnun skráar:\n"
-" %1"
-
 #: kbabel/kbabelview.cpp:1262
 msgid ""
 "All changes will be lost if the file is reverted to its last saved state."
@@ -1931,25 +3910,12 @@ msgstr ""
 "Vinsamlega gangtu úr skugga um að þú hafir sett\n"
 "GNU gettext pakkann rétt inn."
 
-#: kbabel/kbabelview.cpp:1769 kbabel/kbabelview2.cpp:948
-msgid "No mismatch has been found."
-msgstr "Enginn mismunur fannst."
-
 #: kbabel/kbabelview.cpp:1770 kbabel/kbabelview.cpp:1787
 msgid ""
 "_: Title in Dialog: Perform all checks\n"
 "Perform All Checks"
 msgstr "Keyra öll próf"
 
-#: kbabel/kbabelview.cpp:1784 kbabel/kbabelview2.cpp:965
-msgid ""
-"Some mismatches have been found.\n"
-"Please check the questionable entries by using Go->Next error"
-msgstr ""
-"Nokkrar villur fundust.\n"
-"Vinsamlegast athugaðu vafasömu reitina með því að nota\n"
-"Fara->Næsta villa"
-
 #: kbabel/kbabel.cpp:942 kbabel/kbabelview.cpp:1803
 msgid ""
 "The document contains unsaved changes.\n"
@@ -2144,213 +4110,6 @@ msgstr "Stafsetningarskoðarinn virðist hafa hrunið."
 msgid "Searching"
 msgstr "Er að leita"
 
-#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
-msgid "Table:"
-msgstr "Tafla:"
-
-#: kbabel/charselectview.cpp:84
-msgid ""
-"<qt>"
-"<p><b>Character Selector</b></p>"
-"<p>This tool allows to insert special characters using double click.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Stafaveljari</b></p>"
-"<p>Þetta tól leyfir þér að setja inn sérstaka stafi með því að tvísmella á "
-"þá.</p></qt>"
-
-#: kbabel/contextview.cpp:63
-msgid ""
-"<qt>"
-"<p><b>PO Context</b></p>"
-"<p>This window shows the context of the current message in the PO file. "
-"Normally it shows four messages in front of the current message and four after "
-"it.</p>"
-"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
-"</qt></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Samhengi</b></p>"
-"<p>Þessi gluggi sýnir samhengið sem núverandi skilaboð er í. Vanalega eru sýnd "
-"fjögur skilaboð, á undan því virka, og fjögur á eftir.</p>"
-"<p>Þú getur falið þennan glugga, með því að afvelja <b>Stillingar->Sýna tól</b>"
-". </p></qt></qt>"
-
-#: kbabel/contextview.cpp:99
-msgid "current entry"
-msgstr "núverandi færsla"
-
-#: kbabel/contextview.cpp:140
-msgid ""
-"Plural %1: %2\n"
-msgstr ""
-"Fleirtala %1: %2\n"
-
-#: kbabel/hidingmsgedit.cpp:76
-msgid "Context inserted by KBabel, do not translate:"
-msgstr "Samhengi sett inn af KBabel, ekki þýða:"
-
-#: kbabel/hidingmsgedit.cpp:182
-#, c-format
-msgid "Plural %1"
-msgstr "Fleirtala %1"
-
-#: kbabel/kbabelpref.cpp:57
-msgid ""
-"_: title of page in preferences dialog\n"
-"Edit"
-msgstr "Ritstjórn"
-
-#: kbabel/kbabelpref.cpp:59
-msgid "Options for Editing"
-msgstr "Valkostir fyrir ritun"
-
-#: kbabel/kbabelpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Search"
-msgstr "Leit"
-
-#: kbabel/kbabelpref.cpp:72
-msgid "Options for Searching Similar Translations"
-msgstr "Valkostir við leit að líkum þýðingum"
-
-#: kbabel/kbabelpref.cpp:87
-msgid "Options for Showing Differences"
-msgstr "Valmöguleikar við sýningu mismunar"
-
-#: kbabel/kbabelpref.cpp:90
-msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Fonts"
-msgstr "Letur"
-
-#: kbabel/kbabelpref.cpp:92
-msgid ""
-"_: title of page in preferences dialog\n"
-"Font Settings"
-msgstr "Leturstillingar"
-
-#: kbabel/kbabelpref.cpp:95
-msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Colors"
-msgstr "Litir"
-
-#: kbabel/kbabelpref.cpp:97
-msgid ""
-"_: title of page in preferences dialog\n"
-"Color Settings"
-msgstr "Litstillingar"
-
-#: kbabel/kbcataloglistview.cpp:44
-msgid "Id"
-msgstr "Auðkenni"
-
-#: kbabel/kbcataloglistview.cpp:45
-msgid "Original String"
-msgstr "Upphaflegur strengur"
-
-#: kbabel/kbabelview2.cpp:538
-#, c-format
-msgid ""
-"An error occurred while trying to get the list of messages for this file from "
-"the database:\n"
-"%1"
-msgstr ""
-"Villa kom upp þegar reynt var að fá lista yfir skilaboð í þessari skrá frá "
-"gagnagrunninum:\n"
-"%1"
-
-#: kbabel/kbabelview2.cpp:624
-msgid "No difference found"
-msgstr "Engin mismunur fannst"
-
-#: kbabel/kbabelview2.cpp:628
-msgid "Difference found"
-msgstr "Mismunur fannst"
-
-#: kbabel/kbabelview2.cpp:636
-msgid "No corresponding message found."
-msgstr "Samsvarandi skilaboðaskrá fannst ekki."
-
-#: kbabel/kbabelview2.cpp:641
-msgid "No corresponding message found"
-msgstr "Samsvarandi skilaboðaskrá fannst ekki"
-
-#: kbabel/kbabelview2.cpp:696
-msgid "Select File to Diff With"
-msgstr "Veldu skrá til að samanbera við"
-
-#: kbabel/kbabelview2.cpp:710
-msgid "loading file for diff"
-msgstr "Hleð inn skrá til samanburðar"
-
-#: kbabel/kbabelview2.cpp:801
-msgid ""
-"The search string has not been found yet.\n"
-"However, the string might be found in the files being searched at the moment.\n"
-"Please try later."
-msgstr ""
-"Leitarstrengurinn hefur ekki fundist ennþá.\n"
-"Hann gæti hinsvegar fundist í skránum sem er verið að leita í núna.\n"
-"Vinsamlega reyndu aftur seinna."
-
-#: kbabel/kbabelview2.cpp:810
-msgid "Do not show in this find/replace session again"
-msgstr "Ekki sýna þessi skilaboð aftur í þessari lotu"
-
-#: kbabel/kbabelview2.cpp:825
-msgid "Enter new package for the current file:"
-msgstr "Sláðu inn nýja pakkann fyrir skrána sem er opin:"
-
-#: kbabel/kbabelview2.cpp:1021
-msgid ""
-"Total words: %1\n"
-"\n"
-"Words in untranslated messages: %2\n"
-"\n"
-"Words in fuzzy messages: %3"
-msgstr ""
-"Fjöldi orða: %1\n"
-"\n"
-"Orð í óþýddum skilaboðum: %2\n"
-"\n"
-"Orð í loðnum skilaboðum: %3"
-
-#: kbabel/kbabelview2.cpp:1024
-msgid "Word Count"
-msgstr "Fjöldi orða"
-
-#. i18n: file ./kbabel/headerwidget.ui line 24
-#: kbabel/commentview.cpp:78 rc.cpp:265
-#, no-c-format
-msgid "&Comment:"
-msgstr "&Athugasemdir:"
-
-#: kbabel/commentview.cpp:88
-msgid ""
-"<qt>"
-"<p><b>Comment Editor</b></p>\n"
-"This edit window shows you the comments of the currently displayed message."
-"<p>\n"
-"<p>The comments normally contain information about where the message is found "
-"in the source\n"
-"code and status information about this message (fuzzy, c-format).\n"
-"Hints from other translators are also sometimes contained in comments.</p>\n"
-"<p>You can hide the comment editor by deactivating\n"
-"<b>Options->Show Comments</b>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Athugasemdaritill</b></p>\n"
-"Hér sérðu athugasemdir virku færslunar."
-"<p>\n"
-"<p>Athugasemdirnar segja vanalega hvar skilaboðin er að finna í kóðanum,\n"
-"og sýna stöðu færslunar (loðin, c-viðföng).\n"
-"Einnig geta þýðendur sett sínar athugasemdir inn hér.</p>\n"
-"<p>Þú getur falið athugasemdaritilinn með því að afvelja\n"
-"<b>Stillingar->Sýna athugasemdir</b>.</p></qt>"
-
 #: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
 #: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
 #, c-format
@@ -2625,12 +4384,6 @@ msgstr "Loðnar: 0"
 msgid "Untranslated: 0"
 msgstr "Óþýddar: 0"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
-#: kbabel/kbabel.cpp:713 rc.cpp:924
-#, no-c-format
-msgid "Status: "
-msgstr "Staða: "
-
 #: kbabel/kbabel.cpp:731 kbabel/kbabel.cpp:1164
 msgid "INS"
 msgstr "INS"
@@ -2745,59 +4498,40 @@ msgstr ""
 "<p>Þetta er listi yfir villur sem staðfestingartólin fundu þannig að þú vitir "
 "afhverju skilaboðið hefur verið merkt með villu.</p></qt>"
 
-#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
-msgid "Go to Entry"
-msgstr "Fara að færslu"
+#: kbabel/kbcataloglistview.cpp:44
+msgid "Id"
+msgstr "Auðkenni"
 
-#: kbabel/headereditor.cpp:60
-msgid "&Apply Settings"
-msgstr "Virkja stilling&ar"
+#: kbabel/kbcataloglistview.cpp:45
+msgid "Original String"
+msgstr "Upphaflegur strengur"
 
-#: kbabel/headereditor.cpp:61
+#: kbabel/contextview.cpp:63
 msgid ""
 "<qt>"
-"<p>This button updates the header using the current settings. The resulting "
-"header is the one that would be written into the PO file on saving.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Þessi hnappur uppfærir hausinn með núverandi stillingum. Hann verður síðan "
-"skrifaður í PO skránna við vistun.</p></qt>"
-
-#: kbabel/headereditor.cpp:65
-msgid "&Reset"
-msgstr "F&rumstilla"
-
-#: kbabel/headereditor.cpp:66
-msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+"<p><b>PO Context</b></p>"
+"<p>This window shows the context of the current message in the PO file. "
+"Normally it shows four messages in front of the current message and four after "
+"it.</p>"
+"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
+"</qt></qt>"
 msgstr ""
 "<qt>"
-"<p>>Þessi hnappur tekur til baka allar breytingar sem hafa verið gerðar.</p>"
-"</qt>"
-
-#: kbabel/headereditor.cpp:111
-#, c-format
-msgid "Header Editor for %1"
-msgstr "Hausaritill fyrir %1"
+"<p><b>Samhengi</b></p>"
+"<p>Þessi gluggi sýnir samhengið sem núverandi skilaboð er í. Vanalega eru sýnd "
+"fjögur skilaboð, á undan því virka, og fjögur á eftir.</p>"
+"<p>Þú getur falið þennan glugga, með því að afvelja <b>Stillingar->Sýna tól</b>"
+". </p></qt></qt>"
 
-#: kbabel/headereditor.cpp:136
-msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Þetta er ekki gildur haus</p>\n"
-"<p>Vinsamlegast breyttu honum áður en þú uppfærir.</p></qt>"
+#: kbabel/contextview.cpp:99
+msgid "current entry"
+msgstr "núverandi færsla"
 
-#: kbabel/headereditor.cpp:172
+#: kbabel/contextview.cpp:140
 msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"Plural %1: %2\n"
 msgstr ""
-"<qt>"
-"<p>Þetta er ekki gildur haus</p>\n"
-"<p>Vinsamlegast breyttu honum áður en þú uppfærir.</p></qt>"
+"Fleirtala %1: %2\n"
 
 #: kbabel/spelldlg.cpp:44
 msgid ""
@@ -2809,1938 +4543,317 @@ msgstr "Stafset"
 msgid "&Spell Check"
 msgstr "Stafsetningar&leiðrétting"
 
-#: kbabel/main.cpp:537
-msgid "Go to entry with msgid <msgid>"
-msgstr "Fara að færslu með msgid <msgid>"
-
-#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
-msgid "Disable splashscreen at startup"
-msgstr "Ekki sýna ræsiskjá í upphafi"
-
-#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
-msgid "File to load configuration from"
-msgstr "Skrá sem inniheldur stillingar"
-
-#: kbabel/main.cpp:540
-msgid "Files to open"
-msgstr "skrár til að opna"
-
-#: kbabel/main.cpp:547
-msgid "KBabel"
-msgstr "KBabel"
-
-#: kbabel/main.cpp:548
-msgid "An advanced PO file editor"
-msgstr "Þróaður PO-ritill"
-
-#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
-msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
-msgstr "(c) 1999,2000,2001,2002,2003,2004,2005,2006 KBabel forritararnir"
-
-#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
-msgid "Original author"
-msgstr "Upprunalegur höfundur"
-
-#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
-msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
-msgstr "Skrifaði diff algrími, lagaði KSpell og kom með mörg góð ráð."
-
-#: kbabel/main.cpp:555
-msgid ""
-"Wrote the dictionary plugin for searching in a database and some other code."
-msgstr "Skrifaði orðabókaríforritið til að leita í gagnagrunni og annan kóða."
-
-#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
-#, fuzzy
-msgid "Current maintainer, porting to KDE3/Qt3."
-msgstr "Núverandi umsjónarmaður, flutningur í TDE3/Qt3."
-
-#: kbabel/main.cpp:560
-msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
-msgstr ""
-"Villuleiðréttingar, KFilePlugin fyrir PO skrár, CVS stuðningur, póstsending af "
-"skrám"
-
-#: kbabel/main.cpp:562
-msgid "Translation List View"
-msgstr "Þýðingalistasýn"
-
-#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
-msgid "Current maintainer"
-msgstr "Núverandi umsjónarmaður"
-
-#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
-msgid ""
-"Wrote documentation and sent many bug reports and suggestions for improvements."
-msgstr ""
-"Skrifaði skjöl og kom með margar villuskýrslur og tillögur að endurbætum."
-
-#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
-msgid ""
-"Gave many suggestions for the GUI and the behavior of KBabel. He also "
-"contributed the beautiful splash screen."
-msgstr ""
-"Kom með margar hugmyndir um viðmótið og hegðun KBabel. Hannaði einnig "
-"upphafsskjáinn."
-
-#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
-#, fuzzy
-msgid ""
-"Helped keep KBabel up to date with the KDE API and gave a lot of other help."
-msgstr ""
-"Hjálpaði við að halda KBabel í takt við TDE API og kom með mikla aðra hjálp."
-
-#: kbabel/main.cpp:574
-msgid "Implemented XML validation/highlighting plus other small fixes."
-msgstr "Útfærði XML staðfestingu/litun, ásamt öðrum smálagfæringum."
-
-#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
-msgid "Various validation plugins."
-msgstr "Ýmis prófunaríforrit"
-
-#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
-msgid "Sponsored development of KBabel for a while."
-msgstr "Studdi við bakið á hönnun KBabel um stund."
-
-#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
-#, fuzzy
-msgid "KBabel contains code from TQt"
-msgstr "KBabel inniheldur kóða frá Qt"
-
-#: kbabel/main.cpp:583
-msgid "String distance algorithm implementation"
-msgstr "Algrímis útfærsla fyrir mismun strengja"
-
-#: kbabel/main.cpp:585
-msgid "Error list for current entry, regexp data tool"
-msgstr "Villulisti yfir núverandi færslu, regexp gagnatól"
-
-#: kbabel/main.cpp:587
-msgid "Word-by-word string difference algorithm implementation"
-msgstr "Algrímis útfærsla fyrir mismun orð-fyrir-orð strengja"
-
-#. i18n: file ./commonui/diffpreferences.ui line 25
-#: rc.cpp:3
-#, no-c-format
-msgid "Diff Source"
-msgstr "Staðsetning samanburðaskráa"
-
-#. i18n: file ./commonui/diffpreferences.ui line 41
-#: rc.cpp:6
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Source for difference lookup</b></p>\n"
-"<p>Here you can select a source, which should be used\n"
-"for finding a difference.</p>\n"
-"<p>You can select file, translation database or\n"
-"corresponding msgstr.</p>\n"
-"<p>If you choose the translation database, the messages to diff with are\n"
-"taken from the Translation Database; to be useful, you have\n"
-"to enable <i>Auto add entry to database</i> in its\n"
-"preferences dialog.</p>\n"
-"<p>The last option is useful for those using PO-files\n"
-"for proofreading.</p>\n"
-"<p>You can temporarily diff with messages from a file\n"
-"by choosing <i>Tools->Diff->Open file for diff</i>\n"
-"in KBabel's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Staðsetning samanburðaskráa</b></p>\n"
-"<p>Hér getur þú skilgreint uppruna sem á að bera saman við\n"
-"til að finna mismun í skrám.</p>\n"
-"<p>Þú getur valið skrá, gagnagrunn eða\n"
-"samsvarandi msgstr færslu.</p>\n"
-"<p>Ef þú velur að nota gagnagrunn, eru færslurnar sem á að bera saman við\n"
-"teknar úr þýðingargagnagrunninum, og til að vera gagnlegt verður\n"
-"þú að haka við <i>Bæta sjálfkrafa við nýjum færslum</i>\n"
-"í stillingarglugga hans.</p>\n"
-"<p>Seinasti valkosturinn er gagnlegur fyrir þá sem nota PO skrár til að\n"
-"lesa yfir með.</p>\n"
-"<p>Þú getur borið tímabundið saman við færslur í skrá\n"
-"með að velja <i>Tól->Samanburður->Opna skrá til samanburðar</i>\n"
-"í aðalglugga KBabel.</p></qt>"
-
-#. i18n: file ./commonui/diffpreferences.ui line 52
-#: rc.cpp:22
-#, no-c-format
-msgid "Use &file"
-msgstr "&Nota skrá"
-
-#. i18n: file ./commonui/diffpreferences.ui line 60
-#: rc.cpp:25
-#, no-c-format
-msgid "Use messages from &translation database"
-msgstr "No&ta skilaboð frá þýðingargagnagrunni"
-
-#. i18n: file ./commonui/diffpreferences.ui line 68
-#: rc.cpp:28
-#, no-c-format
-msgid "Use &msgstr from the same file"
-msgstr "Nota &msgstr frá sömu skrá"
-
-#. i18n: file ./commonui/diffpreferences.ui line 86
-#: rc.cpp:31
-#, no-c-format
-msgid "Base folder for diff files:"
-msgstr "Grunnmappa fyrir samanburðarskrár:"
-
-#. i18n: file ./commonui/diffpreferences.ui line 104
-#: rc.cpp:34
-#, no-c-format
-msgid ""
-"<qt><q><b>Base folder for diff files</b></q>\n"
-"<p>Here you can define a folder in which the files to\n"
-"diff with are stored. If the files are stored at the same\n"
-"place beneath this folder as the original files beneath\n"
-"their base folder, KBabel can automatically open the correct\n"
-"file to diff with.</p>\n"
-"<p>Note that this option has no effect if messages from\n"
-"the database are used for diffing.</p></qt>"
-msgstr ""
-"<qt><q><b>Grunnmappa fyrir samanburðarskrár</b></q>\n"
-"<p>Hér getur þú tilgreint möppuna sem inniheldur skrárnar\n"
-"sem á að bera saman við. Ef skránum er raðað á sama máta\n"
-"undir þessari möppu og upprunalegu skránum er raðað í sinni grunnmöppu, getur "
-"KBabel sjálfvirkt opnað réttar skrár til að\n"
-"bera saman við.</p>\n"
-"<p>Athugið að þessi valkostur hefur engin áhrif ef notast er\n"
-"við færslur frá gagnagrunni til að bera saman við.</p></qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 38
-#: rc.cpp:44
-#, no-c-format
-msgid ""
-"<font size=\"+1\">Welcome to Project Wizard!</font>\n"
-"<br/>\n"
-"<p>\n"
-"The wizard will help you to setup a new translation\n"
-"project for KBabel.\n"
-"</p>\n"
-"<p>\n"
-"First of all, you need to choose the project name\n"
-"and the file, where the configuration should be stored.\n"
-"</p>\n"
-"<p>\n"
-"You should also choose a language to translate into\n"
-"and also a type of the translation project.\n"
-"</p>"
-msgstr ""
-"<font size=\"+1\">Velkomin(n) í verkefna álfinn!</font>\n"
-"<br/>\n"
-"<p>\n"
-"Álfurinn aðstoðar þig að útbúa nýtt þýðingarverkefni\n"
-"fyrir KBabel.\n"
-"</p>\n"
-"<p>\n"
-"Fyrsta sem þú þarft að gera er að velja nafn á verkefnið\n"
-"og skrána sem á að vista stillingarnar í.\n"
-"</p>\n"
-"<p>\n"
-"Einnig ættir þú að velja hvaða tungumál þú ætlar að þýða í\n"
-"og tegund verkefnisins.\n"
-"</p>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 66
-#: rc.cpp:60 rc.cpp:137
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<p><b>Configuration File Name</b>"
-"<br/>\n"
-"The name of a file to store the configuration of the\n"
-"project.</p>\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<p><b>Nafn á stillingarskrá</b>"
-"<br/>\n"
-"Nafnið á skránni sem á að vista stillingar verkefnisins í\n"
-"</p>\n"
-"</qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 74
-#: rc.cpp:67
-#, no-c-format
-msgid "&Language:"
-msgstr "Tungumá&l:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 86
-#: rc.cpp:70 rc.cpp:92
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<p>\n"
-"<b>Language</b>"
-"<br/>\n"
-"The destination language of the project, i.e., the language\n"
-"to translate into. It should follow the ISO 631 language naming\n"
-"standard.</p>\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<p>\n"
-"<b>Tungumál</b>"
-"<br/>\n"
-"Tungumálið sem á að þýða í. Það ætti að fylgja\n"
-"ISO 631 tungumála nafnastaðlinum.</p>\n"
-"</qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 97
-#: rc.cpp:79
-#, no-c-format
-msgid "Project &name:"
-msgstr "&Nafn verkefnis:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 110
-#: rc.cpp:82 rc.cpp:124
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Project name</b>"
-"<br/>\n"
-"The project name is an identification of a project for\n"
-"you. It is shown in the project configuration dialog\n"
-"as well as in the title of windows opened for the project.\n"
-"<br/>\n"
-"<br/>\n"
-"<b>Note:</b> The project name cannot be later changed.<\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Nafn verkefnis</b>"
-"<br/>\n"
-"Nafnið er notað til að auðkenna verkefnið með.\n"
-"Það er sýnt í verkefna stillingarglugganum, ásamt\n"
-"í KBabel gluggunum sem eru opnaðir í því.\n"
-"<br/>\n"
-"<br/>\n"
-"<b>Athugaðu:</b> Það er ekki hægt að breyta nafninu seinna.<\n"
-"</p></qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 135
-#: rc.cpp:101
-#, no-c-format
-msgid "Project &type:"
-msgstr "&Tegund verkefnis:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 158
-#: rc.cpp:104 rc.cpp:156
-#, fuzzy, no-c-format
+#: kbabel/kbabelpref.cpp:57
 msgid ""
-"<qt>\n"
-"<p>\n"
-"<b>Project Type</b>\n"
-"The project type allows to tune the settings for the\n"
-"particular type of the well-known translation projects.\n"
-"For example, it sets up the validation tools,\n"
-"an accelerator marker and formatting of the header.\n"
-"</p>\n"
-"<p>Currently known types:\n"
-"<ul>\n"
-"<li><b>TDE</b>: Trinity Desktop Environment Internalization project</li>\n"
-"<li><b>GNOME</b>: GNOME Translation project</li>\n"
-"<li><b>Translation Robot</b>: Translation Project Robot</li>\n"
-"<li><b>Other</b>: Other kind of project. No tuning will be\n"
-"done</li>\n"
-"</ul>\n"
-"</p>\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<p>\n"
-"<b>Tegund verkefnis</b>\n"
-"Tegund verkefnis leyfir fínstillingu á þekktum verkefnum.\n"
-"T.d. eru prófunartólin sett upp og hraðvalsmerkingar og snið\n"
-"hausa stillt.\n"
-"</p>\n"
-"<p>Þekktar verkefnategundir eru:\n"
-"<ul>\n"
-"<li><b>TDE</b>:Alþjóðlegt K skjáborðs umhverfisverkefni</li>\n"
-"<li><b>GNOME</b>: GNOME þýðingarverkefni</li>\n"
-"<li><b>Þýðingar róbóti</b>: Þýðingarverkefnis róbóti</li>\n"
-"<li><b>Annað</b>: Annað þýðingarverkefni. Ekki eru gerðar neinar stillingar</li>"
-"\n"
-"</ul>\n"
-"</p>\n"
-"</qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 184
-#: rc.cpp:134
-#, no-c-format
-msgid "Configuration &file name:"
-msgstr "Na&fn á stillingaskrá:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 200
-#: rc.cpp:144
-#, no-c-format
-msgid "TDE"
-msgstr "TDE"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 205
-#: rc.cpp:147
-#, no-c-format
-msgid "GNOME"
-msgstr "GNOME"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 210
-#: rc.cpp:150
-#, no-c-format
-msgid "Translation Project Robot"
-msgstr "Þýðingarverkefnis róbóti"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 215
-#: rc.cpp:153
-#, no-c-format
-msgid "Other"
-msgstr "Annað"
+"_: title of page in preferences dialog\n"
+"Edit"
+msgstr "Ritstjórn"
 
-#. i18n: file ./commonui/projectwizardwidget2.ui line 18
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Translation Files</b></p>\n"
-"<p>Type in the folders which contain all your PO and POT files.\n"
-"The files and the folders in these folders will then be merged into one "
-"tree.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Grunnmöppur</b></p>\n"
-"<p>Skrifaðu inn möppurnar sem innihalda allar PO og POT skrárnar.\n"
-"Skrárnar og undirmöppurnar verða síðan sýndar í einu tré.</p></qt>"
+#: kbabel/kbabelpref.cpp:59
+msgid "Options for Editing"
+msgstr "Valkostir fyrir ritun"
 
-#. i18n: file ./commonui/projectwizardwidget2.ui line 44
-#: rc.cpp:181
-#, no-c-format
+#: kbabel/kbabelpref.cpp:70
 msgid ""
-"<font size=\"+1\">The Translation Files</font>\n"
-"<br/>"
-"<br/>\n"
-"If the project contains more than one file to translate, it\n"
-"better to organize the files. \n"
-"\n"
-"KBabel distinguishes two kind of the translation files:\n"
-"\n"
-"<ul>\n"
-"<li><b>Templates</b>: the files to be translated</li>\n"
-"<li><b>Translated files</b>: the files already translated (at least\n"
-"partially)</li>\n"
-"</ul>\n"
-"\n"
-"Choose the folders to store the files. If you\n"
-"leave the entries empty, the Catalog Manager\n"
-"will not work."
-msgstr ""
-"<font size=\"+1\">Þýðingarskrárnar</font>\n"
-"<br/>"
-"<br/>\n"
-"Ef verkefnið inniheldur fleiri en eina skrá sem á að þýða er\n"
-"betra að skipuleggja þær. \n"
-"\n"
-"KBabel gerir greinamun á tveimur tegundum skráa:\n"
-"\n"
-"<ul>\n"
-"<li><b>Snið</b>: skrárnar sem á að þýða</li>\n"
-"<li><b>Þýddar skrár</b>: skrár sem er þegar búið að þýða (að minnsta\n"
-"kosti að hluta)</li>\n"
-"</ul>\n"
-"\n"
-"Veldu möppuna sem inniheldur skrárnar. Ef þessar\n"
-"færslur eru tómar, virkar ekki Þýðingarstjórinn."
-
-#. i18n: file ./commonui/tdelisteditor.ui line 94
-#: rc.cpp:205 rc.cpp:861 rc.cpp:1246
-#, no-c-format
-msgid "New Item"
-msgstr "Nýr hlutur"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 151
-#: rc.cpp:214
-#, no-c-format
-msgid "Up"
-msgstr "Upp"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 162
-#: rc.cpp:217
-#, no-c-format
-msgid "Down"
-msgstr "Niður"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 24
-#: rc.cpp:220
-#, no-c-format
-msgid "Choose What You Want to Spell Check"
-msgstr "Veldu hvað þú vilt leiðrétta"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 30
-#: rc.cpp:223 rc.cpp:235
-#, no-c-format
-msgid "Spell check only the current message."
-msgstr "Skoða einungis stafsetningu í núverandi skilaboðum."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 41
-#: rc.cpp:226
-#, no-c-format
-msgid "A&ll messages"
-msgstr "Ö&ll skilaboð"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 44
-#: rc.cpp:229
-#, no-c-format
-msgid "Spell check all translated messages of this file."
-msgstr "Skoða stafsetningu í öllum skilaboðum í þessari skrá."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 52
-#: rc.cpp:232
-#, no-c-format
-msgid "C&urrent message only"
-msgstr "Ein&ungis núverandi skilaboð"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 66
-#: rc.cpp:238
-#, no-c-format
-msgid "Fro&m beginning of current message to end of file"
-msgstr "Frá &byrjun núverandi skilaboðs til enda skráar"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 74
-#: rc.cpp:241
-#, no-c-format
-msgid "&From beginning of file to cursor position"
-msgstr "&Frá byrjun skráar til stöðu bendils"
+"_: title of page in preferences dialog\n"
+"Search"
+msgstr "Leit"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 77
-#: rc.cpp:244
-#, no-c-format
-msgid ""
-"Spell check all text from the beginning of the file to the current cursor "
-"position."
-msgstr ""
-"Skoða stafsetningu í öllum texta frá byrjun á skrá að núverandi stöðu bendils."
+#: kbabel/kbabelpref.cpp:72
+msgid "Options for Searching Similar Translations"
+msgstr "Valkostir við leit að líkum þýðingum"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 85
-#: rc.cpp:247
-#, no-c-format
-msgid "F&rom cursor position to end of file"
-msgstr "Frá &bendli til enda skráar"
+#: kbabel/kbabelpref.cpp:87
+msgid "Options for Showing Differences"
+msgstr "Valmöguleikar við sýningu mismunar"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 88
-#: rc.cpp:250
-#, no-c-format
+#: kbabel/kbabelpref.cpp:90
 msgid ""
-"Spell check all text from the current cursor position to the end of the file."
-msgstr ""
-"Skoða stafsetningu í öllum texta frá núverandi stöðu bendils að lokum skrár."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 96
-#: rc.cpp:253
-#, no-c-format
-msgid "S&elected text only"
-msgstr "&Einungis valinn texti"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 99
-#: rc.cpp:256
-#, no-c-format
-msgid "Spell check only the selected text."
-msgstr "Skoða einungis stafsetningu á völdum texta."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 109
-#: rc.cpp:259
-#, no-c-format
-msgid "U&se this selection as default"
-msgstr "Nota þetta val sem &sjálfgefið"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 112
-#: rc.cpp:262
-#, no-c-format
-msgid "Check this, to store the current selection as default selection."
-msgstr "Hakaðu við hér til að geyma núverandi val sem sjálfgefið."
-
-#. i18n: file ./kbabel/headerwidget.ui line 43
-#: rc.cpp:268
-#, no-c-format
-msgid "&Header:"
-msgstr "&Haus:"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 54
-#: rc.cpp:274
-#, no-c-format
-msgid "A&utomatically unset fuzzy status"
-msgstr "Fjarlægja loðna stöð&u sjálfkrafa"
+"_: name of page in preferences dialog icon list\n"
+"Fonts"
+msgstr "Letur"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 60
-#: rc.cpp:277
-#, no-c-format
+#: kbabel/kbabelpref.cpp:92
 msgid ""
-"<qt>"
-"<p><b>Automatically unset fuzzy status</b></p>\n"
-"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
-"automatically\n"
-"unset (this means the string <i>, fuzzy</i>\n"
-"is removed from the entry's comment).</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Fjarlægja loðna stöðu sjálfkrafa</b></p>\n"
-"<p>Ef þetta er valið og þú breytir loðinni færslu, mun staða hennar verða\n"
-"sjálfkrafa sett sem <i>óloðin</i>.</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 68
-#: rc.cpp:283
-#, no-c-format
-msgid "Use cle&ver editing"
-msgstr "Nota &snjalla ritstýringu"
+"_: title of page in preferences dialog\n"
+"Font Settings"
+msgstr "Leturstillingar"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 79
-#: rc.cpp:286
-#, no-c-format
+#: kbabel/kbabelpref.cpp:95
 msgid ""
-"<qt>"
-"<p><b>Use clever editing</b></p>\n"
-"<p>Check this to make typing text more comfortable and let \n"
-"KBabel take care of some special characters that have to \n"
-"be quoted. For example typing '\\\"' will result in \n"
-"'\\\\\\\"', pressing Return will automatically add whitespace \n"
-"at the end of the line, pressing Shift+Return will add \n"
-"'\\\\n' at the end of the line.</p>\n"
-"<p>Note that this is just a hint: it is still possible to \n"
-"generate syntactically incorrect text.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Nota snjalla ritstýringu</b></p>\n"
-"<p>Veldu þennan möguleika til að láta KBabel sjá um að setja \n"
-"gæsalappir þar sem það er nauðsynlegt. T.d. þegar þú \n"
-"skrifar '\\\"' birtist '\\\\\\\"', þegar þú slærð á Enter er bili sjálfkrafa "
-"bætt \n"
-"við enda línunar, Shift+Return bætir '\\\\n' við enda línunar.</p>\n"
-"<p>Athugaðu að þetta er einungis hjálparfítus, það er ennþá mögulegt \n"
-"að skrifa rangan texta.</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 89
-#: rc.cpp:297
-#, no-c-format
-msgid "Automatic Checks"
-msgstr "Sjálfvirk skoðun"
+"_: name of page in preferences dialog icon list\n"
+"Colors"
+msgstr "Litir"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 97
-#: rc.cpp:300
-#, no-c-format
+#: kbabel/kbabelpref.cpp:97
 msgid ""
-"<qt>"
-"<p><b>Error recognition</b></p>\n"
-"<p>Here you can set how to show that an error occurred. \n"
-"<b>Beep on error</b> beeps and <b>Change text color on error\n"
-"</b> changes the color of the translated text. If none is \n"
-"activated, you will still see a message in the statusbar.\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Villusýning</b></p>"
-"<p>Hér getur þú valið um hvernig villuboð eru sýnd. <b>Flauta við villu</b> "
-"gefur hljóðmerki og <b>Breyta textalit við villu</b> "
-"breytir lit þýdda textans. Ef ekkert er valið, muntu eftir sem áður sjá "
-"skilaboð í stöðuslánni.</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 113
-#: rc.cpp:308
-#, no-c-format
-msgid "&Beep on error"
-msgstr "&Flauta við villu"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 121
-#: rc.cpp:311
-#, no-c-format
-msgid "Change te&xt color on error"
-msgstr "Breyta te&xtalit við villu"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 150
-#: rc.cpp:314
-#, no-c-format
-msgid "A&ppearance"
-msgstr "Ú&tlit"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 175
-#: rc.cpp:317
-#, no-c-format
-msgid "H&ighlight syntax"
-msgstr "Málfræð&ilitun"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 183
-#: rc.cpp:320
-#, no-c-format
-msgid "Highlight backgrou&nd"
-msgstr "Lita bakgru&nn"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 191
-#: rc.cpp:323
-#, no-c-format
-msgid "Mark &whitespaces with points"
-msgstr "Sýna &bil með punkti"
+"_: title of page in preferences dialog\n"
+"Color Settings"
+msgstr "Litstillingar"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 199
-#: rc.cpp:326
-#, no-c-format
-msgid "&Show surrounding quotes"
-msgstr "&Sýna gæsalappir"
+#: kbabel/hidingmsgedit.cpp:76
+msgid "Context inserted by KBabel, do not translate:"
+msgstr "Samhengi sett inn af KBabel, ekki þýða:"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 209
-#: rc.cpp:329
-#, no-c-format
-msgid "Status LEDs"
-msgstr "Stöðuljós"
+#: kbabel/hidingmsgedit.cpp:182
+#, c-format
+msgid "Plural %1"
+msgstr "Fleirtala %1"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 213
-#: rc.cpp:332
-#, no-c-format
+#: datatools/pluralforms/main.cc:59
 msgid ""
-"<qt>"
-"<p><b>Status LEDs</b></p>\n"
-"<p>Choose here where the status LEDs are displayed and what color they have.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p><b>Stöðuljós</b></p>\n"
-"<p>Veldu hér hvar á að sýna stöðuljós, og hvaða lit á að nota á þau.</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 224
-#: rc.cpp:336
-#, no-c-format
-msgid "Display in stat&usbar"
-msgstr "Sýna í stöð&uslá"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 232
-#: rc.cpp:339
-#, no-c-format
-msgid "Display in edi&tor"
-msgstr "Sýna í ri&tli"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 260
-#: rc.cpp:342 rc.cpp:363
-#, no-c-format
-msgid "Colo&r:"
-msgstr "Litu&r:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 36
-#: rc.cpp:348
-#, no-c-format
-msgid "Added Characters"
-msgstr "Viðbættir stafir"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 44
-#: rc.cpp:351
-#, no-c-format
-msgid "Ho&w to display:"
-msgstr "H&vernig á að sýna:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 55
-#: rc.cpp:354
-#, no-c-format
-msgid "Co&lor:"
-msgstr "&Litur:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 66
-#: rc.cpp:357
-#, no-c-format
-msgid "Removed Characters"
-msgstr "Fjarlægðir stafir"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 74
-#: rc.cpp:360
-#, no-c-format
-msgid "How &to display:"
-msgstr "Hv&ernig á að sýna:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 94
-#: rc.cpp:366 rc.cpp:372
-#, no-c-format
-msgid "Highlighted"
-msgstr "Litað"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 99
-#: rc.cpp:369
-#, no-c-format
-msgid "Underlined"
-msgstr "Undirstrikað"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 129
-#: rc.cpp:375
-#, no-c-format
-msgid "Stroked Out"
-msgstr "Yfirstrikaðir"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 41
-#: rc.cpp:378
-#, no-c-format
-msgid "&Background color:"
-msgstr "&Bakgrunnslitur:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 52
-#: rc.cpp:381
-#, no-c-format
-msgid "Color for &quoted characters:"
-msgstr "Litur á \"&gæsalöppuðum\" stöfum:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 63
-#: rc.cpp:384
-#, no-c-format
-msgid "Color for &syntax errors:"
-msgstr "Litur á &málfræðivillum:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 82
-#: rc.cpp:387
-#, no-c-format
-msgid "Color for s&pellcheck errors:"
-msgstr "Litur á st&afsetningarvillum:"
+"_: what check found errors\n"
+"plural forms"
+msgstr "fleirtöluform"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 97
-#: rc.cpp:390
-#, no-c-format
+#: datatools/punctuation/main.cc:58
 msgid ""
-"<qt>Here you can setup a color to display identified <b>mispelled</b> "
-"words and\n"
-"phrases.</qt>"
-msgstr ""
-"<qt>Hér getur þú skilgreint lit sem sýnir <b>misrituð</b> orð og\n"
-"setningar sem finnast.</qt>"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 105
-#: rc.cpp:394
-#, no-c-format
-msgid "Color for &keyboard accelerators:"
-msgstr "Litur á ly&klaborð flýtilyklum:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 132
-#: rc.cpp:397
-#, no-c-format
-msgid "Color for c-for&mat characters:"
-msgstr "Litun á &c-viðföngum:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 151
-#: rc.cpp:400
-#, no-c-format
-msgid "Color for &tags:"
-msgstr "Litur á &tögum:"
-
-#. i18n: file ./kbabel/kbabelui.rc line 29
-#: rc.cpp:409 rc.cpp:1171
-#, no-c-format
-msgid "&Go"
-msgstr "&Fara"
-
-#. i18n: file ./kbabel/kbabelui.rc line 50
-#: rc.cpp:412 rc.cpp:1177
-#, no-c-format
-msgid "&Project"
-msgstr "Verk&efni"
-
-#. i18n: file ./kbabel/kbabelui.rc line 58
-#: rc.cpp:418
-#, no-c-format
-msgid "&Spelling"
-msgstr "&Stafsetning"
-
-#. i18n: file ./kbabel/kbabelui.rc line 68
-#: rc.cpp:421
-#, no-c-format
-msgid "D&iff"
-msgstr "Saman&burður"
-
-#. i18n: file ./kbabel/kbabelui.rc line 82
-#: rc.cpp:424
-#, no-c-format
-msgid "&Dictionaries"
-msgstr "&Orðabækur"
-
-#. i18n: file ./kbabel/kbabelui.rc line 100
-#: rc.cpp:436 rc.cpp:1195
-#, no-c-format
-msgid "Main"
-msgstr "Aðal"
-
-#. i18n: file ./kbabel/kbabelui.rc line 113
-#: rc.cpp:439 rc.cpp:1198
-#, no-c-format
-msgid "Navigationbar"
-msgstr "Leiðarstýrislá"
-
-#. i18n: file ./kbabel/searchpreferences.ui line 39
-#: rc.cpp:442
-#, no-c-format
-msgid "Au&tomatically start search"
-msgstr "Sjálfvirk lei&t"
+"_: what check found errors\n"
+"punctuation"
+msgstr "greinamerki"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 49
-#: rc.cpp:445
-#, no-c-format
+#: datatools/accelerators/main.cc:58
 msgid ""
-"<qt>"
-"<p><b>Automatically start search</b></p>\n"
-"<p>If this is activated, the search is automatically started \n"
-"whenever you switch to another entry in the editor. You can \n"
-"choose where to search with the combo box <b>Default Dictionary</b>.\n"
-"</p>"
-"<p>You can also start searching manually by choosing an entry in \n"
-"the popup menu that appears either when clicking \n"
-"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
-"in the toolbar pressed for a while.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Hefja sjálfvirkt leit</b></p>\n"
-"<p>Ef þetta er valið, hefst leit sjálfkrafa í hvert sinn sem\n"
-"þú skiptir á milli færsla í ritlinum. Þú getur valið hvar á að leita\n"
-"með fellilistanum <b>Sjálfgefin orðabók</b>.\n"
-"</p>"
-"<p>Einnig getur þú leitað handvirkt með því að velja færslu í\n"
-"glugganum sem birtist annaðhvort þegar smellt er á <b>Orðabækur->Finna...</b> "
-"eða þegar orðabókarhnappinum í aðaltækjaslánni er haldið niðri um stund.</p>"
-"</qt>"
-
-#. i18n: file ./kbabel/searchpreferences.ui line 65
-#: rc.cpp:455
-#, no-c-format
-msgid "D&efault dictionary:"
-msgstr "Sjálfg&efin orðabók:"
+"_: what check found errors\n"
+"accelerator"
+msgstr "hröðunartákn"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 82
-#: rc.cpp:458
-#, no-c-format
+#: datatools/context/main.cc:58
 msgid ""
-"<qt>"
-"<p><b>Default Dictionary</b></p>\n"
-"<p>Choose here where to search as default. \n"
-"This setting is used when searching is started automatically \n"
-"or when pressing the dictionary button in the toolbar.</p>\n"
-"<p>You can configure the different dictionaries by selecting \n"
-"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Sjálfgefin orðabók</b></p>\n"
-"<p>Veldu hér hvar á sjálfgefið að leita. Þessi stilling er notuð þegar leit "
-"hefst sjálfkrafa, og þegar ýtt er á orðabókar táknmyndina í tækjaslánni.</p>"
-"<p>Þú getur sett upp orðabækurnar með því að velja <b>Stillingar->"
-"Stilla orðabók</b>. </p></qt>"
-
-#. i18n: file ./kbabel/fontpreferences.ui line 25
-#: rc.cpp:467
-#, no-c-format
-msgid "Font for Messages"
-msgstr "Leturgerð skilaboða"
-
-#. i18n: file ./kbabel/fontpreferences.ui line 36
-#: rc.cpp:470
-#, no-c-format
-msgid "&Show only fixed font"
-msgstr "Aðeins &sýna jafnbreitt letur"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 30
-#: rc.cpp:473 rc.cpp:503
-#, no-c-format
-msgid "&Path to Compendium File"
-msgstr "Slóð að ágri&paskrá"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 85
-#: rc.cpp:479 rc.cpp:512
-#, no-c-format
-msgid "Onl&y whole words"
-msgstr "Einung&is heil orð"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 93
-#: rc.cpp:482 rc.cpp:515
-#, no-c-format
-msgid "Case sensiti&ve"
-msgstr "Háð há/lágstöfum"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 103
-#: rc.cpp:485 rc.cpp:518
-#, no-c-format
-msgid "A text matches if:"
-msgstr "Texti passar ef:"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 125
-#: rc.cpp:488 rc.cpp:521
-#, no-c-format
-msgid "E&qual to searched text"
-msgstr "&Eins og leitartextinn"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 133
-#: rc.cpp:491 rc.cpp:524
-#, no-c-format
-msgid "Contains a &word of searched text"
-msgstr "inniheldur &orð af leitartextanum"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 141
-#: rc.cpp:494 rc.cpp:527
-#, no-c-format
-msgid "Co&ntained in searched text"
-msgstr "Er í leitartexta&num"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 149
-#: rc.cpp:497 rc.cpp:530
-#, no-c-format
-msgid "&Similar to searched text"
-msgstr "&Svipað og leitartextinn"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 157
-#: rc.cpp:500 rc.cpp:533
-#, no-c-format
-msgid "Contains searched te&xt"
-msgstr "inniheldur leitarte&xtann"
-
-#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
-#: rc.cpp:509
-#, no-c-format
-msgid "Ignore &fuzzy strings"
-msgstr "Hunsa &loðna strengi"
-
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
-#: rc.cpp:536
-#, no-c-format
-msgid "&Path to auxiliary file:"
-msgstr "&Slóð að viðbótarskrá:"
-
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
-#: rc.cpp:539
-#, no-c-format
-msgid "&Ignore fuzzy entries"
-msgstr "&Hunsa loðnar færslur"
+"_: what check found errors\n"
+"context info"
+msgstr "Samhengisupplýsingar"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
-#: rc.cpp:542
-#, no-c-format
+#: datatools/equations/main.cc:58
 msgid ""
-"<qt>"
-"<p>\n"
-"The following variables will be replaced in the path if available:\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
-"package</li>\n"
-"<li><b>@LANG@</b>: the language code</li>\n"
-"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
-"nth folder counted from the filename</li>\n"
-"</ul></p></qt>"
-msgstr ""
-"<qt>"
-"<p>\n"
-"Eftirfarandi færslum verður skipt út í slóðinni ef þær finnast:\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>: nafnið á þýdda forritinu eða pakkanum</li>\n"
-"<li><b>@LANG@</b>: tungumálakóðinn</li>\n"
-"<li><b>@DIR<em>n</em>@</b>: þar sem n er jákvæð heiltala. Farið er þá í "
-"uppgefna fjöldann undir skráarnafninu</li>\n"
-"</ul></p></qt>"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 38
-#: rc.cpp:551 rc.cpp:719 rc.cpp:963 rc.cpp:1131
-#, no-c-format
-msgid "Generic"
-msgstr "Almennt"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 55
-#: rc.cpp:554 rc.cpp:966
-#, no-c-format
-msgid "Search Mode"
-msgstr "Leitarskilyrði"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 72
-#: rc.cpp:557 rc.cpp:969
-#, no-c-format
-msgid "Search in whole database (slow)"
-msgstr "Leita í öllum gagnagrunni (hægvirkt)"
+"_: what check found errors\n"
+"equations"
+msgstr "jöfnur"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 77
-#: rc.cpp:560 rc.cpp:972
-#, no-c-format
+#: datatools/xml/main.cc:60
 msgid ""
-"<qml>Scroll the whole database and return everything that matches \n"
-"according to the rules defined in tabs <strong> Generic </strong>\n"
-"and <strong>Match</strong>"
-msgstr ""
-"<qml>Leita í öllum gagnagrunninum og skila færslum sem passa við \n"
-"skilyrðin í <strong> Alment </strong> og <strong>Leita</strong> flipunum"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 85
-#: rc.cpp:565 rc.cpp:977
-#, no-c-format
-msgid "Search in list of \"good keys\" (best)"
-msgstr "Leita í \"góðir lyklar\" (best)"
+"_: what check found errors\n"
+"XML tags"
+msgstr "XML tög"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 92
-#: rc.cpp:568 rc.cpp:980
-#, no-c-format
+#: datatools/arguments/main.cc:57
 msgid ""
-"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
-"tab) with rules defined in <strong>Search</strong> tab.\n"
-"This is the best way to search because the <em>good keys</em> "
-"list probably contains all the keys that match with your query. However, it is "
-"smaller than the whole database."
-msgstr ""
-"<qml> Leita í <em>góðum lyklum</em> (skoðaðu <strong>Góðir lyklar</strong> "
-"flipann) með reglunum sem eru skilgreindar í <strong>Leitar</strong> flipanum.\n"
-"Þetta er besta leitaraðferðin þar sem <em>góðir lyklar</em> "
-"listinn inniheldur trúlega alla lyklana sem passa við leitina þína. Hinsvegar "
-"er hann minni en allur gagnagrunnurinn."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 100
-#: rc.cpp:572 rc.cpp:984
-#, no-c-format
-msgid "Return the list of \"good keys\" (fast)"
-msgstr "Skila listanum með \"góðum lyklum\" (hraðvirkt)"
+"_: what check found errors\n"
+"arguments"
+msgstr "breytur"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 103
-#: rc.cpp:575 rc.cpp:987
-#, no-c-format
+#: datatools/whitespace/main.cc:60
 msgid ""
-"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
-"Search</strong> tab are ignored."
-msgstr ""
-"<qml>Skilar öllum <em>góðir lyklar</em> listanum. Reglur sem eru skilgreindar í "
-"<strong>Leita</strong> flipanum eru hunsaðar."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 113
-#: rc.cpp:578 rc.cpp:990
-#, no-c-format
-msgid "Case sensitive"
-msgstr "Háð há/lágstöfum"
+"_: which check found errors\n"
+"whitespace only translation"
+msgstr "tóm þýðing"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 116
-#: rc.cpp:581 rc.cpp:993
-#, no-c-format
+#: datatools/not-translated/main.cc:60
 msgid ""
-"<qml>If it is checked the search will be case sensitive. It is ignored if you "
-"use <em>Return the list of \"good keys\"</em> search mode."
-msgstr ""
-"<qml>Ef valið, er leitin háð stafastöðunni. Þetta er hunsað ef þú notar <em>"
-"Skila listanum með \"góðum lyklum\"</em>."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 124
-#: rc.cpp:584 rc.cpp:996
-#, no-c-format
-msgid "Normalize white space"
-msgstr "Lagfæra orðabil"
+"_: which check found errors\n"
+"English text in translation"
+msgstr "Enskur texti í þýðingum"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 131
-#: rc.cpp:587 rc.cpp:999
-#, no-c-format
+#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
 msgid ""
-"Remove white spaces at the beginning and at the end of the phrase.\n"
-"It also substitutes groups of more than one space character with only one space "
-"character."
-msgstr ""
-"Fjarlægja orðabil við upphaf og enda setningarinnar.Skiptir einnig fleiri en "
-"einu\n"
-"bili út með einu."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 139
-#: rc.cpp:591 rc.cpp:1003
-#, no-c-format
-msgid "Remove context comment"
-msgstr "Fjarlægja samhengis athugasemdir"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 145
-#: rc.cpp:594 rc.cpp:1006
-#, no-c-format
-msgid "Remove, if exists, the _:comment"
-msgstr "Fjarlægir, ef finnst, _:athugasemd"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 167
-#: rc.cpp:597 rc.cpp:1009
-#, no-c-format
-msgid "Character to be ignored:"
-msgstr "Stafir sem á að hunsa:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 209
-#: rc.cpp:600 rc.cpp:1012
-#, no-c-format
-msgid "Search"
-msgstr "Leita"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 226
-#: rc.cpp:603 rc.cpp:1015
-#, no-c-format
-msgid "Matching Method"
-msgstr "Leitarskilyrði"
+"_: which check found errors\n"
+"translation has inconsistent length"
+msgstr "lengd þýðingar passar ekki"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 277
-#: rc.cpp:606 rc.cpp:1018
-#, no-c-format
-msgid "Query is contained"
-msgstr "Inniheldur leitarstreng"
+#: datatools/regexp/main.cc:58
+msgid "Error loading data (%1)"
+msgstr "Villa við hleðslu af gögnum (%1)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 280
-#: rc.cpp:609 rc.cpp:1021
-#, no-c-format
-msgid "Match if query is contained in database string"
-msgstr "Passar ef færsla í gagnagrunni inniheldur leitarstrenginn"
+#: datatools/regexp/main.cc:118
+msgid "File not found"
+msgstr "Skrá fannst ekki"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 288
-#: rc.cpp:612 rc.cpp:1024
-#, no-c-format
-msgid "Query contains"
-msgstr "Inniheldur færslu"
+#: datatools/regexp/main.cc:123
+msgid "The file is not a XML"
+msgstr "Skráin er ekki XML"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 291
-#: rc.cpp:615 rc.cpp:1027
-#, no-c-format
-msgid "Match if query contains the database string"
-msgstr "Passar ef leitarstrengur inniheldur færslu í gagnagrunni"
+#: datatools/regexp/main.cc:147
+msgid "Expected tag 'item'"
+msgstr "Átti von á taginu 'item'"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 299
-#: rc.cpp:618 rc.cpp:1030
-#, no-c-format
-msgid "Normal text"
-msgstr "Venjulegur texti"
+#: datatools/regexp/main.cc:153
+msgid "First child of 'item' is not a node"
+msgstr "Fyrsti undirflokkur 'item' er ekki hnúður"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 305
-#: rc.cpp:621 rc.cpp:1033
-#, no-c-format
-msgid "Consider the search string as normal text."
-msgstr "Nota leitarstrengin sem venjulegan texta"
+#: datatools/regexp/main.cc:159
+msgid "Expected tag 'name'"
+msgstr "Átti von á taginu 'name'"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 313
-#: rc.cpp:624 rc.cpp:1036
-#, no-c-format
-msgid "Equal"
-msgstr "Líkt"
+#: datatools/regexp/main.cc:167
+msgid "Expected tag 'exp'"
+msgstr "Átti von á taginu 'exp'"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 322
-#: rc.cpp:627 rc.cpp:1039
-#, no-c-format
-msgid "Match if query and database string are equal"
-msgstr "Passar ef leitarstrengur og færsla í gagnagrunni eru lík"
+#: filters/gettext/gettextimport.cpp:83
+msgid "loading file"
+msgstr "hleð inn skrá"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 347
-#: rc.cpp:630 rc.cpp:1042
-#, no-c-format
-msgid "Regular expression"
-msgstr "Regluleg segð"
+#: filters/gettext/gettextexport.cpp:74
+msgid "saving file"
+msgstr "vista skrá"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 350
-#: rc.cpp:633 rc.cpp:1045
-#, no-c-format
-msgid "Consider the search string as a regular expression"
-msgstr "Nota leitarstrengin sem reglulega segð"
+#: kbabeldict/kbabeldict.cpp:45
+msgid "KBabelDict"
+msgstr "KBabelDict"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 360
-#: rc.cpp:636 rc.cpp:1048
-#, no-c-format
-msgid "Word Substitution"
-msgstr "Orðaskipting"
+#: kbabeldict/kbabeldict.cpp:47
+msgid "About Module"
+msgstr "Um einingu"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 365
-#: rc.cpp:639 rc.cpp:1051
-#, no-c-format
-msgid ""
-"<qml>If you use one or two <em>word substitution</em> "
-"each time you search a phrase with less than the specified number of words, the "
-"search engine will also search for all phrases that differ from the original "
-"one in one or two words."
-"<p>\n"
-"<strong>Example:</strong>"
-"<br>\n"
-"If you search for <em>My name is Andrea</em> and you have activated <em>"
-"one word substitution</em> you may also find phrases like <em>"
-"My name is Joe</em> or <em>Your name is Andrea</em>."
-msgstr ""
-"<qml>Ef þú notar eins eða tveggja <em>orðaskiptingu</em> "
-"mun leitarvélin leita eftir líkum setningum sem innihalda eitt eða tvö ólík "
-"orð."
-"<p>\n"
-"<strong>Dæmi:</strong>"
-"<br>\n"
-"Ef að þú leitaðir eftir <em>Ég heiti María</em> með <em>eins orðaskiptingu</em> "
-"gæti leitarniðurstaðan einnig fundið <em>Ég heiti Ásbjörn</em>."
+#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
+msgid "Hide Sett&ings"
+msgstr "Fela st&illingar"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 399
-#: rc.cpp:644 rc.cpp:1056
-#, no-c-format
-msgid "Use one word substitution"
-msgstr "Nota eins orðaskiptingu"
+#: kbabeldict/kbabeldict.cpp:108
+msgid "Show Sett&ings"
+msgstr "Sýna st&illingar"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 430
-#: rc.cpp:647 rc.cpp:653 rc.cpp:1059 rc.cpp:1065
-#, no-c-format
-msgid "Max number of words in the query:"
-msgstr "Hámarksfjöldi af orðum í fyrirspurninni:"
+#: kbabeldict/kbabeldictview.cpp:83
+msgid "Search in module:"
+msgstr "Leita í einingu:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 455
-#: rc.cpp:650 rc.cpp:1062
-#, no-c-format
-msgid "Use two word substitution"
-msgstr "Nota tveggja orðaskiptingu"
+#: kbabeldict/kbabeldictview.cpp:106
+msgid "&Start Search"
+msgstr "&Hefja leit"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 488
-#: rc.cpp:656 rc.cpp:1068
-#, no-c-format
-msgid "[A-Za-z0-9_%"
-msgstr "[A-Za-z0-9_%"
+#: kbabeldict/kbabeldictview.cpp:108
+msgid "Sea&rch in translations"
+msgstr "&Leita í þýðingum"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 506
-#: rc.cpp:659 rc.cpp:1071
-#, no-c-format
-msgid "]"
-msgstr "]"
+#: kbabeldict/kbabeldictview.cpp:125
+msgid "Settings:"
+msgstr "Stillingar:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 516
-#: rc.cpp:662 rc.cpp:1074
-#, no-c-format
-msgid "Local characters for regular expressions:"
-msgstr "Staðbundin tákn fyrir reglulega segð:"
+#: kbabeldict/main.cpp:114
+msgid "KBabel - Dictionary"
+msgstr "KBabel - orðabók"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 553
-#: rc.cpp:665 rc.cpp:759 rc.cpp:1077
-#, no-c-format
-msgid "Database"
-msgstr "Gagnagrunnur"
+#: kbabeldict/main.cpp:115
+msgid "A dictionary for translators"
+msgstr "Orðabók fyrir þýðendur"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 570
-#: rc.cpp:668 rc.cpp:1080
-#, no-c-format
-msgid "Database folder:"
-msgstr "Mappa fyrir gagnagrunn:"
+#: kbabeldict/main.cpp:116
+msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
+msgstr "(c) 2000,2001,2002,2003 KBabeldict forritarnir"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 586
-#: rc.cpp:671 rc.cpp:1083
-#, no-c-format
-msgid "Auto add entry to database"
-msgstr "Bætja sjálfkrafa við nýjum færslum"
+#: kbabeldict/aboutmoduledlg.cpp:42
+msgid "Report Bug..."
+msgstr "Senda villutilkynningu..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 592
-#: rc.cpp:674 rc.cpp:1086
-#, no-c-format
+#: kbabeldict/dictchooser.cpp:59
 msgid ""
-"Automatically add an entry to the database if a new translation is notified by "
-"someone (may be kbabel)"
-msgstr ""
-"Bæta sjálfkrafa við færslum í gagnagrunn ef ný þýðing er tilkynnt af einhverjum "
-"(getur verið KBabel)"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 614
-#: rc.cpp:677 rc.cpp:1089
-#, no-c-format
-msgid "Auto added entry author:"
-msgstr "Höfundur:"
+"_: dictionary to not use\n"
+"Do not use:"
+msgstr "Ekki nota:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 622
-#: rc.cpp:680 rc.cpp:1092
-#, no-c-format
+#: kbabeldict/dictchooser.cpp:62
 msgid ""
-"<qml>Put here the name and email address that you want to use as <em>"
-"last translator</em> filed when you auto-add entry to the database (e.g. when "
-"you modify a translation with kbabel)."
-"<p>"
-msgstr ""
-"<qml>Settu hér nafn og netfang sem þú vilt nota sem <em>síðasti þýðandi</em> "
-"þegar þú bætir sjálfkrafa færslum í gagnarunninn (þ.e.a.s. þegar þú breytir "
-"þýðingu með kbabel)."
-"<p>"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
-#: rc.cpp:683
-#, no-c-format
-msgid "Scan Single PO File..."
-msgstr "Leita í einni PO skrá..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
-#: rc.cpp:686
-#, no-c-format
-msgid "Scan Folder..."
-msgstr "Leita í möppu..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
-#: rc.cpp:689
-#, no-c-format
-msgid "Scan Folder && Subfolders..."
-msgstr "Leita í möppu og undirmöppum hennar..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 670
-#: rc.cpp:692 rc.cpp:1104
-#, no-c-format
-msgid "Scanning file:"
-msgstr "Skoða skrá:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 678
-#: rc.cpp:695 rc.cpp:1107
-#, no-c-format
-msgid "Entries added:"
-msgstr "Reitir sem bætt hefur verið við:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 719
-#: rc.cpp:698 rc.cpp:1110
-#, no-c-format
-msgid "Total progress:"
-msgstr "Heildarframför:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 727
-#: rc.cpp:701 rc.cpp:1113
-#, no-c-format
-msgid "Processing file:"
-msgstr "Vinn með skrá:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 763
-#: rc.cpp:704 rc.cpp:1116
-#, no-c-format
-msgid "Loading file:"
-msgstr "Hleð inn skrá:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 776
-#: rc.cpp:707 rc.cpp:1119
-#, no-c-format
-msgid "Export..."
-msgstr "Flytja út..."
+"_: dictionary to use\n"
+"Use:"
+msgstr "Nota:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 787
-#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:710 rc.cpp:1122
-#, no-c-format
-msgid "Statistics"
-msgstr "Tölfræði"
+#: kbabeldict/dictchooser.cpp:84
+msgid "Move &Up"
+msgstr "Færa &upp"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 795
-#: rc.cpp:713 rc.cpp:1125
-#, no-c-format
-msgid "Repeated Strings"
-msgstr "Endurteknir strengir"
+#: kbabeldict/dictchooser.cpp:87
+msgid "Move &Down"
+msgstr "Færa &niður"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 805
-#: rc.cpp:716 rc.cpp:1128
-#, no-c-format
-msgid "Good Keys"
-msgstr "Góðir lyklar"
+#: kbabeldict/dictchooser.cpp:90
+msgid "Con&figure..."
+msgstr "Sti&lla..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 829
-#: rc.cpp:722 rc.cpp:1134
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
 msgid ""
-"<qml>Here you can define how to fill the <em>good keys list</em>."
-"<p>\n"
-"You can set the minimum number of words of the query that a key must have to be "
-"inserted in the <em>good keys list</em>."
-"<p>\n"
-"You can also set the minimum number of words of the key that the query must "
-"have to insert the key in the list."
-"<p>\n"
-"These two numbers are the percentage of the total number of words. If the "
-"result of this percentage is less than one, the engine will set it to one."
-"<p>\n"
-"Finally you can set the maximum number of entries in the list."
-msgstr ""
-"<qml>Hér getur þú skilgreint hvernig á að fylla <em>góðir lyklar</em> listann."
-"<p>\n"
-"Þú getur sett inn lágmarksfjölda af orðum sem leitarstrengurinn verður að "
-"innihalda til að vera bætt í <em>góðir lyklar</em> listann."
-"<p>\n"
-"Einnig getur þú sett inn lágmarksfjölda af orðum sem leitarstrengurinn verður "
-"að innihalda til að vera settur í listann."
-"<p>\n"
-"Þessar tvær tölur eru prósentan af heildar orðafjöldanum. Ef niðurstaða "
-"prósentunar er minni en einn, verður vélin sett á einn. "
-"<p>\n"
-"Að lokum getur þú sett inn hámarksfjölda af færslum í listann."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 846
-#: rc.cpp:729 rc.cpp:1141
-#, no-c-format
-msgid "Minimum number of words of the key also in the query (%):"
+"The name you chose is already used.\n"
+"Please change the source name."
 msgstr ""
-"Lágmarksfjöldi af orðum í leitarstreng sem einnig finnast í færslu (%):"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 871
-#: rc.cpp:732 rc.cpp:738 rc.cpp:1144 rc.cpp:1150
-#, no-c-format
-msgid "%"
-msgstr "%"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 885
-#: rc.cpp:735 rc.cpp:1147
-#, no-c-format
-msgid "Minimum number of query words in the key (%):"
-msgstr "Lágmarskfjöldi af leitarorðum í lykli (%):"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 918
-#: rc.cpp:741 rc.cpp:1153
-#, no-c-format
-msgid "Max list length:"
-msgstr "Hámarkslengd lista:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 942
-#: rc.cpp:744 rc.cpp:1156
-#, no-c-format
-msgid "Frequent Words"
-msgstr "Algeng orð"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 959
-#: rc.cpp:747 rc.cpp:1159
-#, no-c-format
-msgid "Discard words more frequent than:"
-msgstr "Sleppa orðum sem eru algengari en:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 967
-#: rc.cpp:750 rc.cpp:1162
-#, no-c-format
-msgid "/10000"
-msgstr "/10000"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 984
-#: rc.cpp:753 rc.cpp:1165
-#, no-c-format
-msgid "Frequent words are considered as in every key"
-msgstr "Algeng orð eru þau sem koma fyrir í öllum lyklum"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
-#: rc.cpp:756
-#, no-c-format
-msgid "General"
-msgstr "Almennt"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
-#: rc.cpp:762
-#, no-c-format
-msgid "DB folder:"
-msgstr "DB mappa:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
-#: rc.cpp:765
-#, no-c-format
-msgid "Automatic update in kbabel"
-msgstr "Sjálfvirk uppfærsla í kbabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
-#: rc.cpp:768
-#, no-c-format
-msgid "New Entries"
-msgstr "Nýjar færslur"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
-#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:771
-#, no-c-format
-msgid "Author:"
-msgstr "Höfundur:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
-#: rc.cpp:774
-#, no-c-format
-msgid "From kbabel"
-msgstr "Frá kbabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
-#: rc.cpp:777
-#, no-c-format
-msgid "Algorithm"
-msgstr "Algrím"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
-#: rc.cpp:780
-#, no-c-format
-msgid "Minimum score:"
-msgstr "Lágmarksstig:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
-#: rc.cpp:783
-#, no-c-format
-msgid "Algorithms to Use"
-msgstr "Algrími sem á að nota"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
-#: rc.cpp:786 rc.cpp:789 rc.cpp:807 rc.cpp:810 rc.cpp:813 rc.cpp:816
-#: rc.cpp:819
-#, no-c-format
-msgid "Score:"
-msgstr "Stig:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
-#: rc.cpp:792
-#, no-c-format
-msgid "Fuzzy sentence archive"
-msgstr "Safn yfir loðnar setningar"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
-#: rc.cpp:795
-#, no-c-format
-msgid "Glossary"
-msgstr "Orðasafn"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
-#: rc.cpp:798
-#, no-c-format
-msgid "Exact "
-msgstr "Nákvæmt "
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
-#: rc.cpp:801
-#, no-c-format
-msgid "Sentence by sentence"
-msgstr "Setningu fyrir setningu"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
-#: rc.cpp:804
-#, no-c-format
-msgid "Alphanumeric"
-msgstr "Tölur og bókstafir"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
-#: rc.cpp:822
-#, no-c-format
-msgid "Word by word"
-msgstr "Orð fyrir orð"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
-#: rc.cpp:825
-#, no-c-format
-msgid "Dynamic dictionary"
-msgstr "Breytileg orðabók"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
-#: rc.cpp:828
-#, no-c-format
-msgid "Preferred number of results:"
-msgstr "Fjöldi óskaðra niðurstaðna:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
-#: rc.cpp:831
-#, no-c-format
-msgid "Output"
-msgstr "Úttak"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
-#: rc.cpp:834
-#, no-c-format
-msgid "Output Processing"
-msgstr "Vinn með skrá"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
-#: rc.cpp:837
-#, no-c-format
-msgid "First capital letter match"
-msgstr "Fyrsti hástafur stemmir"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
-#: rc.cpp:840
-#, no-c-format
-msgid "All capital letter match"
-msgstr "Allir hástafir stemma"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
-#: rc.cpp:843
-#, no-c-format
-msgid "Accelerator symbol (&&)"
-msgstr "Hraðvalstákn (&&)"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
-#: rc.cpp:846
-#, no-c-format
-msgid "Try to use same letter"
-msgstr "Reyna að nota sama staf"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
-#: rc.cpp:849
-#, no-c-format
-msgid "Custom Rules"
-msgstr "Sérsniðnar reglur"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
-#: rc.cpp:852
-#, no-c-format
-msgid "Original string regexp:"
-msgstr "Upphafleg regluleg segð:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
-#: rc.cpp:855
-#, no-c-format
-msgid "Enabled"
-msgstr "Virkt"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
-#: rc.cpp:858
-#, no-c-format
-msgid "Description"
-msgstr "Lýsing"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
-#: rc.cpp:870
-#, no-c-format
-msgid "Replace string:"
-msgstr "Skipta út streng:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
-#: rc.cpp:873
-#, no-c-format
-msgid "Translated regexp(search):"
-msgstr "Þýdd regluleg segð (leit):"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
-#: rc.cpp:882
-#, no-c-format
-msgid "Check language"
-msgstr "Athugaðu tungumálið"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
-#: rc.cpp:885
-#, no-c-format
-msgid "Use current filters"
-msgstr "Nota núverandi síur"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
-#: rc.cpp:888
-#, no-c-format
-msgid "Set date to today"
-msgstr "Nota núverandi dags."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
-#: rc.cpp:891
-#, no-c-format
-msgid "Sources"
-msgstr "Kóði"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
-#: rc.cpp:900
-#, no-c-format
-msgid "Scan Now"
-msgstr "Leita núna"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
-#: rc.cpp:906
-#, no-c-format
-msgid "Scan All"
-msgstr "Leita í öllum"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
-#: rc.cpp:909
-#, no-c-format
-msgid "Filters"
-msgstr "Síur"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
-#: rc.cpp:912
-#, no-c-format
-msgid "Edit Source"
-msgstr "Breyta uppruna"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
-#: rc.cpp:921
-#, no-c-format
-msgid "Additional Informations"
-msgstr "Viðbótarupplýsingar"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
-#: rc.cpp:927
-#, no-c-format
-msgid "Project name:"
-msgstr "Nafn verkefnis:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
-#: rc.cpp:930
-#, no-c-format
-msgid "Project keywords:"
-msgstr "Stikkorð verkefnis:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
-#: rc.cpp:933
-#, no-c-format
-msgid "General Info"
-msgstr "Almennar upplýsingar"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
-#: rc.cpp:936
-#, no-c-format
-msgid "Single File"
-msgstr "Ein skrá"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
-#: rc.cpp:939
-#, no-c-format
-msgid "Single Folder"
-msgstr "Ein mappa"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
-#: rc.cpp:942
-#, no-c-format
-msgid "Recursive Folder"
-msgstr "Arfgeng mappa"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
-#: rc.cpp:945
-#, no-c-format
-msgid "Source name:"
-msgstr "Kóði:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
-#: rc.cpp:948
-#, no-c-format
-msgid "Type:"
-msgstr "Tegund:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
-#: rc.cpp:951
-#, no-c-format
-msgid "Setup Filter..."
-msgstr "Setja upp síu..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
-#: rc.cpp:954
-#, no-c-format
-msgid "Location:"
-msgstr "Staðsetning:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
-#: rc.cpp:957
-#, no-c-format
-msgid "Use filter"
-msgstr "Nota síu"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
-#: rc.cpp:960
-#, no-c-format
-msgid "DBSEPrefWidget"
-msgstr "DBSEPrefWidget"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
-#: rc.cpp:1095
-#, no-c-format
-msgid "Scan Single PO File"
-msgstr "Leita í einni PO skrá"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
-#: rc.cpp:1098
-#, no-c-format
-msgid "Scan Folder"
-msgstr "Leita í möppu"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
-#: rc.cpp:1101
-#, no-c-format
-msgid "Scan Folder && Subfolders"
-msgstr "Leita í möppu og undirmöppum hennar"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
-#: rc.cpp:1174
-#, no-c-format
-msgid "&Markings"
-msgstr "&Merkingar"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
-#: rc.cpp:1183 rc.cpp:1201 rc.cpp:1207
-#, no-c-format
-msgid "CVS"
-msgstr "CVS"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
-#: catalogmanager/future.cpp:4 rc.cpp:1186 rc.cpp:1204 rc.cpp:1210
-#, no-c-format
-msgid "SVN"
-msgstr "SVN"
-
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
-#: rc.cpp:1213
-#, no-c-format
-msgid "To be set dynamically:"
-msgstr "Sett breytilega:"
-
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
-#: rc.cpp:1222
-#, no-c-format
-msgid "&Include templates"
-msgstr "Taka með sn&iðskrár"
-
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
-#: rc.cpp:1225
-#, no-c-format
-msgid "Use &wildcards"
-msgstr "Nota &algildisstafi"
+"Nafnið er þegar í notkun.\n"
+"Vinsamlega breyttu upprunanafninu."
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
-#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1234
-#, no-c-format
-msgid "Current:"
-msgstr "Núverandi:"
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
+msgid "Name is Not Unique"
+msgstr "Nafnið er ekki einstakt"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
-#: rc.cpp:1237
-#, no-c-format
-msgid "Overall:"
-msgstr "Allt:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
+msgid "Translation Database"
+msgstr "Gagnagrunnur þýðinga"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
-#: rc.cpp:1240
-#, no-c-format
-msgid "Current file:"
-msgstr "Núverandi skrá:"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
+msgid "A fast translation search engine based on databases"
+msgstr "Hröð leitarvél fyrir þýðingar, byggð á gagnagrunni"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
-#: rc.cpp:1243
-#, no-c-format
-msgid "Validation:"
-msgstr "Prófun:"
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
+msgid "Copyright 2000-2003 by Andrea Rizzi"
+msgstr "Höfundarréttur 2000-2003, Andrea Rizzi"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 32
-#: rc.cpp:1249
-#, no-c-format
-msgid "Mark invalid as &fuzzy"
-msgstr "Merkja ógildar &færslur sem loðnar"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
+msgid "CHUNK BY CHUNK"
+msgstr "BITA EFTIR BITA"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 39
-#: rc.cpp:1252
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
 msgid ""
-"<qt>"
-"<p><b>Mark invalid as fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items,\n"
-"which identifies the tool as invalid, will be\n"
-"marked as fuzzy and the resulting file\n"
-"will be saved.</p></qt>"
+"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
+"translating the  sentences and using afuzzy sentence translation database."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
 msgstr ""
-"<qt>"
-"<p><b>Merkja ógildar færslur sem loðnar</b>"
-"<p>\n"
-"<p>Ef þú velur þennan valkost, verða allar\n"
-"færslur sem eru ógildar merktar sem loðnar\n"
-"og skráin verður vistuð.</p></qt>"
+"<h3>Bita eftir bita</h3>Breyttu þessum texta! Þýðingin er fengin með að "
+"grófþýða setninguna með hjálp af gagnagrunninum. "
+"<br> <b>Ekki treysta á þessa þýðingu</b>. Hún getur verið ónákvæm. "
+"<br>"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 47
-#: rc.cpp:1259
-#, no-c-format
-msgid "&Do not validate fuzzy"
-msgstr "&Ekki staðfesta loðnar færslur"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
+msgid "DYNAMIC DICT:"
+msgstr "BREYTILEG ORÐAB:"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 52
-#: rc.cpp:1262
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
 msgid ""
-"<qt>"
-"<p><b>Do not validate fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items\n"
-"marked as fuzzy will not be validated at all.</p></qt>"
+"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
+"correlation of original and translated words."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
 msgstr ""
-"<qt>"
-"<p><b>Ekki staðfesta loðnar færslur</b>"
-"<p>\n"
-"<p>Ef þú velur þennan valkost, verða færslur\n"
-"sem eru merktar loðnar ekki staðfestar.</p></qt>"
-
-#: kbabeldict/aboutmoduledlg.cpp:42
-msgid "Report Bug..."
-msgstr "Senda villutilkynningu..."
+"<h3>Breytileg orðabók</h3>Þetta er breytileg orðabók sem er búin til með því að "
+"bera saman upprunalegan og þýddan texta."
+"<br> <b>Ekki treysta á hana</b>. Þýðingar geta verið loðnar."
+"<br>"
 
-#: kbabeldict/kbabeldictview.cpp:83
-msgid "Search in module:"
-msgstr "Leita í einingu:"
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create Database"
+msgstr "Búa til gagnagrunn"
 
-#: kbabeldict/kbabeldictview.cpp:106
-msgid "&Start Search"
-msgstr "&Hefja leit"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create"
+msgstr "Búa til"
 
-#: kbabeldict/kbabeldictview.cpp:108
-msgid "Sea&rch in translations"
-msgstr "&Leita í þýðingum"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Do Not Create"
+msgstr "Ekki búa til"
 
-#: kbabeldict/kbabeldictview.cpp:125
-msgid "Settings:"
-msgstr "Stillingar:"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
+msgid "PO Compendium"
+msgstr "PO ágrip"
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:95
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
-msgid "TMX Compendium"
-msgstr "TMX ágrip"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
+msgid "A module for searching in a PO file"
+msgstr "Eining til að leita í PO-skrám"
 
 #: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
 #: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
@@ -4748,16 +4861,31 @@ msgstr "TMX ágrip"
 msgid "Loading PO compendium"
 msgstr "Opna PO ágrip"
 
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:88
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#, c-format
+msgid ""
+"Error while trying to read file for PO Compendium module:\n"
+"%1"
+msgstr ""
+"Villa kom upp þegar reynt var að lesa skrá fyrir PO ágripa einingu:\n"
+"%1"
+
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
+msgid "Building indices"
+msgstr "Bý til spjaldskrár"
+
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
 msgid ""
 "<qt>"
 "<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example, if you "
-"want to perform a case sensitive search.</p></qt>"
+"<p>Here you can fine-tune searching within the PO file. For example if you want "
+"to perform a case sensitive search, or if you want fuzzy messages to be "
+"ignored.</p></qt>"
 msgstr ""
 "<qt>"
 "<p><b>Stærðir</b></p>"
-"<p>Hér geturðu fínstillt leit í PO skrám.Til dæmis ef þú vilt leita eftir "
+"<p>Hér geturðu fínstillt leit í po skrám.Til dæmis ef þú vilt leita eftir "
 "há/lágstöfum eða ef sleppa á loðnum skilaboðum.</p></qt>"
 
 #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
@@ -4796,6 +4924,53 @@ msgstr ""
 "<p><b>Staðsetning</b></p>"
 "<p>Stilltu hér hvaða skrá á að nota við leit</p></qt>"
 
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
+msgid "PO Auxiliary"
+msgstr "PO viðbót"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
+msgid "Loading PO auxiliary"
+msgstr "Hleð inn PO viðbót"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
+#, c-format
+msgid ""
+"Error while trying to open file for PO Auxiliary module:\n"
+"%1"
+msgstr ""
+"Villa kom upp þegar reynt var að opna PO viðbótareininguna:\n"
+"%1"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
+msgid "Building index"
+msgstr "Bý til spjaldskrá"
+
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
+msgid "A simple module for exact searching in a PO file"
+msgstr "Einföld eining fyrir nákvæma leit í PO skrám"
+
+#: kbabeldict/modules/tmx/pc_factory.cpp:95
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
+msgid "TMX Compendium"
+msgstr "TMX ágrip"
+
+#: kbabeldict/modules/tmx/pc_factory.cpp:97
+msgid "A module for searching in a TMX file"
+msgstr "Eining til að leita í TMX skrám"
+
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Parameters</b></p>"
+"<p>Here you can fine-tune searching within the PO file. For example, if you "
+"want to perform a case sensitive search.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Stærðir</b></p>"
+"<p>Hér geturðu fínstillt leit í PO skrám.Til dæmis ef þú vilt leita eftir "
+"há/lágstöfum eða ef sleppa á loðnum skilaboðum.</p></qt>"
+
 #: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
 msgid "Loading TMX compendium"
 msgstr "Opna TMX ágrip"
@@ -4823,101 +4998,14 @@ msgstr ""
 "%1\n"
 "Ástæða: %2"
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
-msgid "Building indices"
-msgstr "Bý til spjaldskrár"
-
 #: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:229
 msgid "Empty database."
 msgstr "Tómur gagnagrunnur."
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:97
-msgid "A module for searching in a TMX file"
-msgstr "Eining til að leita í TMX skrám"
-
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
-msgid "PO Compendium"
-msgstr "PO ágrip"
-
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
-#, c-format
-msgid ""
-"Error while trying to read file for PO Compendium module:\n"
-"%1"
-msgstr ""
-"Villa kom upp þegar reynt var að lesa skrá fyrir PO ágripa einingu:\n"
-"%1"
-
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
-msgid ""
-"<qt>"
-"<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example if you want "
-"to perform a case sensitive search, or if you want fuzzy messages to be "
-"ignored.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Stærðir</b></p>"
-"<p>Hér geturðu fínstillt leit í po skrám.Til dæmis ef þú vilt leita eftir "
-"há/lágstöfum eða ef sleppa á loðnum skilaboðum.</p></qt>"
-
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
-msgid "A module for searching in a PO file"
-msgstr "Eining til að leita í PO-skrám"
-
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
-msgid "PO Auxiliary"
-msgstr "PO viðbót"
-
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
-msgid "A simple module for exact searching in a PO file"
-msgstr "Einföld eining fyrir nákvæma leit í PO skrám"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
-msgid "Loading PO auxiliary"
-msgstr "Hleð inn PO viðbót"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
-#, c-format
-msgid ""
-"Error while trying to open file for PO Auxiliary module:\n"
-"%1"
-msgstr ""
-"Villa kom upp þegar reynt var að opna PO viðbótareininguna:\n"
-"%1"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
-msgid "Building index"
-msgstr "Bý til spjaldskrá"
-
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
-msgid "Translation Database"
-msgstr "Gagnagrunnur þýðinga"
-
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
-msgid "A fast translation search engine based on databases"
-msgstr "Hröð leitarvél fyrir þýðingar, byggð á gagnagrunni"
-
 #: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
 msgid "Copyright 2000-2001 by Andrea Rizzi"
 msgstr "Höfundarréttur 2000-2001, Andrea Rizzi"
 
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
-#, c-format
-msgid "Scanning file: %1"
-msgstr "Les skrána: %1"
-
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
-#, c-format
-msgid "Entries added: %1"
-msgstr "Bæti við reitum: %1"
-
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
 msgid "No error"
 msgstr "Engin villa"
@@ -4936,12 +5024,6 @@ msgstr ""
 msgid "Create Folder"
 msgstr "Búa til möppu"
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Do Not Create"
-msgstr "Ekki búa til"
-
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
 #, c-format
 msgid "It was not possible to create folder %1"
@@ -4993,11 +5075,6 @@ msgstr ""
 "Gagnagrunnsskrár fundust ekki.\n"
 "Viltu búa þær til?"
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create"
-msgstr "Búa til"
-
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
 msgid "Cannot open the database"
 msgstr "Get ekki opnað gagnagrunninn"
@@ -5076,77 +5153,15 @@ msgstr "Leita eftir orðum"
 msgid "Process output"
 msgstr "Meðhöndla úttak"
 
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
-msgid "Copyright 2000-2003 by Andrea Rizzi"
-msgstr "Höfundarréttur 2000-2003, Andrea Rizzi"
-
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
-msgid ""
-"The name you chose is already used.\n"
-"Please change the source name."
-msgstr ""
-"Nafnið er þegar í notkun.\n"
-"Vinsamlega breyttu upprunanafninu."
-
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
-msgid "Name is Not Unique"
-msgstr "Nafnið er ekki einstakt"
-
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create Database"
-msgstr "Búa til gagnagrunn"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
-msgid "CHUNK BY CHUNK"
-msgstr "BITA EFTIR BITA"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
-msgid ""
-"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
-"translating the  sentences and using afuzzy sentence translation database."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-msgstr ""
-"<h3>Bita eftir bita</h3>Breyttu þessum texta! Þýðingin er fengin með að "
-"grófþýða setninguna með hjálp af gagnagrunninum. "
-"<br> <b>Ekki treysta á þessa þýðingu</b>. Hún getur verið ónákvæm. "
-"<br>"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
-msgid "DYNAMIC DICT:"
-msgstr "BREYTILEG ORÐAB:"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
-msgid ""
-"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
-"correlation of original and translated words."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-msgstr ""
-"<h3>Breytileg orðabók</h3>Þetta er breytileg orðabók sem er búin til með því að "
-"bera saman upprunalegan og þýddan texta."
-"<br> <b>Ekki treysta á hana</b>. Þýðingar geta verið loðnar."
-"<br>"
-
-#: kbabeldict/kbabeldict.cpp:45
-msgid "KBabelDict"
-msgstr "KBabelDict"
-
-#: kbabeldict/kbabeldict.cpp:47
-msgid "About Module"
-msgstr "Um einingu"
-
-#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
-msgid "Hide Sett&ings"
-msgstr "Fela st&illingar"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
+#, c-format
+msgid "Scanning file: %1"
+msgstr "Les skrána: %1"
 
-#: kbabeldict/kbabeldict.cpp:108
-msgid "Show Sett&ings"
-msgstr "Sýna st&illingar"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
+#, c-format
+msgid "Entries added: %1"
+msgstr "Bæti við reitum: %1"
 
 #: kbabeldict/kbabeldictbox.cpp:201
 msgid "Total:"
@@ -5246,41 +5261,31 @@ msgstr ""
 "Því miður en \"Gagnagrunnur þýðingarinnar\"\n"
 "virðist ekki vera uppsettur á kerfinu þínu. "
 
-#: kbabeldict/dictchooser.cpp:59
-msgid ""
-"_: dictionary to not use\n"
-"Do not use:"
-msgstr "Ekki nota:"
-
-#: kbabeldict/dictchooser.cpp:62
-msgid ""
-"_: dictionary to use\n"
-"Use:"
-msgstr "Nota:"
-
-#: kbabeldict/dictchooser.cpp:84
-msgid "Move &Up"
-msgstr "Færa &upp"
+#: common/kbmailer.cpp:106
+#, c-format
+msgid "Error while trying to download file %1."
+msgstr "Villa kom upp þegar reynt var að sækja skrána %1."
 
-#: kbabeldict/dictchooser.cpp:87
-msgid "Move &Down"
-msgstr "Færa &niður"
+#: common/kbmailer.cpp:145
+msgid "Enter the name of the archive without file extension"
+msgstr "Sláðu inn nafn safnskráar, án endingarinnar"
 
-#: kbabeldict/dictchooser.cpp:90
-msgid "Con&figure..."
-msgstr "Sti&lla..."
+#: common/kbmailer.cpp:178
+msgid "Error while trying to create archive file."
+msgstr "Villa við undirbúning safnskráar."
 
-#: kbabeldict/main.cpp:114
-msgid "KBabel - Dictionary"
-msgstr "KBabel - orðabók"
+#: common/kbmailer.cpp:193
+#, c-format
+msgid "Error while trying to read file %1."
+msgstr "Villa kom upp við lestur skráar %1."
 
-#: kbabeldict/main.cpp:115
-msgid "A dictionary for translators"
-msgstr "Orðabók fyrir þýðendur"
+#: common/kbmailer.cpp:208
+msgid "Error while trying to copy file %1 into archive."
+msgstr "Villa kom upp þegar reynt var að afrita skrána %1 í safnskrá."
 
-#: kbabeldict/main.cpp:116
-msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
-msgstr "(c) 2000,2001,2002,2003 KBabeldict forritarnir"
+#: common/kbproject.cpp:53
+msgid "unnamed"
+msgstr "nafnlaus"
 
 #: common/catalog.cpp:592
 msgid ""
@@ -5306,39 +5311,328 @@ msgstr "leita að samsvarandi skilaboðum"
 msgid "preparing messages for diff"
 msgstr "undirbý skilaboð fyrir diff"
 
-#: common/kbproject.cpp:53
-msgid "unnamed"
-msgstr "nafnlaus"
+#: addons/tdefile-plugins/tdefile_po.cpp:50
+msgid "Catalog Information"
+msgstr "Upplýsingar"
 
-#: common/kbmailer.cpp:106
-#, c-format
-msgid "Error while trying to download file %1."
-msgstr "Villa kom upp þegar reynt var að sækja skrána %1."
+#: addons/tdefile-plugins/tdefile_po.cpp:53
+msgid "Total Messages"
+msgstr "Fjöldi skilaboða"
 
-#: common/kbmailer.cpp:145
-msgid "Enter the name of the archive without file extension"
-msgstr "Sláðu inn nafn safnskráar, án endingarinnar"
+#: addons/tdefile-plugins/tdefile_po.cpp:54
+msgid "Fuzzy Messages"
+msgstr "Loðin skilaboð"
 
-#: common/kbmailer.cpp:178
-msgid "Error while trying to create archive file."
-msgstr "Villa við undirbúning safnskráar."
+#: addons/tdefile-plugins/tdefile_po.cpp:55
+msgid "Untranslated Messages"
+msgstr "Óþýdd skilaboð"
 
-#: common/kbmailer.cpp:193
+#: addons/tdefile-plugins/tdefile_po.cpp:56
+#: catalogmanager/catalogmanagerview.cpp:96
+msgid "Last Translator"
+msgstr "Síðasti þýðandi"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:57
+msgid "Language Team"
+msgstr "Tungumálahópur"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:58
+msgid "Revision"
+msgstr "Síðast yfirfarið"
+
+#: catalogmanager/catalogmanager.cpp:222
+#: catalogmanager/validateprogress.cpp:72
+msgid "&Open"
+msgstr "&Opna"
+
+#: catalogmanager/catalogmanager.cpp:225
+msgid "&Open Template"
+msgstr "&Opna snið"
+
+#: catalogmanager/catalogmanager.cpp:228
+msgid "Open in &New Window"
+msgstr "Opna í &nýjum glugga"
+
+#: catalogmanager/catalogmanager.cpp:237
+msgid "Fi&nd in Files..."
+msgstr "Fi&nna í skrám..."
+
+#: catalogmanager/catalogmanager.cpp:240
+msgid "Re&place in Files..."
+msgstr "Ski&pta út í skrám..."
+
+#: catalogmanager/catalogmanager.cpp:251
+msgid "&Toggle Marking"
+msgstr "&Víxla merkingum"
+
+#: catalogmanager/catalogmanager.cpp:254
+msgid "Remove Marking"
+msgstr "Fjarlægja merkingar"
+
+#: catalogmanager/catalogmanager.cpp:257
+msgid "Toggle All Markings"
+msgstr "Víxla öllum merkingum"
+
+#: catalogmanager/catalogmanager.cpp:260
+msgid "Remove All Markings"
+msgstr "Fjarlægja allar merkingar"
+
+#: catalogmanager/catalogmanager.cpp:263
+msgid "Mark Modified Files"
+msgstr "Merkja breyttar skrár"
+
+#: catalogmanager/catalogmanager.cpp:267
+msgid "&Load Markings..."
+msgstr "H&laða inn merkingum..."
+
+#: catalogmanager/catalogmanager.cpp:270
+msgid "&Save Markings..."
+msgstr "Vi&sta merkingar..."
+
+#: catalogmanager/catalogmanager.cpp:273
+msgid "&Mark Files..."
+msgstr "&Merkja skrár..."
+
+#: catalogmanager/catalogmanager.cpp:275
+msgid "&Unmark Files..."
+msgstr "&Afvelja skrár..."
+
+#: catalogmanager/catalogmanager.cpp:309
+msgid "Next Te&mplate Only"
+msgstr "Aðeins &næsta sniðskrá"
+
+#: catalogmanager/catalogmanager.cpp:312
+msgid "Previous Temp&late Only"
+msgstr "Aðeins fyrri sniðs&krá"
+
+#: catalogmanager/catalogmanager.cpp:315
+msgid "Next Tran&slation Exists"
+msgstr "Næstu þýðingu &sem finnst"
+
+#: catalogmanager/catalogmanager.cpp:318
+msgid "Previous Transl&ation Exists"
+msgstr "Fyrri þýðingu s&em finnst"
+
+#: catalogmanager/catalogmanager.cpp:322
+msgid "Previous Marke&d"
+msgstr "Fyrri merk&tu"
+
+#: catalogmanager/catalogmanager.cpp:325
+msgid "Next &Marked"
+msgstr "Næstu &merktu"
+
+#: catalogmanager/catalogmanager.cpp:350
+msgid "&Statistics"
+msgstr "T&ölfræði"
+
+#: catalogmanager/catalogmanager.cpp:353
+msgid "S&tatistics in Marked"
+msgstr "&Tölfræði í merktum"
+
+#: catalogmanager/catalogmanager.cpp:356
+msgid "Check S&yntax"
+msgstr "&Athuga setningafræði"
+
+#: catalogmanager/catalogmanager.cpp:359
+msgid "S&pell Check"
+msgstr "Stafsetningar&leiðrétting"
+
+#: catalogmanager/catalogmanager.cpp:362
+msgid "Spell Check in &Marked"
+msgstr "Stafsetningarleiðrétting í &merktum"
+
+#: catalogmanager/catalogmanager.cpp:365
+msgid "&Rough Translation"
+msgstr "G&róf þýðing"
+
+#: catalogmanager/catalogmanager.cpp:368
+msgid "Rough Translation in M&arked"
+msgstr "&Gróf þýðing í merktum"
+
+#: catalogmanager/catalogmanager.cpp:371
+msgid "Mai&l"
+msgstr "&Póstsenda"
+
+#: catalogmanager/catalogmanager.cpp:374
+msgid "Mail Mar&ked"
+msgstr "Póstsenda mer&ktar"
+
+#: catalogmanager/catalogmanager.cpp:378
+msgid "&Pack"
+msgstr "&Pakka"
+
+#: catalogmanager/catalogmanager.cpp:380
+msgid "Pack &Marked"
+msgstr "Pakka &merktar"
+
+#: catalogmanager/catalogmanager.cpp:412
+msgid "V&alidation Marked"
+msgstr "Prófa merkt&ar"
+
+#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
+msgid "Update"
+msgstr "Uppfæra"
+
+#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
+msgid "Update Marked"
+msgstr "Uppfæra merktar"
+
+#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
+msgid "Commit"
+msgstr "Setja inn"
+
+#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
+msgid "Commit Marked"
+msgstr "Setja inn merktar"
+
+#: catalogmanager/catalogmanager.cpp:433
+msgid "Status"
+msgstr "Staða"
+
+#: catalogmanager/catalogmanager.cpp:435
+msgid "Status for Marked"
+msgstr "Staða merktra skráa"
+
+#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
+msgid "Show Diff"
+msgstr "Sýna mismun"
+
+#: catalogmanager/catalogmanager.cpp:459
+msgid "Status (Local)"
+msgstr "Staða (staðbundin)"
+
+#: catalogmanager/catalogmanager.cpp:461
+msgid "Status (Local) for Marked"
+msgstr "Staða (staðbundinna) merktra skráa"
+
+#: catalogmanager/catalogmanager.cpp:463
+msgid "Status (Remote)"
+msgstr "Staða (fjarlæg)"
+
+#: catalogmanager/catalogmanager.cpp:465
+msgid "Status (Remote) for Marked"
+msgstr "Staða (fjarlægra) merktra skráa"
+
+#: catalogmanager/catalogmanager.cpp:469
+msgid "Show Information"
+msgstr "Sýna upplýsingar"
+
+#: catalogmanager/catalogmanager.cpp:471
+msgid "Show Information for Marked"
+msgstr "Sýna upplýsingar merktra skráa"
+
+#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
+msgid "Update Templates"
+msgstr "Uppfæra sniðskrár"
+
+#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
+msgid "Update Marked Templates"
+msgstr "Uppfæra merktar sniðskrár"
+
+#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
+msgid "Commit Templates"
+msgstr "Setja inn sniðskrár"
+
+#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
+msgid "Commit Marked Templates"
+msgstr "Setja inn merktar sniðskrár"
+
+#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
+msgid "Commands"
+msgstr "Skipanir"
+
+#: catalogmanager/catalogmanager.cpp:558
+msgid ""
+"<qt>"
+"<p><b>Statusbar</b></p>\n"
+"<p>The statusbar displays information about progress of the current find or "
+"replace operation. The first number in <b>Found:</b> "
+"displays the number of files with an occurrence of the searched text not yet "
+"shown in the KBabel window. The second shows the total number of files "
+"containing the searched text found so far.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Stöðuslá</b></p>\n"
+"<p>Stöðusláin sýnir upplýsingar um stöðu núverandi leitar, eða útskipti "
+"aðgerðar. Fyrsta talan í <b>Fann:</b> sýnir fjölda fundinna skráa sem hafa ekki "
+"verið sýndar ennþá í KBabel glugganum. Önnur talan sýnir heildarfjölda fundinna "
+"skráa.</p></qt>"
+
+#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
+#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
+#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
+#: catalogmanager/catalogmanager.cpp:827
+#, fuzzy
+msgid ""
+"Cannot send a message to KBabel.\n"
+"Please check your TDE installation."
+msgstr ""
+"Gat ekki sent skilaboð til KBabel.\n"
+"Vinsamlega athugaðu TDE uppsetninguna þína."
+
+#: catalogmanager/catalogmanager.cpp:858
+msgid ""
+"Unable to use TDELauncher to start KBabel.\n"
+"You should check the installation of TDE.\n"
+"Please start KBabel manually."
+msgstr ""
+"Gat ekki notað TDELauncher til að ræsa KBabel.\n"
+"Athugaðu TDE uppsetninguna þína.\n"
+"Vinsamlega ræstu KBabel handvirkt."
+
+#: catalogmanager/catalogmanager.cpp:893
+msgid "Found: 0/0"
+msgstr "Fann: 0/0"
+
+#: catalogmanager/catalogmanager.cpp:915
+msgid "Found: %1/%2"
+msgstr "Fann: %1/%2"
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP communication with KBabel failed."
+msgstr "DCOP samskipti við KBabel mistókust"
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP Communication Error"
+msgstr "DCOP samskiptavilla"
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "KBabel cannot be started."
+msgstr "Ekki hægt að ræsa KBabel."
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "Cannot Start KBabel"
+msgstr "Get ekki ræst KBabel"
+
+#: catalogmanager/catalogmanager.cpp:1008
+#: catalogmanager/catalogmanager.cpp:1094
+msgid "Search string not found!"
+msgstr "Leitarstrengur fannst ekki."
+
+#: catalogmanager/catalogmanager.cpp:1235
 #, c-format
-msgid "Error while trying to read file %1."
-msgstr "Villa kom upp við lestur skráar %1."
+msgid "Cannot open project file %1"
+msgstr "Get ekki opnað verkefnaskrá %1"
 
-#: common/kbmailer.cpp:208
-msgid "Error while trying to copy file %1 into archive."
-msgstr "Villa kom upp þegar reynt var að afrita skrána %1 í safnskrá."
+#: catalogmanager/main.cpp:186
+msgid "KBabel - Catalog Manager"
+msgstr "KBabel - Þýðingarstjóri"
 
-#: filters/gettext/gettextexport.cpp:74
-msgid "saving file"
-msgstr "vista skrá"
+#: catalogmanager/main.cpp:187
+msgid "An advanced catalog manager for KBabel"
+msgstr "Öflugur þýðingarstjóri fyrir KBabel"
 
-#: filters/gettext/gettextimport.cpp:83
-msgid "loading file"
-msgstr "hleð inn skrá"
+#: catalogmanager/main.cpp:211
+msgid "Support for making diffs and some minor improvements."
+msgstr "Stuðningur við samanburðargerð og smávægilegar breytingar."
+
+#: catalogmanager/main.cpp:216
+msgid "KBabel contains code from GNU gettext"
+msgstr "KBabel inniheldur kóða frá GNU gettext"
 
 #: catalogmanager/validateprogress.cpp:56
 msgid ""
@@ -5346,11 +5640,6 @@ msgid ""
 "Validation"
 msgstr "Prófanir"
 
-#: catalogmanager/catalogmanager.cpp:222
-#: catalogmanager/validateprogress.cpp:72
-msgid "&Open"
-msgstr "&Opna"
-
 #: catalogmanager/validateprogress.cpp:73
 msgid "&Ignore"
 msgstr "&Hunsa"
@@ -5387,57 +5676,57 @@ msgstr ""
 msgid "Validation Done"
 msgstr "Prófun lokið"
 
-#: catalogmanager/multiroughtransdlg.cpp:56
-msgid "Files:"
-msgstr "Skrár:"
-
-#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
-msgid "CVS/SVN Status"
-msgstr "CVS/SVN staða"
-
-#: catalogmanager/future.cpp:8
-msgid "Resolved"
-msgstr "Leyst"
-
-#: catalogmanager/future.cpp:9
-msgid "Resolved for Marked"
-msgstr "Leyst fyrir merktar"
-
-#: catalogmanager/future.cpp:10
-msgid "Revert"
-msgstr "Afturkalla"
+#: catalogmanager/findinfilesdialog.cpp:50
+msgid "File Options"
+msgstr "Skráavalmöguleikar"
 
-#: catalogmanager/future.cpp:11
-msgid "Revert for Marked"
-msgstr "Afturkalla fyrir merktar"
+#: catalogmanager/findinfilesdialog.cpp:53
+msgid "&In all files"
+msgstr "Í &öllum skrám"
 
-#: catalogmanager/future.cpp:12
-msgid "Cleanup"
-msgstr "Hreinsa"
+#: catalogmanager/findinfilesdialog.cpp:54
+msgid "&Marked files"
+msgstr "Í &merktum skrám"
 
-#: catalogmanager/future.cpp:13
-msgid "Cleanup for Marked"
-msgstr "Hreinsa merktar"
+#: catalogmanager/findinfilesdialog.cpp:55
+msgid "In &templates"
+msgstr "Í &sniðskrám"
 
-#: catalogmanager/future.cpp:16
-msgid "No repository"
-msgstr "Engin geymsla (repository)"
+#: catalogmanager/findinfilesdialog.cpp:56
+msgid "Ask before ne&xt file"
+msgstr "Spyrja áður en n&æsta skrá"
 
-#: catalogmanager/catmanlistitem.cpp:80
-msgid "Message Catalogs"
-msgstr "Yfirlit yfir skilaboð"
+#: catalogmanager/findinfilesdialog.cpp:57
+msgid "Save &without asking"
+msgstr "&Vista án þess að spyrja"
 
-#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
-msgid "No version control"
-msgstr "Engin útgáfustjórnun"
+#: catalogmanager/findinfilesdialog.cpp:59
+msgid ""
+"<qt>"
+"<p><b>File Options</b></p>"
+"<p>Here you can finetune where to find:"
+"<ul>"
+"<li><b>In all files</b>: search in all files, otherwise searched is the "
+"selected file or files in the selected folder</li>"
+"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
+"file</li></ul></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Skráavalmöguleikar</b></p>"
+"<p>Hér getur þú fínstilt leitina:"
+"<ul>"
+"<li><b>Í öllum skrám</b>: leitar í öllum skrám, annars er bara leitað í völdu "
+"skránni eða skrám í valinni möppu</li>"
+"<li><b>Spyrja áður en næsta skrá</b>: Sýna staðfestingarglugga sem spyr um að "
+"halda áfram með næstu skrá</li> </ul></qt>"
 
-#: catalogmanager/libcvs/cvshandler.cpp:88
-msgid "No CVS repository"
-msgstr "Engin CVS geymsla (repository)"
+#: catalogmanager/libsvn/svnhandler.cpp:90
+msgid "No SVN repository"
+msgstr "Engin SVN geymsla (repository)"
 
-#: catalogmanager/libcvs/cvshandler.cpp:91
-msgid "Not in CVS"
-msgstr "Ekki í CVS"
+#: catalogmanager/libsvn/svnhandler.cpp:93
+msgid "Not in SVN"
+msgstr "Ekki í SVN"
 
 #: catalogmanager/libcvs/cvshandler.cpp:94
 #: catalogmanager/libsvn/svnhandler.cpp:96
@@ -5464,16 +5753,19 @@ msgstr "í lagi"
 msgid "Conflict"
 msgstr "Árekstrar"
 
+#: catalogmanager/libsvn/svnhandler.cpp:111
+msgid "Error in Working Copy"
+msgstr "Villa í vinnuskrá"
+
 #: catalogmanager/libcvs/cvshandler.cpp:109
 #: catalogmanager/libsvn/svnhandler.cpp:113
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: catalogmanager/libcvs/cvshandler.cpp:189
-#: catalogmanager/libcvs/cvshandler.cpp:228
+#: catalogmanager/libsvn/svnhandler.cpp:288
 msgid ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
-msgstr "Þetta er ekki gild CVS geymsla. Get ekki keyrt CVS skipanir."
+"This is not a valid SVN repository. The SVN commands cannot be executed."
+msgstr "Þetta er ekki gild SVN geymsla. Get ekki keyrt SVN skipanir."
 
 #: catalogmanager/libcvs/cvsdialog.cpp:311
 #: catalogmanager/libcvs/cvshandler.cpp:375
@@ -5482,9 +5774,9 @@ msgstr "Þetta er ekki gild CVS geymsla. Get ekki keyrt CVS skipanir."
 msgid "[ Starting command ]"
 msgstr "[ Ræsi skipun ]"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:68
-msgid "CVS Dialog"
-msgstr "CVS gluggi"
+#: catalogmanager/libsvn/svndialog.cpp:65
+msgid "SVN Dialog"
+msgstr "SVN gluggi"
 
 #: catalogmanager/libcvs/cvsdialog.cpp:77
 #: catalogmanager/libsvn/svndialog.cpp:74
@@ -5496,15 +5788,23 @@ msgstr "Uppfæra eftirarandi skrár:"
 msgid "Commit the following files:"
 msgstr "Setja inn eftirfarandi skrár:"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:83
-msgid "Get status for the following files:"
-msgstr "Sækja stöðuyfirlit yfir eftirfarandi skrár:"
+#: catalogmanager/libsvn/svndialog.cpp:80
+msgid "Get remote status for the following files:"
+msgstr "Sækja fjarlæga stöðu yfir eftirfarandi skrár:"
+
+#: catalogmanager/libsvn/svndialog.cpp:83
+msgid "Get local status for the following files:"
+msgstr "Sækja staðbundið stöðu yfir eftirfarandi skrár:"
 
 #: catalogmanager/libcvs/cvsdialog.cpp:86
 #: catalogmanager/libsvn/svndialog.cpp:86
 msgid "Get diff for the following files:"
 msgstr "Gera samanburð á eftirfarandi skrám:"
 
+#: catalogmanager/libsvn/svndialog.cpp:89
+msgid "Get information for the following files:"
+msgstr "Ná í upplýsingar yfir eftirfarandi skrár:"
+
 #: catalogmanager/libcvs/cvsdialog.cpp:100
 #: catalogmanager/libsvn/svndialog.cpp:103
 msgid "&Old messages:"
@@ -5515,22 +5815,6 @@ msgstr "Gömul skilab&oð:"
 msgid "&Log message:"
 msgstr "Anná&ll:"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:114
-msgid "E&ncoding:"
-msgstr "&Stafatafla:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:121
-msgid ""
-"_: Descriptive encoding name\n"
-"Recommended ( %1 )"
-msgstr "Ráðlagt ( %1 )"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:122
-msgid ""
-"_: Descriptive encoding name\n"
-"Locale ( %1 )"
-msgstr "Staðbundin ( %1 )"
-
 #: catalogmanager/libcvs/cvsdialog.cpp:133
 #: catalogmanager/libsvn/svndialog.cpp:124
 msgid "Auto&matically add files if necessary"
@@ -5551,6 +5835,10 @@ msgstr "S&ækja stöðu"
 msgid "&Get Diff"
 msgstr "&Sýna mismun"
 
+#: catalogmanager/libsvn/svndialog.cpp:145
+msgid "&Get Information"
+msgstr "&Ná í upplýsingar"
+
 #: catalogmanager/libcvs/cvsdialog.cpp:165
 #: catalogmanager/libsvn/svndialog.cpp:160
 msgid "Command output:"
@@ -5561,19 +5849,6 @@ msgstr "Úttak skipunar:"
 msgid "The commit log message is empty. Do you want to continue?"
 msgstr "Annállinn er tómur. Viltu halda áfram?"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:247
-#, c-format
-msgid "Cannot find encoding: %1"
-msgstr "Finn ekki stafatöflu: %1"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:253
-msgid ""
-"The commit log message cannot be encoded in the selected encoding: %1.\n"
-"Do you want to continue?"
-msgstr ""
-"Það er ekki hægt að nota eftirfarandi stafatöflu á annálinn: %1.\n"
-"Viltu halda áfram?"
-
 #: catalogmanager/libcvs/cvsdialog.cpp:268
 #: catalogmanager/libsvn/svndialog.cpp:247
 msgid "Cannot open temporary file for writing. Aborting."
@@ -5599,11 +5874,49 @@ msgstr "[ Lauk með stöðu %1 ]"
 msgid "[ Finished ]"
 msgstr "[ Lokið ]"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:401
-msgid ""
-"_: Descriptive encoding name\n"
-"Last choice ( %1 )"
-msgstr "Seinasta val ( %1 )"
+#: catalogmanager/catmanlistitem.cpp:80
+msgid "Message Catalogs"
+msgstr "Yfirlit yfir skilaboð"
+
+#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
+msgid "No version control"
+msgstr "Engin útgáfustjórnun"
+
+#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
+msgid "CVS/SVN Status"
+msgstr "CVS/SVN staða"
+
+#: catalogmanager/future.cpp:8
+msgid "Resolved"
+msgstr "Leyst"
+
+#: catalogmanager/future.cpp:9
+msgid "Resolved for Marked"
+msgstr "Leyst fyrir merktar"
+
+#: catalogmanager/future.cpp:10
+msgid "Revert"
+msgstr "Afturkalla"
+
+#: catalogmanager/future.cpp:11
+msgid "Revert for Marked"
+msgstr "Afturkalla fyrir merktar"
+
+#: catalogmanager/future.cpp:12
+msgid "Cleanup"
+msgstr "Hreinsa"
+
+#: catalogmanager/future.cpp:13
+msgid "Cleanup for Marked"
+msgstr "Hreinsa merktar"
+
+#: catalogmanager/future.cpp:16
+msgid "No repository"
+msgstr "Engin geymsla (repository)"
+
+#: catalogmanager/multiroughtransdlg.cpp:56
+msgid "Files:"
+msgstr "Skrár:"
 
 #: catalogmanager/catalogmanagerview.cpp:89
 msgid "Name"
@@ -5898,391 +6211,78 @@ msgstr "Les upplýsingar um skrár"
 msgid "Validation Options"
 msgstr "Stillingar prófunartóls"
 
-#: catalogmanager/markpatterndialog.cpp:113
-msgid "Ma&rk files which match the following pattern:"
-msgstr "Me&rkja skrár sem uppfylla eftirfarandi skilyrði:"
-
-#: catalogmanager/markpatterndialog.cpp:114
-msgid "&Mark Files"
-msgstr "&Merkja skrár"
-
-#: catalogmanager/markpatterndialog.cpp:116
-msgid "Unma&rk files which match the following pattern:"
-msgstr "Afvelja skrá&r sem uppfylla eftirfarandi skilyrði:"
-
-#: catalogmanager/markpatterndialog.cpp:117
-msgid "Un&mark Files"
-msgstr "Af&merkja skrár"
-
-#: catalogmanager/findinfilesdialog.cpp:50
-msgid "File Options"
-msgstr "Skráavalmöguleikar"
-
-#: catalogmanager/findinfilesdialog.cpp:53
-msgid "&In all files"
-msgstr "Í &öllum skrám"
-
-#: catalogmanager/findinfilesdialog.cpp:54
-msgid "&Marked files"
-msgstr "Í &merktum skrám"
-
-#: catalogmanager/findinfilesdialog.cpp:55
-msgid "In &templates"
-msgstr "Í &sniðskrám"
-
-#: catalogmanager/findinfilesdialog.cpp:56
-msgid "Ask before ne&xt file"
-msgstr "Spyrja áður en n&æsta skrá"
+#: catalogmanager/libcvs/cvshandler.cpp:88
+msgid "No CVS repository"
+msgstr "Engin CVS geymsla (repository)"
 
-#: catalogmanager/findinfilesdialog.cpp:57
-msgid "Save &without asking"
-msgstr "&Vista án þess að spyrja"
+#: catalogmanager/libcvs/cvshandler.cpp:91
+msgid "Not in CVS"
+msgstr "Ekki í CVS"
 
-#: catalogmanager/findinfilesdialog.cpp:59
+#: catalogmanager/libcvs/cvshandler.cpp:189
+#: catalogmanager/libcvs/cvshandler.cpp:228
 msgid ""
-"<qt>"
-"<p><b>File Options</b></p>"
-"<p>Here you can finetune where to find:"
-"<ul>"
-"<li><b>In all files</b>: search in all files, otherwise searched is the "
-"selected file or files in the selected folder</li>"
-"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
-"file</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Skráavalmöguleikar</b></p>"
-"<p>Hér getur þú fínstilt leitina:"
-"<ul>"
-"<li><b>Í öllum skrám</b>: leitar í öllum skrám, annars er bara leitað í völdu "
-"skránni eða skrám í valinni möppu</li>"
-"<li><b>Spyrja áður en næsta skrá</b>: Sýna staðfestingarglugga sem spyr um að "
-"halda áfram með næstu skrá</li> </ul></qt>"
+"This is not a valid CVS repository. The CVS commands cannot be executed."
+msgstr "Þetta er ekki gild CVS geymsla. Get ekki keyrt CVS skipanir."
 
-#: catalogmanager/libsvn/svnhandler.cpp:90
-msgid "No SVN repository"
-msgstr "Engin SVN geymsla (repository)"
+#: catalogmanager/libcvs/cvsdialog.cpp:68
+msgid "CVS Dialog"
+msgstr "CVS gluggi"
 
-#: catalogmanager/libsvn/svnhandler.cpp:93
-msgid "Not in SVN"
-msgstr "Ekki í SVN"
+#: catalogmanager/libcvs/cvsdialog.cpp:83
+msgid "Get status for the following files:"
+msgstr "Sækja stöðuyfirlit yfir eftirfarandi skrár:"
 
-#: catalogmanager/libsvn/svnhandler.cpp:111
-msgid "Error in Working Copy"
-msgstr "Villa í vinnuskrá"
+#: catalogmanager/libcvs/cvsdialog.cpp:114
+msgid "E&ncoding:"
+msgstr "&Stafatafla:"
 
-#: catalogmanager/libsvn/svnhandler.cpp:288
+#: catalogmanager/libcvs/cvsdialog.cpp:121
 msgid ""
-"This is not a valid SVN repository. The SVN commands cannot be executed."
-msgstr "Þetta er ekki gild SVN geymsla. Get ekki keyrt SVN skipanir."
-
-#: catalogmanager/libsvn/svndialog.cpp:65
-msgid "SVN Dialog"
-msgstr "SVN gluggi"
-
-#: catalogmanager/libsvn/svndialog.cpp:80
-msgid "Get remote status for the following files:"
-msgstr "Sækja fjarlæga stöðu yfir eftirfarandi skrár:"
-
-#: catalogmanager/libsvn/svndialog.cpp:83
-msgid "Get local status for the following files:"
-msgstr "Sækja staðbundið stöðu yfir eftirfarandi skrár:"
-
-#: catalogmanager/libsvn/svndialog.cpp:89
-msgid "Get information for the following files:"
-msgstr "Ná í upplýsingar yfir eftirfarandi skrár:"
-
-#: catalogmanager/libsvn/svndialog.cpp:145
-msgid "&Get Information"
-msgstr "&Ná í upplýsingar"
-
-#: catalogmanager/catalogmanager.cpp:225
-msgid "&Open Template"
-msgstr "&Opna snið"
-
-#: catalogmanager/catalogmanager.cpp:228
-msgid "Open in &New Window"
-msgstr "Opna í &nýjum glugga"
-
-#: catalogmanager/catalogmanager.cpp:237
-msgid "Fi&nd in Files..."
-msgstr "Fi&nna í skrám..."
-
-#: catalogmanager/catalogmanager.cpp:240
-msgid "Re&place in Files..."
-msgstr "Ski&pta út í skrám..."
-
-#: catalogmanager/catalogmanager.cpp:251
-msgid "&Toggle Marking"
-msgstr "&Víxla merkingum"
-
-#: catalogmanager/catalogmanager.cpp:254
-msgid "Remove Marking"
-msgstr "Fjarlægja merkingar"
-
-#: catalogmanager/catalogmanager.cpp:257
-msgid "Toggle All Markings"
-msgstr "Víxla öllum merkingum"
-
-#: catalogmanager/catalogmanager.cpp:260
-msgid "Remove All Markings"
-msgstr "Fjarlægja allar merkingar"
-
-#: catalogmanager/catalogmanager.cpp:263
-msgid "Mark Modified Files"
-msgstr "Merkja breyttar skrár"
-
-#: catalogmanager/catalogmanager.cpp:267
-msgid "&Load Markings..."
-msgstr "H&laða inn merkingum..."
-
-#: catalogmanager/catalogmanager.cpp:270
-msgid "&Save Markings..."
-msgstr "Vi&sta merkingar..."
-
-#: catalogmanager/catalogmanager.cpp:273
-msgid "&Mark Files..."
-msgstr "&Merkja skrár..."
-
-#: catalogmanager/catalogmanager.cpp:275
-msgid "&Unmark Files..."
-msgstr "&Afvelja skrár..."
-
-#: catalogmanager/catalogmanager.cpp:309
-msgid "Next Te&mplate Only"
-msgstr "Aðeins &næsta sniðskrá"
-
-#: catalogmanager/catalogmanager.cpp:312
-msgid "Previous Temp&late Only"
-msgstr "Aðeins fyrri sniðs&krá"
-
-#: catalogmanager/catalogmanager.cpp:315
-msgid "Next Tran&slation Exists"
-msgstr "Næstu þýðingu &sem finnst"
-
-#: catalogmanager/catalogmanager.cpp:318
-msgid "Previous Transl&ation Exists"
-msgstr "Fyrri þýðingu s&em finnst"
-
-#: catalogmanager/catalogmanager.cpp:322
-msgid "Previous Marke&d"
-msgstr "Fyrri merk&tu"
-
-#: catalogmanager/catalogmanager.cpp:325
-msgid "Next &Marked"
-msgstr "Næstu &merktu"
-
-#: catalogmanager/catalogmanager.cpp:350
-msgid "&Statistics"
-msgstr "T&ölfræði"
-
-#: catalogmanager/catalogmanager.cpp:353
-msgid "S&tatistics in Marked"
-msgstr "&Tölfræði í merktum"
-
-#: catalogmanager/catalogmanager.cpp:356
-msgid "Check S&yntax"
-msgstr "&Athuga setningafræði"
-
-#: catalogmanager/catalogmanager.cpp:359
-msgid "S&pell Check"
-msgstr "Stafsetningar&leiðrétting"
-
-#: catalogmanager/catalogmanager.cpp:362
-msgid "Spell Check in &Marked"
-msgstr "Stafsetningarleiðrétting í &merktum"
-
-#: catalogmanager/catalogmanager.cpp:365
-msgid "&Rough Translation"
-msgstr "G&róf þýðing"
-
-#: catalogmanager/catalogmanager.cpp:368
-msgid "Rough Translation in M&arked"
-msgstr "&Gróf þýðing í merktum"
-
-#: catalogmanager/catalogmanager.cpp:371
-msgid "Mai&l"
-msgstr "&Póstsenda"
-
-#: catalogmanager/catalogmanager.cpp:374
-msgid "Mail Mar&ked"
-msgstr "Póstsenda mer&ktar"
-
-#: catalogmanager/catalogmanager.cpp:378
-msgid "&Pack"
-msgstr "&Pakka"
-
-#: catalogmanager/catalogmanager.cpp:380
-msgid "Pack &Marked"
-msgstr "Pakka &merktar"
-
-#: catalogmanager/catalogmanager.cpp:412
-msgid "V&alidation Marked"
-msgstr "Prófa merkt&ar"
-
-#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
-msgid "Update"
-msgstr "Uppfæra"
-
-#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
-msgid "Update Marked"
-msgstr "Uppfæra merktar"
-
-#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
-msgid "Commit"
-msgstr "Setja inn"
-
-#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
-msgid "Commit Marked"
-msgstr "Setja inn merktar"
-
-#: catalogmanager/catalogmanager.cpp:433
-msgid "Status"
-msgstr "Staða"
-
-#: catalogmanager/catalogmanager.cpp:435
-msgid "Status for Marked"
-msgstr "Staða merktra skráa"
-
-#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
-msgid "Show Diff"
-msgstr "Sýna mismun"
-
-#: catalogmanager/catalogmanager.cpp:459
-msgid "Status (Local)"
-msgstr "Staða (staðbundin)"
-
-#: catalogmanager/catalogmanager.cpp:461
-msgid "Status (Local) for Marked"
-msgstr "Staða (staðbundinna) merktra skráa"
-
-#: catalogmanager/catalogmanager.cpp:463
-msgid "Status (Remote)"
-msgstr "Staða (fjarlæg)"
-
-#: catalogmanager/catalogmanager.cpp:465
-msgid "Status (Remote) for Marked"
-msgstr "Staða (fjarlægra) merktra skráa"
-
-#: catalogmanager/catalogmanager.cpp:469
-msgid "Show Information"
-msgstr "Sýna upplýsingar"
-
-#: catalogmanager/catalogmanager.cpp:471
-msgid "Show Information for Marked"
-msgstr "Sýna upplýsingar merktra skráa"
-
-#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
-msgid "Update Templates"
-msgstr "Uppfæra sniðskrár"
-
-#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
-msgid "Update Marked Templates"
-msgstr "Uppfæra merktar sniðskrár"
-
-#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
-msgid "Commit Templates"
-msgstr "Setja inn sniðskrár"
-
-#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
-msgid "Commit Marked Templates"
-msgstr "Setja inn merktar sniðskrár"
-
-#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
-msgid "Commands"
-msgstr "Skipanir"
+"_: Descriptive encoding name\n"
+"Recommended ( %1 )"
+msgstr "Ráðlagt ( %1 )"
 
-#: catalogmanager/catalogmanager.cpp:558
+#: catalogmanager/libcvs/cvsdialog.cpp:122
 msgid ""
-"<qt>"
-"<p><b>Statusbar</b></p>\n"
-"<p>The statusbar displays information about progress of the current find or "
-"replace operation. The first number in <b>Found:</b> "
-"displays the number of files with an occurrence of the searched text not yet "
-"shown in the KBabel window. The second shows the total number of files "
-"containing the searched text found so far.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Stöðuslá</b></p>\n"
-"<p>Stöðusláin sýnir upplýsingar um stöðu núverandi leitar, eða útskipti "
-"aðgerðar. Fyrsta talan í <b>Fann:</b> sýnir fjölda fundinna skráa sem hafa ekki "
-"verið sýndar ennþá í KBabel glugganum. Önnur talan sýnir heildarfjölda fundinna "
-"skráa.</p></qt>"
+"_: Descriptive encoding name\n"
+"Locale ( %1 )"
+msgstr "Staðbundin ( %1 )"
 
-#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
-#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
-#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
-#: catalogmanager/catalogmanager.cpp:827
-#, fuzzy
-msgid ""
-"Cannot send a message to KBabel.\n"
-"Please check your TDE installation."
-msgstr ""
-"Gat ekki sent skilaboð til KBabel.\n"
-"Vinsamlega athugaðu TDE uppsetninguna þína."
+#: catalogmanager/libcvs/cvsdialog.cpp:247
+#, c-format
+msgid "Cannot find encoding: %1"
+msgstr "Finn ekki stafatöflu: %1"
 
-#: catalogmanager/catalogmanager.cpp:858
+#: catalogmanager/libcvs/cvsdialog.cpp:253
 msgid ""
-"Unable to use TDELauncher to start KBabel.\n"
-"You should check the installation of TDE.\n"
-"Please start KBabel manually."
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
 msgstr ""
-"Gat ekki notað TDELauncher til að ræsa KBabel.\n"
-"Athugaðu TDE uppsetninguna þína.\n"
-"Vinsamlega ræstu KBabel handvirkt."
-
-#: catalogmanager/catalogmanager.cpp:893
-msgid "Found: 0/0"
-msgstr "Fann: 0/0"
-
-#: catalogmanager/catalogmanager.cpp:915
-msgid "Found: %1/%2"
-msgstr "Fann: %1/%2"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP communication with KBabel failed."
-msgstr "DCOP samskipti við KBabel mistókust"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP Communication Error"
-msgstr "DCOP samskiptavilla"
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "KBabel cannot be started."
-msgstr "Ekki hægt að ræsa KBabel."
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "Cannot Start KBabel"
-msgstr "Get ekki ræst KBabel"
-
-#: catalogmanager/catalogmanager.cpp:1008
-#: catalogmanager/catalogmanager.cpp:1094
-msgid "Search string not found!"
-msgstr "Leitarstrengur fannst ekki."
+"Það er ekki hægt að nota eftirfarandi stafatöflu á annálinn: %1.\n"
+"Viltu halda áfram?"
 
-#: catalogmanager/catalogmanager.cpp:1235
-#, c-format
-msgid "Cannot open project file %1"
-msgstr "Get ekki opnað verkefnaskrá %1"
+#: catalogmanager/libcvs/cvsdialog.cpp:401
+msgid ""
+"_: Descriptive encoding name\n"
+"Last choice ( %1 )"
+msgstr "Seinasta val ( %1 )"
 
-#: catalogmanager/main.cpp:186
-msgid "KBabel - Catalog Manager"
-msgstr "KBabel - Þýðingarstjóri"
+#: catalogmanager/markpatterndialog.cpp:113
+msgid "Ma&rk files which match the following pattern:"
+msgstr "Me&rkja skrár sem uppfylla eftirfarandi skilyrði:"
 
-#: catalogmanager/main.cpp:187
-msgid "An advanced catalog manager for KBabel"
-msgstr "Öflugur þýðingarstjóri fyrir KBabel"
+#: catalogmanager/markpatterndialog.cpp:114
+msgid "&Mark Files"
+msgstr "&Merkja skrár"
 
-#: catalogmanager/main.cpp:211
-msgid "Support for making diffs and some minor improvements."
-msgstr "Stuðningur við samanburðargerð og smávægilegar breytingar."
+#: catalogmanager/markpatterndialog.cpp:116
+msgid "Unma&rk files which match the following pattern:"
+msgstr "Afvelja skrá&r sem uppfylla eftirfarandi skilyrði:"
 
-#: catalogmanager/main.cpp:216
-msgid "KBabel contains code from GNU gettext"
-msgstr "KBabel inniheldur kóða frá GNU gettext"
+#: catalogmanager/markpatterndialog.cpp:117
+msgid "Un&mark Files"
+msgstr "Af&merkja skrár"
 
 #~ msgid ""
 #~ "\n"
diff --git a/tde-i18n-is/messages/tdesdk/kbugbuster.po b/tde-i18n-is/messages/tdesdk/kbugbuster.po
index e52447073c0..4eee5049f1b 100644
--- a/tde-i18n-is/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-is/messages/tdesdk/kbugbuster.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbugbuster\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/kompare.po b/tde-i18n-is/messages/tdesdk/kompare.po
index 741e221dedf..5394e4bceac 100644
--- a/tde-i18n-is/messages/tdesdk/kompare.po
+++ b/tde-i18n-is/messages/tdesdk/kompare.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-12-05 23:52+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -13,109 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Björgvin Ragnarsson"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "nifgraup@hotmail.com"
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-#, fuzzy
-msgid "Source Folder"
-msgstr "Upprunaleg mappa"
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-#, fuzzy
-msgid "Destination Folder"
-msgstr "Áfangastaður Mappa"
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-#, fuzzy
-msgid "Source File"
-msgstr "Frumskrá"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-#, fuzzy
-msgid "Destination File"
-msgstr "Áfangastaður Skrá"
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-#, fuzzy
-msgid "Source Line"
-msgstr "Uppruni Lína"
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-#, fuzzy
-msgid "Destination Line"
-msgstr "Áfangastaður Lína"
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr "Mismunur"
-
-#: komparenavtreepart/komparenavtreepart.cpp:426
-#, c-format
-msgid ""
-"_n: Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr ""
-"Breytti %n línu\n"
-"Breytti %n línum"
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, c-format
-msgid ""
-"_n: Inserted %n line\n"
-"Inserted %n lines"
-msgstr ""
-"Bætti við %n línu\n"
-"Bætti við %n línum"
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr ""
-"Eyddi %n línu\n"
-"Eyddi %n línum"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "Óþekkt"
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
 #: libdiff2/komparemodellist.cpp:61
 msgid "&Apply Difference"
 msgstr "&Virkja mismun"
@@ -205,180 +102,6 @@ msgstr "Skrárnar eru eins."
 msgid "Could not write to the temporary file."
 msgstr "Gat ekki skrifað í vinnuskrána."
 
-#: kompare_shell.cpp:77
-#, fuzzy
-msgid "Could not find our KompareViewPart."
-msgstr "Gat ekki funduð okkar KompareViewPart!"
-
-#: kompare_shell.cpp:106
-#, fuzzy
-msgid "Could not load our KompareViewPart."
-msgstr "Gat ekki hlaðið okkar KompareViewPart!"
-
-#: kompare_shell.cpp:114
-#, fuzzy
-msgid "Could not find our KompareNavigationPart."
-msgstr "Gat ekki fundið okkar KompareNavigationPart!"
-
-#: kompare_shell.cpp:138
-#, fuzzy
-msgid "Could not load our KompareNavigationPart."
-msgstr "Gat ekki hlaðið okkar KompareNavigationPart!"
-
-#: kompare_shell.cpp:233
-msgid "&Open Diff..."
-msgstr "&Opna Diff..."
-
-#: kompare_shell.cpp:234
-msgid "&Compare Files..."
-msgstr "&Bera saman skrár..."
-
-#: kompare_shell.cpp:237
-#, fuzzy
-msgid "&Blend URL with Diff..."
-msgstr "Slóð með."
-
-#: kompare_shell.cpp:246
-#, fuzzy
-msgid "Show T&ext View"
-msgstr "Sýna T&exti Skoða"
-
-#: kompare_shell.cpp:248
-#, fuzzy
-msgid "Hide T&ext View"
-msgstr "Textasýn"
-
-#: kompare_shell.cpp:257
-msgid " 0 of 0 differences "
-msgstr ""
-
-#: kompare_shell.cpp:258
-msgid " 0 of 0 files "
-msgstr " 0 af 0 skrár "
-
-#: kompare_shell.cpp:273
-msgid ""
-"_n:  %1 of %n file \n"
-" %1 of %n files "
-msgstr ""
-"%1 af %n skrá \n"
-" %1 af %n skrár "
-
-#: kompare_shell.cpp:275
-#, c-format
-msgid ""
-"_n:  %n file \n"
-" %n files "
-msgstr ""
-"%n skrá \n"
-"%n skrár "
-
-#: kompare_shell.cpp:278
-msgid ""
-"_n:  %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-msgstr ""
-" %1 af %n mismun, %2 virkjað \n"
-" %1 of %n differences, %2 virkjað "
-
-#: kompare_shell.cpp:281
-#, fuzzy, c-format
-msgid ""
-"_n:  %n difference \n"
-" %n differences "
-msgstr ""
-" %n mismunur \n"
-" %n differences "
-
-#: kompare_shell.cpp:369
-#, fuzzy
-msgid "Blend File/Folder with diff Output"
-msgstr "Blanda skrá/möppu við diff úttak"
-
-#: kompare_shell.cpp:370
-msgid "File/Folder"
-msgstr "Skrá/mappa"
-
-#: kompare_shell.cpp:371
-msgid "Diff Output"
-msgstr "Diff úttak"
-
-#: kompare_shell.cpp:373
-#, fuzzy
-msgid "Blend"
-msgstr "Blanda"
-
-#: kompare_shell.cpp:373
-msgid "Blend this file or folder with the diff output"
-msgstr "Blanda þessari skrá eða möppu við diff úttakið"
-
-#: kompare_shell.cpp:373
-#, fuzzy
-msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
-msgstr ""
-"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak í "
-"svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að smella á "
-"hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða skrám úr "
-"möppu eru blandaðar saman við diff úttakið svo þú getur síðan virkjað "
-"mismuninní skrá eða skrárnar. "
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Bera saman skrár eða möppur"
-
-#: kompare_shell.cpp:399 main.cpp:186
-#, fuzzy
-msgid "Source"
-msgstr "Uppruni"
-
-#: kompare_shell.cpp:400 main.cpp:187
-#, fuzzy
-msgid "Destination"
-msgstr "Áfangastaður"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Bera saman"
-
-#: kompare_shell.cpp:402
-msgid "Compare these files or folders"
-msgstr "Bera saman þessar skrár eða möppur"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-"Ef þú slærð inn 2 skráarnöfn eða 2 möppur í svæðin í þessum glugga verður þessi "
-"hnappur virkur og með því að smella á hann hefst samanburður á völdum skrám eða "
-"möppum."
-
-#: kompare_shell.cpp:439
-msgid "Text View"
-msgstr "Textasýn"
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr ""
-
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
-
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr ""
-
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr ""
-
 #. i18n: file komparepart/komparepartui.rc line 13
 #: rc.cpp:15
 #, no-c-format
@@ -505,231 +228,352 @@ msgstr "Hlið við hlið"
 msgid "Number of context lines:"
 msgstr "Fjöldi samhengislína:"
 
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Stillingar"
+#: main.cpp:33
+#, fuzzy
+msgid ""
+"A program to view the differences between files and optionally generate a diff"
+msgstr ""
+"Forrit til að skoða mismun á milli skráa auk þess sem hægt er að búa til diff."
 
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Stillingar sýnar"
+#: main.cpp:39
+#, fuzzy
+msgid "This will compare URL1 with URL2"
+msgstr "Þetta mun bera slóð 1 við slóð 2."
 
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Stillingar diff"
+#: main.cpp:40
+#, fuzzy
+msgid ""
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
+"then it will read from standard input. Can be used for instance for cvs diff | "
+"kompare -o -. Kompare will do a check to see if it can find the original "
+"file(s) and then blend the original file(s) into the diffoutput and show that "
+"in the viewer. -n disables the check."
+msgstr "Þetta mun opna slóð 1 og búast því það að hún sé"
 
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Vist&a Allt"
+#: main.cpp:41
+msgid ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
+"file or folder that the diffoutput needs to be blended into. "
+msgstr ""
 
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Vista .&diff..."
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr ""
 
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Víxla á uppruna og áfangastað"
+#: main.cpp:43
+msgid ""
+"Use this to specify the encoding when calling it from the command line. It will "
+"default to the local encoding if not specified."
+msgstr ""
 
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Sýna tölfræði"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
 
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>Tókst ekki að ná í slóðina <b>%1</b>.</qt>"
+#: main.cpp:54
+#, fuzzy
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2003, John Firebaugh og Otto Bruggeman"
 
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>Slóðin <b>%1</b> er ekki til á kerfinu þínu.</qt>"
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Höfundur"
 
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff valkostir"
+#: main.cpp:57
+#, fuzzy
+msgid "Kompare icon artist"
+msgstr "KomparePart"
 
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Patch skrár"
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Fullt af góðum ráðum"
 
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Vista .diff"
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff skoðari"
 
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "Skráin er þegar til eða er ritvarin; viltu skrifa yfir hana?"
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Bera saman skrár eða möppur"
 
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Skrá þegar til"
+#: kompare_shell.cpp:399 main.cpp:186
+#, fuzzy
+msgid "Source"
+msgstr "Uppruni"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Skrifa yfir"
+#: kompare_shell.cpp:400 main.cpp:187
+#, fuzzy
+msgid "Destination"
+msgstr "Áfangastaður"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Ekki skrifa yfir"
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Bera saman"
 
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Bera saman þessar skrár eða möppu"
 
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Keyri diff..."
+#: kompare_shell.cpp:402 main.cpp:189
+msgid ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
+"this button will be enabled and pressing it will start a comparison of the "
+"entered files or folders. "
+msgstr ""
+"Ef þú slærð inn 2 skráarnöfn eða 2 möppur í svæðin í þessum glugga verður þessi "
+"hnappur virkur og með því að smella á hann hefst samanburður á völdum skrám eða "
+"möppum."
 
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Þátta diff útták..."
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Björgvin Ragnarsson"
 
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Ber skrána %1 saman við skrána %2"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "nifgraup@hotmail.com"
 
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Ber saman skrár í %1 við skrár í %2"
+#: kompare_shell.cpp:77
+#, fuzzy
+msgid "Could not find our KompareViewPart."
+msgstr "Gat ekki funduð okkar KompareViewPart!"
 
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Sýni diff úttak frá %1"
+#: kompare_shell.cpp:106
+#, fuzzy
+msgid "Could not load our KompareViewPart."
+msgstr "Gat ekki hlaðið okkar KompareViewPart!"
 
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Blanda diff úttaki frá %1 í skrá %2"
+#: kompare_shell.cpp:114
+#, fuzzy
+msgid "Could not find our KompareNavigationPart."
+msgstr "Gat ekki fundið okkar KompareNavigationPart!"
 
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Blanda diff úttaki frá %1 í möppu %2"
+#: kompare_shell.cpp:138
+#, fuzzy
+msgid "Could not load our KompareNavigationPart."
+msgstr "Gat ekki hlaðið okkar KompareNavigationPart!"
 
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
-msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+#: kompare_shell.cpp:233
+msgid "&Open Diff..."
+msgstr "&Opna Diff..."
+
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr "&Bera saman skrár..."
+
+#: kompare_shell.cpp:237
+#, fuzzy
+msgid "&Blend URL with Diff..."
+msgstr "Slóð með."
+
+#: kompare_shell.cpp:246
+#, fuzzy
+msgid "Show T&ext View"
+msgstr "Sýna T&exti Skoða"
+
+#: kompare_shell.cpp:248
+#, fuzzy
+msgid "Hide T&ext View"
+msgstr "Textasýn"
+
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
 msgstr ""
-"Þú hefur gert breytingar á áfangastað.\n"
-"Viltu vista þær?"
 
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Vista breytingar?"
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr " 0 af 0 skrár "
 
-#: komparepart/kompare_part.cpp:667
+#: kompare_shell.cpp:273
 msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"_n:  %1 of %n file \n"
+" %1 of %n files "
 msgstr ""
-"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru "
-"engar tölfræðiupplýsingar tiltækar."
+"%1 af %n skrá \n"
+" %1 af %n skrár "
 
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff tölfræði"
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n:  %n file \n"
+" %n files "
+msgstr ""
+"%n skrá \n"
+"%n skrár "
 
-#: komparepart/kompare_part.cpp:673
+#: kompare_shell.cpp:278
 msgid ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+"_n:  %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
 msgstr ""
-"Tölfræði:\n"
-"\n"
-"Gamla skráin: %1\n"
-"Nýja skráin: %2\n"
-"\n"
-"Snið: %3\n"
-"Fjöldi blokka: %4\n"
-"Fjöldi mismuna: %5"
+" %1 af %n mismun, %2 virkjað \n"
+" %1 of %n differences, %2 virkjað "
 
-#: komparepart/kompare_part.cpp:686
+#: kompare_shell.cpp:281
+#, fuzzy, c-format
 msgid ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+"_n:  %n difference \n"
+" %n differences "
 msgstr ""
-"Tölfræði:\n"
-"\n"
-"Fjöldi skráa í diff skrá: %1\n"
-"Snið: %2\n"
-"\n"
-"Núverandi gamla skrá: %3\n"
-"Núverandi nýja skrá: %4\n"
-"\n"
-"Fjöldi blokka: %5\n"
-"Fjöldi mismuna: %6"
+" %n mismunur \n"
+" %n differences "
 
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
+#: kompare_shell.cpp:369
+#, fuzzy
+msgid "Blend File/Folder with diff Output"
+msgstr "Blanda skrá/möppu við diff úttak"
+
+#: kompare_shell.cpp:370
+msgid "File/Folder"
+msgstr "Skrá/mappa"
+
+#: kompare_shell.cpp:371
+msgid "Diff Output"
+msgstr "Diff úttak"
+
+#: kompare_shell.cpp:373
+#, fuzzy
+msgid "Blend"
+msgstr "Blanda"
+
+#: kompare_shell.cpp:373
+msgid "Blend this file or folder with the diff output"
+msgstr "Blanda þessari skrá eða möppu við diff úttakið"
+
+#: kompare_shell.cpp:373
+#, fuzzy
+msgid ""
+"If you have entered a file or folder name and a file that contains diff output "
+"in the fields in this dialog then this button will be enabled and pressing it "
+"will open kompare's main view where the output of the entered file or files "
+"from the folder are mixed with the diff output so you can then apply the "
+"difference(s) to a file or to the files. "
 msgstr ""
+"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak í "
+"svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að smella á "
+"hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða skrám úr "
+"möppu eru blandaðar saman við diff úttakið svo þú getur síðan virkjað "
+"mismuninní skrá eða skrárnar. "
 
-#: libdialogpages/filespage.cpp:64
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr "Bera saman þessar skrár eða möppur"
+
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Textasýn"
+
+#: komparenavtreepart/komparenavtreepart.cpp:61
 #, fuzzy
-msgid "&Files"
-msgstr "&Næsta skrá"
+msgid "Source Folder"
+msgstr "Upprunaleg mappa"
 
-#: libdialogpages/viewpage.cpp:51
-msgid "Colors"
-msgstr "Litir"
+#: komparenavtreepart/komparenavtreepart.cpp:66
+#, fuzzy
+msgid "Destination Folder"
+msgstr "Áfangastaður Mappa"
 
-#: libdialogpages/viewpage.cpp:56
-msgid "Removed color:"
-msgstr "Fjarlægt litur:"
+#: komparenavtreepart/komparenavtreepart.cpp:71
+#, fuzzy
+msgid "Source File"
+msgstr "Frumskrá"
 
-#: libdialogpages/viewpage.cpp:61
-msgid "Changed color:"
-msgstr "Breytt lítur"
+#: komparenavtreepart/komparenavtreepart.cpp:72
+#, fuzzy
+msgid "Destination File"
+msgstr "Áfangastaður Skrá"
 
-#: libdialogpages/viewpage.cpp:66
-msgid "Added color:"
-msgstr "Bætt við litur:"
+#: komparenavtreepart/komparenavtreepart.cpp:78
+#, fuzzy
+msgid "Source Line"
+msgstr "Uppruni Lína"
 
-#: libdialogpages/viewpage.cpp:71
-msgid "Applied color:"
-msgstr "Virkjað litur:"
+#: komparenavtreepart/komparenavtreepart.cpp:79
+#, fuzzy
+msgid "Destination Line"
+msgstr "Áfangastaður Lína"
 
-#: libdialogpages/viewpage.cpp:76
-msgid "Mouse Wheel"
-msgstr "Músarhjól"
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr "Mismunur"
 
-#: libdialogpages/viewpage.cpp:80
-msgid "Number of lines:"
-msgstr "Fjöldi lína:"
+#: komparenavtreepart/komparenavtreepart.cpp:426
+#, c-format
+msgid ""
+"_n: Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:86
-msgid "Tabs to Spaces"
-msgstr "Tab í bil"
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr ""
+"Breytti %n línu\n"
+"Breytti %n línum"
 
-#: libdialogpages/viewpage.cpp:90
-msgid "Number of spaces to convert a tab character to:"
-msgstr "Fjöldi bila til að breyta tab-stafi í:"
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:97
-msgid "A&ppearance"
-msgstr "Út&lit"
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
+msgstr ""
+"Bætti við %n línu\n"
+"Bætti við %n línum"
 
-#: libdialogpages/viewpage.cpp:104
-msgid "Text Font"
-msgstr "Textaletur"
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:108
-msgid "Font:"
-msgstr "Letur:"
+#: komparenavtreepart/komparenavtreepart.cpp:445
+#, c-format
+msgid ""
+"_n: Deleted %n line\n"
+"Deleted %n lines"
+msgstr ""
+"Eyddi %n línu\n"
+"Eyddi %n línum"
 
-#: libdialogpages/viewpage.cpp:112
-msgid "Size:"
-msgstr "Stærð:"
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "Óþekkt"
+
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
+#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
+msgid "Diff"
+msgstr "Diff"
+
+#: kompareurldialog.cpp:47
+msgid "Here you can change the options for comparing the files."
+msgstr ""
+
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr ""
 
 #: libdialogpages/diffpage.cpp:211
 msgid "Diff Program"
@@ -920,75 +764,231 @@ msgstr ""
 msgid "&Exclude"
 msgstr ""
 
-#: main.cpp:33
-#, fuzzy
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
 msgstr ""
-"Forrit til að skoða mismun á milli skráa auk þess sem hægt er að búa til diff."
 
-#: main.cpp:39
+#: libdialogpages/filespage.cpp:64
 #, fuzzy
-msgid "This will compare URL1 with URL2"
-msgstr "Þetta mun bera slóð 1 við slóð 2."
+msgid "&Files"
+msgstr "&Næsta skrá"
 
-#: main.cpp:40
-#, fuzzy
-msgid ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
-"then it will read from standard input. Can be used for instance for cvs diff | "
-"kompare -o -. Kompare will do a check to see if it can find the original "
-"file(s) and then blend the original file(s) into the diffoutput and show that "
-"in the viewer. -n disables the check."
-msgstr "Þetta mun opna slóð 1 og búast því það að hún sé"
+#: libdialogpages/viewpage.cpp:51
+msgid "Colors"
+msgstr "Litir"
 
-#: main.cpp:41
-msgid ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
-msgstr ""
+#: libdialogpages/viewpage.cpp:56
+msgid "Removed color:"
+msgstr "Fjarlægt litur:"
 
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
+#: libdialogpages/viewpage.cpp:61
+msgid "Changed color:"
+msgstr "Breytt lítur"
 
-#: main.cpp:43
-msgid ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
-msgstr ""
+#: libdialogpages/viewpage.cpp:66
+msgid "Added color:"
+msgstr "Bætt við litur:"
 
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
+#: libdialogpages/viewpage.cpp:71
+msgid "Applied color:"
+msgstr "Virkjað litur:"
 
-#: main.cpp:54
-#, fuzzy
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2003, John Firebaugh og Otto Bruggeman"
+#: libdialogpages/viewpage.cpp:76
+msgid "Mouse Wheel"
+msgstr "Músarhjól"
 
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Höfundur"
+#: libdialogpages/viewpage.cpp:80
+msgid "Number of lines:"
+msgstr "Fjöldi lína:"
 
-#: main.cpp:57
-#, fuzzy
-msgid "Kompare icon artist"
+#: libdialogpages/viewpage.cpp:86
+msgid "Tabs to Spaces"
+msgstr "Tab í bil"
+
+#: libdialogpages/viewpage.cpp:90
+msgid "Number of spaces to convert a tab character to:"
+msgstr "Fjöldi bila til að breyta tab-stafi í:"
+
+#: libdialogpages/viewpage.cpp:97
+msgid "A&ppearance"
+msgstr "Út&lit"
+
+#: libdialogpages/viewpage.cpp:104
+msgid "Text Font"
+msgstr "Textaletur"
+
+#: libdialogpages/viewpage.cpp:108
+msgid "Font:"
+msgstr "Letur:"
+
+#: libdialogpages/viewpage.cpp:112
+msgid "Size:"
+msgstr "Stærð:"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Stillingar"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Stillingar sýnar"
+
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Stillingar diff"
+
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Vist&a Allt"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Vista .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Víxla á uppruna og áfangastað"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Sýna tölfræði"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>Tókst ekki að ná í slóðina <b>%1</b>.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>Slóðin <b>%1</b> er ekki til á kerfinu þínu.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff valkostir"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Patch skrár"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Vista .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "Skráin er þegar til eða er ritvarin; viltu skrifa yfir hana?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Skrá þegar til"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Skrifa yfir"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Ekki skrifa yfir"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
 msgstr "KomparePart"
 
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Fullt af góðum ráðum"
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Keyri diff..."
 
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff skoðari"
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Þátta diff útták..."
 
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Bera saman þessar skrár eða möppu"
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Ber skrána %1 saman við skrána %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Ber saman skrár í %1 við skrár í %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Sýni diff úttak frá %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Blanda diff úttaki frá %1 í skrá %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Blanda diff úttaki frá %1 í möppu %2"
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+msgstr ""
+"Þú hefur gert breytingar á áfangastað.\n"
+"Viltu vista þær?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Vista breytingar?"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+msgstr ""
+"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru "
+"engar tölfræðiupplýsingar tiltækar."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff tölfræði"
+
+#: komparepart/kompare_part.cpp:673
+msgid ""
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
+msgstr ""
+"Tölfræði:\n"
+"\n"
+"Gamla skráin: %1\n"
+"Nýja skráin: %2\n"
+"\n"
+"Snið: %3\n"
+"Fjöldi blokka: %4\n"
+"Fjöldi mismuna: %5"
+
+#: komparepart/kompare_part.cpp:686
+msgid ""
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
+msgstr ""
+"Tölfræði:\n"
+"\n"
+"Fjöldi skráa í diff skrá: %1\n"
+"Snið: %2\n"
+"\n"
+"Núverandi gamla skrá: %3\n"
+"Núverandi nýja skrá: %4\n"
+"\n"
+"Fjöldi blokka: %5\n"
+"Fjöldi mismuna: %6"
 
 #~ msgid "%1"
 #~ msgstr "%1"
diff --git a/tde-i18n-is/messages/tdesdk/kres_bugzilla.po b/tde-i18n-is/messages/tdesdk/kres_bugzilla.po
index f45f8fef2e5..1098b065e34 100644
--- a/tde-i18n-is/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-is/messages/tdesdk/kres_bugzilla.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_bugzilla\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-12-05 23:27+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/kstartperf.po b/tde-i18n-is/messages/tdesdk/kstartperf.po
index 279ade07788..0666332da2b 100644
--- a/tde-i18n-is/messages/tdesdk/kstartperf.po
+++ b/tde-i18n-is/messages/tdesdk/kstartperf.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstartperf\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-12-05 23:28+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/kuiviewer.po b/tde-i18n-is/messages/tdesdk/kuiviewer.po
index 4ce6e9110c2..ac457680e8b 100644
--- a/tde-i18n-is/messages/tdesdk/kuiviewer.po
+++ b/tde-i18n-is/messages/tdesdk/kuiviewer.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuiviewer\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-12-05 23:29+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/spy.po b/tde-i18n-is/messages/tdesdk/spy.po
index cb22524a2ab..246b9d75229 100644
--- a/tde-i18n-is/messages/tdesdk/spy.po
+++ b/tde-i18n-is/messages/tdesdk/spy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: spy\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-12-05 23:39+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -16,17 +16,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: receiversview.cpp:36
-msgid "Object"
-msgstr "Hlutur"
+#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
+msgid "Name"
+msgstr "Nafn"
+
+#: classinfoview.cpp:31 propsview.cpp:54
+msgid "Value"
+msgstr "Gildi"
 
 #: navview.cpp:29 propsview.cpp:55 receiversview.cpp:37
 msgid "Type"
 msgstr "Tegund"
 
-#: receiversview.cpp:38
-msgid "Member Name"
-msgstr "Meðlimsnafn"
+#: propsview.cpp:56
+msgid "Access"
+msgstr "Aðgangur"
+
+#: propsview.cpp:57
+msgid "Designable"
+msgstr "Hönnunarlegur"
+
+#: propsview.cpp:58
+msgid "Type Flags"
+msgstr "Tegundarflögg"
+
+#: main.cpp:25 main.cpp:38
+msgid "Spy"
+msgstr "Njósna"
 
 #: _translatorinfo.cpp:1
 msgid ""
@@ -40,6 +56,10 @@ msgid ""
 "Your emails"
 msgstr "bre@klaki.net, leosson@frisurf.no"
 
+#: sigslotview.cpp:30
+msgid "Signals/Slots"
+msgstr "Merki/hólf"
+
 #: spy.cpp:67
 msgid "Signals && Slots"
 msgstr "Merki & hólf"
@@ -52,30 +72,10 @@ msgstr "Móttakendur"
 msgid "Class Info"
 msgstr "Klasa upplýsingar"
 
-#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
-msgid "Name"
-msgstr "Nafn"
-
-#: classinfoview.cpp:31 propsview.cpp:54
-msgid "Value"
-msgstr "Gildi"
-
-#: propsview.cpp:56
-msgid "Access"
-msgstr "Aðgangur"
-
-#: propsview.cpp:57
-msgid "Designable"
-msgstr "Hönnunarlegur"
-
-#: propsview.cpp:58
-msgid "Type Flags"
-msgstr "Tegundarflögg"
-
-#: main.cpp:25 main.cpp:38
-msgid "Spy"
-msgstr "Njósna"
+#: receiversview.cpp:36
+msgid "Object"
+msgstr "Hlutur"
 
-#: sigslotview.cpp:30
-msgid "Signals/Slots"
-msgstr "Merki/hólf"
+#: receiversview.cpp:38
+msgid "Member Name"
+msgstr "Meðlimsnafn"
diff --git a/tde-i18n-is/messages/tdesdk/tdecachegrind.po b/tde-i18n-is/messages/tdesdk/tdecachegrind.po
index 966bca6ca5c..bb696f99d40 100644
--- a/tde-i18n-is/messages/tdesdk/tdecachegrind.po
+++ b/tde-i18n-is/messages/tdesdk/tdecachegrind.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdecachegrind\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -14,27 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: cachegrindloader.cpp:141
-msgid "Import filter for Cachegrind/Callgrind generated profile data files"
-msgstr ""
-
-#: cachegrindloader.cpp:738
-#, c-format
-msgid "Loading %1"
-msgstr ""
-
 #: tabview.cpp:64
 msgid "Move to Top"
 msgstr ""
@@ -151,6 +130,706 @@ msgstr ""
 msgid "(No function selected)"
 msgstr ""
 
+#: tracedata.cpp:153
+msgid "Abstract Item"
+msgstr ""
+
+#: tracedata.cpp:154
+msgid "Cost Item"
+msgstr ""
+
+#: tracedata.cpp:155
+msgid "Part Source Line"
+msgstr ""
+
+#: tracedata.cpp:156
+msgid "Source Line"
+msgstr ""
+
+#: tracedata.cpp:157
+msgid "Part Line Call"
+msgstr ""
+
+#: tracedata.cpp:158
+msgid "Line Call"
+msgstr ""
+
+#: tracedata.cpp:159
+msgid "Part Jump"
+msgstr ""
+
+#: tracedata.cpp:160
+msgid "Jump"
+msgstr ""
+
+#: tracedata.cpp:161
+msgid "Part Instruction"
+msgstr ""
+
+#: tracedata.cpp:162
+msgid "Instruction"
+msgstr ""
+
+#: tracedata.cpp:163
+msgid "Part Instruction Jump"
+msgstr ""
+
+#: tracedata.cpp:164
+msgid "Instruction Jump"
+msgstr ""
+
+#: tracedata.cpp:165
+msgid "Part Instruction Call"
+msgstr ""
+
+#: tracedata.cpp:166
+msgid "Instruction Call"
+msgstr ""
+
+#: tracedata.cpp:167
+msgid "Part Call"
+msgstr ""
+
+#: tracedata.cpp:168
+msgid "Call"
+msgstr ""
+
+#: tracedata.cpp:169
+msgid "Part Function"
+msgstr ""
+
+#: tracedata.cpp:170
+msgid "Function Source File"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 300
+#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:171
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: tracedata.cpp:172
+msgid "Function Cycle"
+msgstr ""
+
+#: tracedata.cpp:173
+msgid "Part Class"
+msgstr ""
+
+#: tracedata.cpp:174
+msgid "Class"
+msgstr ""
+
+#: tracedata.cpp:175
+msgid "Part Source File"
+msgstr ""
+
+#: tracedata.cpp:176
+msgid "Source File"
+msgstr ""
+
+#: tracedata.cpp:177
+msgid "Part ELF Object"
+msgstr ""
+
+#: tracedata.cpp:178
+msgid "ELF Object"
+msgstr ""
+
+#: partview.cpp:46 tracedata.cpp:179
+msgid "Profile Part"
+msgstr ""
+
+#: tracedata.cpp:180
+msgid "Program Trace"
+msgstr ""
+
+#: tracedata.cpp:241
+msgid "%1 from %2"
+msgstr ""
+
+#: partgraph.cpp:423 tracedata.cpp:249 tracedata.cpp:254 tracedata.cpp:2824
+#: tracedata.cpp:3241 tracedata.cpp:3327 tracedata.cpp:4165 tracedata.cpp:4173
+#: tracedata.cpp:4238
+msgid "(unknown)"
+msgstr ""
+
+#: tracedata.cpp:2583
+msgid "(no caller)"
+msgstr ""
+
+#: tracedata.cpp:2590 tracedata.cpp:2609
+msgid "%1 via %2"
+msgstr ""
+
+#: tracedata.cpp:2599
+msgid "(no callee)"
+msgstr ""
+
+#: tracedata.cpp:4467
+msgid "(not found)"
+msgstr ""
+
+#: tracedata.cpp:5017
+msgid "Recalculating Function Cycles..."
+msgstr ""
+
+#. i18n: file tdecachegrindui.rc line 15
+#: rc.cpp:9
+#, no-c-format
+msgid "&Layout"
+msgstr ""
+
+#. i18n: file tdecachegrindui.rc line 32
+#: rc.cpp:12
+#, no-c-format
+msgid "Sidebars"
+msgstr ""
+
+#. i18n: file tdecachegrindui.rc line 54
+#: rc.cpp:18
+#, no-c-format
+msgid "State Toolbar"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 37
+#: rc.cpp:24
+#, no-c-format
+msgid "General"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 69
+#: rc.cpp:27
+#, no-c-format
+msgid "Truncated when more/longer than:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 77
+#: rc.cpp:30
+#, no-c-format
+msgid "Precision of percentage values:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 85
+#: rc.cpp:33
+#, no-c-format
+msgid "Symbols in tooltips and context menus"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 141
+#: rc.cpp:36
+#, no-c-format
+msgid "Maximum number of items in lists:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 162
+#: rc.cpp:39
+#, no-c-format
+msgid "Cost Item Colors"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 246
+#: callgraphview.cpp:2562 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#, no-c-format
+msgid "Automatic"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 254
+#: rc.cpp:45
+#, no-c-format
+msgid "Object:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 262
+#: rc.cpp:48
+#, no-c-format
+msgid "Class:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 310
+#: rc.cpp:57
+#, no-c-format
+msgid "File:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 376
+#: rc.cpp:60
+#, no-c-format
+msgid "Annotations"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 395
+#: rc.cpp:63
+#, no-c-format
+msgid "Context lines in annotations:"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 423
+#: rc.cpp:66
+#, no-c-format
+msgid "Source Folders"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 454
+#: rc.cpp:69
+#, no-c-format
+msgid "Object / Related Source Base"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 483
+#: rc.cpp:72
+#, no-c-format
+msgid "Add..."
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 16
+#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
+#, no-c-format
+msgid "Profile Dumps"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 32
+#: rc.cpp:87
+#, no-c-format
+msgid "Target"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 54
+#: rc.cpp:90
+#, no-c-format
+msgid "Time"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 65
+#: rc.cpp:93
+#, no-c-format
+msgid "Path"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 106
+#: rc.cpp:99
+#, no-c-format
+msgid "Target command:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 119
+#: rc.cpp:102
+#, no-c-format
+msgid "Profiler options:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 125
+#: rc.cpp:105
+#, no-c-format
+msgid "Option"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 136
+#: rc.cpp:108 rc.cpp:219
+#, no-c-format
+msgid "Value"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 147
+#: rc.cpp:111
+#, no-c-format
+msgid "Trace"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 160
+#: rc.cpp:114 rc.cpp:237
+#, no-c-format
+msgid "Jumps"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 174
+#: rc.cpp:117
+#, no-c-format
+msgid "Instructions"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 189
+#: rc.cpp:120 rc.cpp:240
+#, no-c-format
+msgid "Events"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 202
+#: rc.cpp:123
+#, no-c-format
+msgid "Full Cache"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 216
+#: rc.cpp:126
+#, no-c-format
+msgid "Custom"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 231
+#: rc.cpp:129
+#, no-c-format
+msgid "Collect"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 244
+#: rc.cpp:132
+#, no-c-format
+msgid "At Startup"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 258
+#: rc.cpp:135
+#, no-c-format
+msgid "While In"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 273
+#: rc.cpp:138
+#, no-c-format
+msgid "Skip"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 286
+#: rc.cpp:141
+#, no-c-format
+msgid "PLT"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 315
+#: rc.cpp:147
+#, no-c-format
+msgid "Dump Profile"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 328
+#: rc.cpp:150
+#, no-c-format
+msgid "Every BBs"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 342
+#: rc.cpp:153 rc.cpp:162
+#, no-c-format
+msgid "On Entering"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 356
+#: rc.cpp:156
+#, no-c-format
+msgid "On Leaving"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 371
+#: rc.cpp:159
+#, no-c-format
+msgid "Zero Events"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 399
+#: rc.cpp:165
+#, no-c-format
+msgid "Separate"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 412
+#: rc.cpp:168
+#, no-c-format
+msgid "Threads"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 426
+#: rc.cpp:171
+#, no-c-format
+msgid "Recursions"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 440
+#: rc.cpp:174
+#, no-c-format
+msgid "Call Chain"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 470
+#: rc.cpp:177
+#, no-c-format
+msgid "Custom profiler options:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 508
+#: rc.cpp:180
+#, no-c-format
+msgid "Run New Profile"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 520
+#: rc.cpp:183
+#, no-c-format
+msgid "Info"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 531
+#: rc.cpp:186
+#, no-c-format
+msgid "Dump reason:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 544
+#: rc.cpp:189
+#, no-c-format
+msgid "Event summary:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 550
+#: callmapview.cpp:59 partselection.cpp:58 rc.cpp:192
+#, no-c-format
+msgid "Name"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 561
+#: rc.cpp:195
+#, no-c-format
+msgid "Sum"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 579
+#: rc.cpp:198
+#, no-c-format
+msgid "Miscellaneous:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 617
+#: rc.cpp:201
+#, no-c-format
+msgid "Show"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 625
+#: rc.cpp:204
+#, no-c-format
+msgid "Compare"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 637
+#: rc.cpp:207
+#, no-c-format
+msgid "State"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 656
+#: rc.cpp:210
+#, no-c-format
+msgid "Update"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 664
+#: rc.cpp:213
+#, no-c-format
+msgid "Every [s]:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 677
+#: rc.cpp:216
+#, no-c-format
+msgid "Counter"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 699
+#: rc.cpp:222
+#, no-c-format
+msgid "Dumps Done"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 713
+#: rc.cpp:225
+#, no-c-format
+msgid "Is Collecting"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 727
+#: rc.cpp:228
+#, no-c-format
+msgid "Executed"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 740
+#: rc.cpp:231
+#, no-c-format
+msgid "Basic Blocks"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 754
+#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
+#, no-c-format
+msgid "Calls"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 796
+#: rc.cpp:243
+#, no-c-format
+msgid "Ir"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 811
+#: rc.cpp:246
+#, no-c-format
+msgid "Distinct"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 824
+#: configdlg.cpp:58 rc.cpp:249
+#, no-c-format
+msgid "ELF Objects"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 838
+#: rc.cpp:252
+#, no-c-format
+msgid "Functions"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 852
+#: rc.cpp:255
+#, no-c-format
+msgid "Contexts"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 890
+#: rc.cpp:258
+#, no-c-format
+msgid "Stack trace:"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 898
+#: rc.cpp:261
+#, no-c-format
+msgid "Sync."
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 906
+#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
+#, no-c-format
+msgid "#"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 917
+#: costtypeview.cpp:43 coverageview.cpp:46 partview.cpp:47 rc.cpp:267
+#: rc.cpp:309
+#, no-c-format
+msgid "Incl."
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 928
+#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
+#, no-c-format
+msgid "Called"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 950
+#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
+#, no-c-format
+msgid "Location"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 976
+#: rc.cpp:279
+#, no-c-format
+msgid "Start"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 1001
+#: rc.cpp:282
+#, no-c-format
+msgid "Zero"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 1009
+#: rc.cpp:285
+#, no-c-format
+msgid "Dump"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 1021
+#: rc.cpp:288
+#, no-c-format
+msgid "Messages"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 1045
+#: rc.cpp:291
+#, no-c-format
+msgid "Kill Run"
+msgstr ""
+
+#. i18n: file functionselectionbase.ui line 16
+#: rc.cpp:297 toplevel.cpp:594
+#, no-c-format
+msgid "Function Profile"
+msgstr ""
+
+#. i18n: file functionselectionbase.ui line 41
+#: rc.cpp:300
+#, no-c-format
+msgid "&Search:"
+msgstr ""
+
+#. i18n: file functionselectionbase.ui line 62
+#: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
+#: rc.cpp:312
+#, no-c-format
+msgid "Self"
+msgstr ""
+
+#. i18n: file functionselectionbase.ui line 73
+#: rc.cpp:306
+#, no-c-format
+msgid "Group"
+msgstr ""
+
+#. i18n: file partselectionbase.ui line 16
+#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
+#, no-c-format
+msgid "Parts Overview"
+msgstr ""
+
+#. i18n: file partselectionbase.ui line 60
+#: rc.cpp:327
+#, no-c-format
+msgid "(no trace parts)"
+msgstr ""
+
+#. i18n: file stackselectionbase.ui line 16
+#: rc.cpp:330
+#, no-c-format
+msgid "Stack Selection"
+msgstr ""
+
+#. i18n: file stackselectionbase.ui line 31
+#: callmapview.cpp:60 callview.cpp:44 instrview.cpp:126 partselection.cpp:59
+#: rc.cpp:333 sourceview.cpp:51
+#, no-c-format
+msgid "Cost"
+msgstr ""
+
+#. i18n: file stackselectionbase.ui line 42
+#: rc.cpp:336
+#, no-c-format
+msgid "Cost2"
+msgstr ""
+
+#: partgraph.cpp:167
+#, c-format
+msgid "Profile Part %1"
+msgstr ""
+
+#: partgraph.cpp:226
+msgid "(no trace)"
+msgstr ""
+
+#: partgraph.cpp:229
+msgid "(no part)"
+msgstr ""
+
 #: tips.txt:3
 msgid ""
 "<p>...that the <em>What's This?</em> help for every GUI widget\n"
@@ -271,153 +950,54 @@ msgid ""
 "code).</p>\n"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 824
-#: configdlg.cpp:58 rc.cpp:249
-#, no-c-format
-msgid "ELF Objects"
+#: main.cpp:38
+msgid "Run <exec> under cachegrind"
 msgstr ""
 
-#: configdlg.cpp:60
-msgid "Source Files"
+#: main.cpp:39
+msgid "Show information of this trace"
 msgstr ""
 
-#: configdlg.cpp:61
-msgid "C++ Classes"
+#: main.cpp:46
+msgid "KCachegrind"
 msgstr ""
 
-#: configdlg.cpp:62
-msgid "Function (no Grouping)"
+#: main.cpp:48
+msgid "TDE Frontend for Cachegrind"
 msgstr ""
 
-#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
-msgid "(always)"
+#: main.cpp:50
+msgid "(C) 2002, 2003, 2004"
 msgstr ""
 
-#: configdlg.cpp:210
-msgid "KCachegrind Configuration"
+#: main.cpp:53
+msgid "Author/Maintainer"
 msgstr ""
 
-#: configdlg.cpp:211
+#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
+#, c-format
 msgid ""
-"The Maximum Number of List Items should be below 500.The previous set value "
-"(%1) will still be used."
-msgstr ""
-
-#: configdlg.cpp:384
-msgid "Choose Source Folder"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 550
-#: callmapview.cpp:59 partselection.cpp:58 rc.cpp:192
-#, no-c-format
-msgid "Name"
-msgstr ""
-
-#. i18n: file stackselectionbase.ui line 31
-#: callmapview.cpp:60 callview.cpp:44 instrview.cpp:126 partselection.cpp:59
-#: rc.cpp:333 sourceview.cpp:51
-#, no-c-format
-msgid "Cost"
-msgstr ""
-
-#: partselection.cpp:151
-msgid "Profile Part Overview: Current is '%1'"
-msgstr ""
-
-#: partselection.cpp:287
-msgid "Deselect"
-msgstr ""
-
-#: partselection.cpp:287 partselection.cpp:311
-msgid "Select"
-msgstr ""
-
-#: partselection.cpp:292
-msgid "Select All Parts"
-msgstr ""
-
-#: partselection.cpp:294
-msgid "Visible Parts"
-msgstr ""
-
-#: partselection.cpp:296
-msgid "Hide Selected Parts"
-msgstr ""
-
-#: partselection.cpp:297
-msgid "Unhide Hidden Parts"
-msgstr ""
-
-#: partselection.cpp:302 toplevel.cpp:1687
-msgid "Go Back"
-msgstr ""
-
-#: callgraphview.cpp:2570 partselection.cpp:320
-msgid "Visualization"
-msgstr ""
-
-#: partselection.cpp:322
-msgid "Partitioning Mode"
-msgstr ""
-
-#: partselection.cpp:323
-msgid "Diagram Mode"
-msgstr ""
-
-#: partselection.cpp:324
-msgid "Zoom Function"
-msgstr ""
-
-#: partselection.cpp:325
-msgid "Show Direct Calls"
-msgstr ""
-
-#: partselection.cpp:326
-msgid "Increment Shown Call Levels"
-msgstr ""
-
-#: partselection.cpp:340
-msgid "Draw Names"
-msgstr ""
-
-#: partselection.cpp:341
-msgid "Draw Costs"
-msgstr ""
-
-#: callmapview.cpp:303 partselection.cpp:342
-msgid "Ignore Proportions"
-msgstr ""
-
-#: partselection.cpp:343
-msgid "Draw Frames"
-msgstr ""
-
-#: callmapview.cpp:304 partselection.cpp:344 treemap.cpp:2887
-msgid "Allow Rotation"
-msgstr ""
-
-#: partselection.cpp:359
-msgid "Hide Info"
-msgstr ""
-
-#: partselection.cpp:361
-msgid "Show Info"
+"_n: (%n function skipped)\n"
+"(%n functions skipped)"
 msgstr ""
 
-#: partselection.cpp:541
-msgid "(no trace loaded)"
+#: costlistitem.cpp:60
+#, c-format
+msgid ""
+"_n: (%n item skipped)\n"
+"(%n items skipped)"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 950
-#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
-#, no-c-format
-msgid "Location"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 754
-#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
-#, no-c-format
-msgid "Calls"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
 
 #: callmapview.cpp:98
@@ -580,6 +1160,14 @@ msgstr ""
 msgid "Draw Calls"
 msgstr ""
 
+#: callmapview.cpp:303 partselection.cpp:342
+msgid "Ignore Proportions"
+msgstr ""
+
+#: callmapview.cpp:304 partselection.cpp:344 treemap.cpp:2887
+msgid "Allow Rotation"
+msgstr ""
+
 #: callmapview.cpp:321 treemap.cpp:2889
 msgid "Shading"
 msgstr ""
@@ -596,122 +1184,6 @@ msgstr ""
 msgid "(no call)"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 917
-#: costtypeview.cpp:43 coverageview.cpp:46 partview.cpp:47 rc.cpp:267
-#: rc.cpp:309
-#, no-c-format
-msgid "Incl."
-msgstr ""
-
-#: coverageview.cpp:48 coverageview.cpp:54
-msgid "Distance"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 928
-#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
-#, no-c-format
-msgid "Called"
-msgstr ""
-
-#: callview.cpp:48 coverageview.cpp:50
-msgid "Caller"
-msgstr ""
-
-#. i18n: file functionselectionbase.ui line 62
-#: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
-#: rc.cpp:312
-#, no-c-format
-msgid "Self"
-msgstr ""
-
-#: coverageview.cpp:55
-msgid "Calling"
-msgstr ""
-
-#: callview.cpp:52 coverageview.cpp:56
-msgid "Callee"
-msgstr ""
-
-#: coverageview.cpp:90
-msgid ""
-"<b>List of all Callers</b>"
-"<p>This list shows all functions calling the current selected one, either "
-"directly or with several functions in-between on the stack; the number of "
-"functions in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the selected function while a "
-"listed function is active; relative cost is the percentage of all cost spent in "
-"the selected function while the listed one is active. The cost graphic shows "
-"logarithmic percentage with a different color for each distance.</p>"
-"<p>As there can be many calls from the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"parentheses, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-
-#: coverageview.cpp:120
-msgid ""
-"<b>List of all Callees</b>"
-"<p>This list shows all functions called by the current selected one, either "
-"directly or with several function in-between on the stack; the number of "
-"function in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the listed function while the "
-"selected is active; relative cost is the percentage of all cost spent in the "
-"listed function while the selected one is active. The cost graphic always shows "
-"logarithmic percentage with a different color for each distance.</p>"
-"<p>As there can be many calls to the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"parentheses, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-
-#: callgraphview.cpp:2396 callgraphview.cpp:2400 callgraphview.cpp:2418
-#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
-#: sourceview.cpp:116
-msgid "Go to '%1'"
-msgstr ""
-
-#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
-msgid "Cost 2"
-msgstr ""
-
-#: callview.cpp:47 callview.cpp:51
-msgid "Count"
-msgstr ""
-
-#: callview.cpp:85
-msgid ""
-"<b>List of direct Callers</b>"
-"<p>This list shows all functions calling the current selected one directly, "
-"together with a call count and the cost spent in the current selected function "
-"while being called from the function from the list.</p>"
-"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
-"a recursive cycle. An inclusive cost makes no sense here.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-
-#: callview.cpp:98
-msgid ""
-"<b>List of direct Callees</b>"
-"<p>This list shows all functions called by the current selected one directly, "
-"together with a call count and the cost spent in this function while being "
-"called from the selected function.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-
 #: instritem.cpp:106 sourceitem.cpp:86
 msgid "Active call to '%1'"
 msgstr ""
@@ -722,166 +1194,126 @@ msgid ""
 "%n calls to '%1'"
 msgstr ""
 
-#: instritem.cpp:137
-msgid "Jump %1 of %2 times to 0x%3"
+#: sourceitem.cpp:125
+msgid "Jump %1 of %2 times to %3"
 msgstr ""
 
-#: instritem.cpp:142
-msgid "Jump %1 times to 0x%2"
+#: sourceitem.cpp:130
+msgid "Jump %1 times to %2"
 msgstr ""
 
 #: instritem.cpp:185 sourceitem.cpp:169
 msgid "(cycle)"
 msgstr ""
 
-#: tracedata.cpp:153
-msgid "Abstract Item"
-msgstr ""
-
-#: tracedata.cpp:154
-msgid "Cost Item"
-msgstr ""
-
-#: tracedata.cpp:155
-msgid "Part Source Line"
-msgstr ""
-
-#: tracedata.cpp:156
-msgid "Source Line"
-msgstr ""
-
-#: tracedata.cpp:157
-msgid "Part Line Call"
-msgstr ""
-
-#: tracedata.cpp:158
-msgid "Line Call"
-msgstr ""
-
-#: tracedata.cpp:159
-msgid "Part Jump"
-msgstr ""
-
-#: tracedata.cpp:160
-msgid "Jump"
-msgstr ""
-
-#: tracedata.cpp:161
-msgid "Part Instruction"
-msgstr ""
-
-#: tracedata.cpp:162
-msgid "Instruction"
-msgstr ""
-
-#: tracedata.cpp:163
-msgid "Part Instruction Jump"
-msgstr ""
-
-#: tracedata.cpp:164
-msgid "Instruction Jump"
-msgstr ""
-
-#: tracedata.cpp:165
-msgid "Part Instruction Call"
-msgstr ""
-
-#: tracedata.cpp:166
-msgid "Instruction Call"
-msgstr ""
-
-#: tracedata.cpp:167
-msgid "Part Call"
-msgstr ""
-
-#: tracedata.cpp:168
-msgid "Call"
+#: costtypeview.cpp:42
+msgid "Event Type"
 msgstr ""
 
-#: tracedata.cpp:169
-msgid "Part Function"
+#: costtypeview.cpp:45
+msgid "Short"
 msgstr ""
 
-#: tracedata.cpp:170
-msgid "Function Source File"
+#: costtypeview.cpp:47
+msgid "Formula"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 300
-#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:171
-#, no-c-format
-msgid "Function"
+#: costtypeview.cpp:81
+msgid ""
+"<b>Cost Types List</b>"
+"<p>This list shows all cost types available and what the self/inclusive cost of "
+"the current selected function is for that cost type.</p>"
+"<p>By choosing a cost type from the list, you change the cost type of costs "
+"shown all over KCachegrind to be the selected one.</p>"
 msgstr ""
 
-#: tracedata.cpp:172
-msgid "Function Cycle"
+#: costtypeview.cpp:98
+msgid "Set Secondary Event Type"
 msgstr ""
 
-#: tracedata.cpp:173
-msgid "Part Class"
+#: costtypeview.cpp:100
+msgid "Remove Secondary Event Type"
 msgstr ""
 
-#: tracedata.cpp:174
-msgid "Class"
+#: costtypeview.cpp:105
+msgid "Edit Long Name"
 msgstr ""
 
-#: tracedata.cpp:175
-msgid "Part Source File"
+#: costtypeview.cpp:106
+msgid "Edit Short Name"
 msgstr ""
 
-#: tracedata.cpp:176
-msgid "Source File"
+#: costtypeview.cpp:107
+msgid "Edit Formula"
 msgstr ""
 
-#: tracedata.cpp:177
-msgid "Part ELF Object"
+#: costtypeview.cpp:115
+msgid "New Cost Type ..."
 msgstr ""
 
-#: tracedata.cpp:178
-msgid "ELF Object"
+#: costtypeview.cpp:149 costtypeview.cpp:154
+#, c-format
+msgid "New%1"
 msgstr ""
 
-#: partview.cpp:46 tracedata.cpp:179
-msgid "Profile Part"
+#: costtypeview.cpp:155
+#, c-format
+msgid "New Cost Type %1"
 msgstr ""
 
-#: tracedata.cpp:180
-msgid "Program Trace"
+#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
+msgid "Cost 2"
 msgstr ""
 
-#: tracedata.cpp:241
-msgid "%1 from %2"
+#: callview.cpp:47 callview.cpp:51
+msgid "Count"
 msgstr ""
 
-#: partgraph.cpp:423 tracedata.cpp:249 tracedata.cpp:254 tracedata.cpp:2824
-#: tracedata.cpp:3241 tracedata.cpp:3327 tracedata.cpp:4165 tracedata.cpp:4173
-#: tracedata.cpp:4238
-msgid "(unknown)"
+#: callview.cpp:48 coverageview.cpp:50
+msgid "Caller"
 msgstr ""
 
-#: tracedata.cpp:2583
-msgid "(no caller)"
+#: callview.cpp:52 coverageview.cpp:56
+msgid "Callee"
 msgstr ""
 
-#: tracedata.cpp:2590 tracedata.cpp:2609
-msgid "%1 via %2"
+#: callview.cpp:85
+msgid ""
+"<b>List of direct Callers</b>"
+"<p>This list shows all functions calling the current selected one directly, "
+"together with a call count and the cost spent in the current selected function "
+"while being called from the function from the list.</p>"
+"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
+"a recursive cycle. An inclusive cost makes no sense here.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: tracedata.cpp:2599
-msgid "(no callee)"
+#: callview.cpp:98
+msgid ""
+"<b>List of direct Callees</b>"
+"<p>This list shows all functions called by the current selected one directly, "
+"together with a call count and the cost spent in this function while being "
+"called from the selected function.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: tracedata.cpp:4467
-msgid "(not found)"
+#: callgraphview.cpp:2396 callgraphview.cpp:2400 callgraphview.cpp:2418
+#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
+#: sourceview.cpp:116
+msgid "Go to '%1'"
 msgstr ""
 
-#: tracedata.cpp:5017
-msgid "Recalculating Function Cycles..."
+#: cachegrindloader.cpp:141
+msgid "Import filter for Cachegrind/Callgrind generated profile data files"
 msgstr ""
 
-#. i18n: file partselectionbase.ui line 16
-#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
-#, no-c-format
-msgid "Parts Overview"
+#: cachegrindloader.cpp:738
+#, c-format
+msgid "Loading %1"
 msgstr ""
 
 #: toplevel.cpp:283
@@ -934,12 +1366,6 @@ msgid ""
 "costs less than 1% are hidden on default.</p>"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 16
-#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
-#, no-c-format
-msgid "Profile Dumps"
-msgstr ""
-
 #: toplevel.cpp:362
 msgid ""
 "<b>Profile Dumps</b>"
@@ -1086,12 +1512,6 @@ msgstr ""
 msgid "Show/Hide the Call Stack Dockable"
 msgstr ""
 
-#. i18n: file functionselectionbase.ui line 16
-#: rc.cpp:297 toplevel.cpp:594
-#, no-c-format
-msgid "Function Profile"
-msgstr ""
-
 #: toplevel.cpp:599
 msgid "Show/Hide the Function Profile Dockable"
 msgstr ""
@@ -1271,6 +1691,10 @@ msgstr ""
 msgid "Show Relative Cost"
 msgstr ""
 
+#: partselection.cpp:302 toplevel.cpp:1687
+msgid "Go Back"
+msgstr ""
+
 #: toplevel.cpp:1688
 msgid "Go Forward"
 msgstr ""
@@ -1312,84 +1736,21 @@ msgstr ""
 msgid "(No Function Up)"
 msgstr ""
 
-#: costlistitem.cpp:60
-#, c-format
-msgid ""
-"_n: (%n item skipped)\n"
-"(%n items skipped)"
-msgstr ""
-
-#: sourceitem.cpp:125
-msgid "Jump %1 of %2 times to %3"
-msgstr ""
-
-#: sourceitem.cpp:130
-msgid "Jump %1 times to %2"
-msgstr ""
-
-#: costtypeview.cpp:42
-msgid "Event Type"
-msgstr ""
-
-#: costtypeview.cpp:45
-msgid "Short"
-msgstr ""
-
-#: costtypeview.cpp:47
-msgid "Formula"
-msgstr ""
-
-#: costtypeview.cpp:81
-msgid ""
-"<b>Cost Types List</b>"
-"<p>This list shows all cost types available and what the self/inclusive cost of "
-"the current selected function is for that cost type.</p>"
-"<p>By choosing a cost type from the list, you change the cost type of costs "
-"shown all over KCachegrind to be the selected one.</p>"
-msgstr ""
-
-#: costtypeview.cpp:98
-msgid "Set Secondary Event Type"
-msgstr ""
-
-#: costtypeview.cpp:100
-msgid "Remove Secondary Event Type"
-msgstr ""
-
-#: costtypeview.cpp:105
-msgid "Edit Long Name"
-msgstr ""
-
-#: costtypeview.cpp:106
-msgid "Edit Short Name"
-msgstr ""
-
-#: costtypeview.cpp:107
-msgid "Edit Formula"
-msgstr ""
-
-#: costtypeview.cpp:115
-msgid "New Cost Type ..."
-msgstr ""
-
-#: costtypeview.cpp:149 costtypeview.cpp:154
-#, c-format
-msgid "New%1"
+#: costtypeitem.cpp:56
+msgid "Unknown Type"
 msgstr ""
 
-#: costtypeview.cpp:155
+#: functionselection.cpp:176
 #, c-format
-msgid "New Cost Type %1"
+msgid "Go to %1"
 msgstr ""
 
-#: costtypeitem.cpp:56
-msgid "Unknown Type"
+#: functionselection.cpp:203
+msgid "Show All Items"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 906
-#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
-#, no-c-format
-msgid "#"
+#: functionselection.cpp:226
+msgid "No Grouping"
 msgstr ""
 
 #: sourceview.cpp:54 sourceview.cpp:554
@@ -1469,500 +1830,6 @@ msgstr ""
 msgid "The list can be found in the configuration dialog."
 msgstr ""
 
-#: functionselection.cpp:176
-#, c-format
-msgid "Go to %1"
-msgstr ""
-
-#: functionselection.cpp:203
-msgid "Show All Items"
-msgstr ""
-
-#: functionselection.cpp:226
-msgid "No Grouping"
-msgstr ""
-
-#. i18n: file tdecachegrindui.rc line 15
-#: rc.cpp:9
-#, no-c-format
-msgid "&Layout"
-msgstr ""
-
-#. i18n: file tdecachegrindui.rc line 32
-#: rc.cpp:12
-#, no-c-format
-msgid "Sidebars"
-msgstr ""
-
-#. i18n: file tdecachegrindui.rc line 54
-#: rc.cpp:18
-#, no-c-format
-msgid "State Toolbar"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 37
-#: rc.cpp:24
-#, no-c-format
-msgid "General"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 69
-#: rc.cpp:27
-#, no-c-format
-msgid "Truncated when more/longer than:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 77
-#: rc.cpp:30
-#, no-c-format
-msgid "Precision of percentage values:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 85
-#: rc.cpp:33
-#, no-c-format
-msgid "Symbols in tooltips and context menus"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 141
-#: rc.cpp:36
-#, no-c-format
-msgid "Maximum number of items in lists:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 162
-#: rc.cpp:39
-#, no-c-format
-msgid "Cost Item Colors"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 246
-#: callgraphview.cpp:2562 rc.cpp:42 rc.cpp:51 rc.cpp:54
-#, no-c-format
-msgid "Automatic"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 254
-#: rc.cpp:45
-#, no-c-format
-msgid "Object:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 262
-#: rc.cpp:48
-#, no-c-format
-msgid "Class:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 310
-#: rc.cpp:57
-#, no-c-format
-msgid "File:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 376
-#: rc.cpp:60
-#, no-c-format
-msgid "Annotations"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 395
-#: rc.cpp:63
-#, no-c-format
-msgid "Context lines in annotations:"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 423
-#: rc.cpp:66
-#, no-c-format
-msgid "Source Folders"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 454
-#: rc.cpp:69
-#, no-c-format
-msgid "Object / Related Source Base"
-msgstr ""
-
-#. i18n: file configdlgbase.ui line 483
-#: rc.cpp:72
-#, no-c-format
-msgid "Add..."
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 32
-#: rc.cpp:87
-#, no-c-format
-msgid "Target"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 54
-#: rc.cpp:90
-#, no-c-format
-msgid "Time"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 65
-#: rc.cpp:93
-#, no-c-format
-msgid "Path"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 106
-#: rc.cpp:99
-#, no-c-format
-msgid "Target command:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 119
-#: rc.cpp:102
-#, no-c-format
-msgid "Profiler options:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 125
-#: rc.cpp:105
-#, no-c-format
-msgid "Option"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 136
-#: rc.cpp:108 rc.cpp:219
-#, no-c-format
-msgid "Value"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 147
-#: rc.cpp:111
-#, no-c-format
-msgid "Trace"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 160
-#: rc.cpp:114 rc.cpp:237
-#, no-c-format
-msgid "Jumps"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 174
-#: rc.cpp:117
-#, no-c-format
-msgid "Instructions"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 189
-#: rc.cpp:120 rc.cpp:240
-#, no-c-format
-msgid "Events"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 202
-#: rc.cpp:123
-#, no-c-format
-msgid "Full Cache"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 216
-#: rc.cpp:126
-#, no-c-format
-msgid "Custom"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 231
-#: rc.cpp:129
-#, no-c-format
-msgid "Collect"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 244
-#: rc.cpp:132
-#, no-c-format
-msgid "At Startup"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 258
-#: rc.cpp:135
-#, no-c-format
-msgid "While In"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 273
-#: rc.cpp:138
-#, no-c-format
-msgid "Skip"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 286
-#: rc.cpp:141
-#, no-c-format
-msgid "PLT"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 315
-#: rc.cpp:147
-#, no-c-format
-msgid "Dump Profile"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 328
-#: rc.cpp:150
-#, no-c-format
-msgid "Every BBs"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 342
-#: rc.cpp:153 rc.cpp:162
-#, no-c-format
-msgid "On Entering"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 356
-#: rc.cpp:156
-#, no-c-format
-msgid "On Leaving"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 371
-#: rc.cpp:159
-#, no-c-format
-msgid "Zero Events"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 399
-#: rc.cpp:165
-#, no-c-format
-msgid "Separate"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 412
-#: rc.cpp:168
-#, no-c-format
-msgid "Threads"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 426
-#: rc.cpp:171
-#, no-c-format
-msgid "Recursions"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 440
-#: rc.cpp:174
-#, no-c-format
-msgid "Call Chain"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 470
-#: rc.cpp:177
-#, no-c-format
-msgid "Custom profiler options:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 508
-#: rc.cpp:180
-#, no-c-format
-msgid "Run New Profile"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 520
-#: rc.cpp:183
-#, no-c-format
-msgid "Info"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 531
-#: rc.cpp:186
-#, no-c-format
-msgid "Dump reason:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 544
-#: rc.cpp:189
-#, no-c-format
-msgid "Event summary:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 561
-#: rc.cpp:195
-#, no-c-format
-msgid "Sum"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 579
-#: rc.cpp:198
-#, no-c-format
-msgid "Miscellaneous:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 617
-#: rc.cpp:201
-#, no-c-format
-msgid "Show"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 625
-#: rc.cpp:204
-#, no-c-format
-msgid "Compare"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 637
-#: rc.cpp:207
-#, no-c-format
-msgid "State"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 656
-#: rc.cpp:210
-#, no-c-format
-msgid "Update"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 664
-#: rc.cpp:213
-#, no-c-format
-msgid "Every [s]:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 677
-#: rc.cpp:216
-#, no-c-format
-msgid "Counter"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 699
-#: rc.cpp:222
-#, no-c-format
-msgid "Dumps Done"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 713
-#: rc.cpp:225
-#, no-c-format
-msgid "Is Collecting"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 727
-#: rc.cpp:228
-#, no-c-format
-msgid "Executed"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 740
-#: rc.cpp:231
-#, no-c-format
-msgid "Basic Blocks"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 796
-#: rc.cpp:243
-#, no-c-format
-msgid "Ir"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 811
-#: rc.cpp:246
-#, no-c-format
-msgid "Distinct"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 838
-#: rc.cpp:252
-#, no-c-format
-msgid "Functions"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 852
-#: rc.cpp:255
-#, no-c-format
-msgid "Contexts"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 890
-#: rc.cpp:258
-#, no-c-format
-msgid "Stack trace:"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 898
-#: rc.cpp:261
-#, no-c-format
-msgid "Sync."
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 976
-#: rc.cpp:279
-#, no-c-format
-msgid "Start"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 1001
-#: rc.cpp:282
-#, no-c-format
-msgid "Zero"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 1009
-#: rc.cpp:285
-#, no-c-format
-msgid "Dump"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 1021
-#: rc.cpp:288
-#, no-c-format
-msgid "Messages"
-msgstr ""
-
-#. i18n: file dumpselectionbase.ui line 1045
-#: rc.cpp:291
-#, no-c-format
-msgid "Kill Run"
-msgstr ""
-
-#. i18n: file functionselectionbase.ui line 41
-#: rc.cpp:300
-#, no-c-format
-msgid "&Search:"
-msgstr ""
-
-#. i18n: file functionselectionbase.ui line 73
-#: rc.cpp:306
-#, no-c-format
-msgid "Group"
-msgstr ""
-
-#. i18n: file partselectionbase.ui line 60
-#: rc.cpp:327
-#, no-c-format
-msgid "(no trace parts)"
-msgstr ""
-
-#. i18n: file stackselectionbase.ui line 16
-#: rc.cpp:330
-#, no-c-format
-msgid "Stack Selection"
-msgstr ""
-
-#. i18n: file stackselectionbase.ui line 42
-#: rc.cpp:336
-#, no-c-format
-msgid "Cost2"
-msgstr ""
-
-#: partgraph.cpp:167
-#, c-format
-msgid "Profile Part %1"
-msgstr ""
-
-#: partgraph.cpp:226
-msgid "(no trace)"
-msgstr ""
-
-#: partgraph.cpp:229
-msgid "(no part)"
-msgstr ""
-
 #: configuration.cpp:67
 msgid "Instruction Fetch"
 msgstr ""
@@ -2039,6 +1906,36 @@ msgstr ""
 msgid "Cycle Estimation"
 msgstr ""
 
+#: configdlg.cpp:60
+msgid "Source Files"
+msgstr ""
+
+#: configdlg.cpp:61
+msgid "C++ Classes"
+msgstr ""
+
+#: configdlg.cpp:62
+msgid "Function (no Grouping)"
+msgstr ""
+
+#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
+msgid "(always)"
+msgstr ""
+
+#: configdlg.cpp:210
+msgid "KCachegrind Configuration"
+msgstr ""
+
+#: configdlg.cpp:211
+msgid ""
+"The Maximum Number of List Items should be below 500.The previous set value "
+"(%1) will still be used."
+msgstr ""
+
+#: configdlg.cpp:384
+msgid "Choose Source Folder"
+msgstr ""
+
 #: partview.cpp:51
 msgid "Comment"
 msgstr ""
@@ -2078,17 +1975,6 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
-#: traceitemview.cpp:53
-msgid "No description available"
-msgstr ""
-
-#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
-#, c-format
-msgid ""
-"_n: (%n function skipped)\n"
-"(%n functions skipped)"
-msgstr ""
-
 #: callgraphview.cpp:306
 #, c-format
 msgid "Call(s) from %1"
@@ -2347,114 +2233,96 @@ msgstr ""
 msgid "Graph"
 msgstr ""
 
-#: callgraphview.cpp:2571
-msgid "Birds-eye View"
-msgstr ""
-
-#: treemap.cpp:1281
-#, c-format
-msgid "Text %1"
-msgstr ""
-
-#: treemap.cpp:2809
-msgid "Recursive Bisection"
-msgstr ""
-
-#: treemap.cpp:2810
-msgid "Columns"
+#: callgraphview.cpp:2570 partselection.cpp:320
+msgid "Visualization"
 msgstr ""
 
-#: treemap.cpp:2811
-msgid "Rows"
+#: callgraphview.cpp:2571
+msgid "Birds-eye View"
 msgstr ""
 
-#: treemap.cpp:2812
-msgid "Always Best"
+#: partlistitem.cpp:49
+msgid " (Thread %1)"
 msgstr ""
 
-#: treemap.cpp:2813
-msgid "Best"
+#: partlistitem.cpp:56
+msgid "(none)"
 msgstr ""
 
-#: treemap.cpp:2814
-msgid "Alternate (V)"
+#: callitem.cpp:82 partlistitem.cpp:152
+msgid "(active)"
 msgstr ""
 
-#: treemap.cpp:2815
-msgid "Alternate (H)"
+#: partselection.cpp:151
+msgid "Profile Part Overview: Current is '%1'"
 msgstr ""
 
-#: treemap.cpp:2872
-msgid "Nesting"
+#: partselection.cpp:287
+msgid "Deselect"
 msgstr ""
 
-#: treemap.cpp:2875
-msgid "Correct Borders Only"
+#: partselection.cpp:287 partselection.cpp:311
+msgid "Select"
 msgstr ""
 
-#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
-#, c-format
-msgid "Width %1"
+#: partselection.cpp:292
+msgid "Select All Parts"
 msgstr ""
 
-#: treemap.cpp:2902
-msgid "Visible"
+#: partselection.cpp:294
+msgid "Visible Parts"
 msgstr ""
 
-#: treemap.cpp:2903
-msgid "Take Space From Children"
+#: partselection.cpp:296
+msgid "Hide Selected Parts"
 msgstr ""
 
-#: treemap.cpp:2905
-msgid "Top Left"
+#: partselection.cpp:297
+msgid "Unhide Hidden Parts"
 msgstr ""
 
-#: treemap.cpp:2906
-msgid "Top Center"
+#: partselection.cpp:322
+msgid "Partitioning Mode"
 msgstr ""
 
-#: treemap.cpp:2907
-msgid "Top Right"
+#: partselection.cpp:323
+msgid "Diagram Mode"
 msgstr ""
 
-#: treemap.cpp:2909
-msgid "Bottom Center"
+#: partselection.cpp:324
+msgid "Zoom Function"
 msgstr ""
 
-#: treemap.cpp:2910
-msgid "Bottom Right"
+#: partselection.cpp:325
+msgid "Show Direct Calls"
 msgstr ""
 
-#: treemap.cpp:2987
-msgid "No %1 Limit"
+#: partselection.cpp:326
+msgid "Increment Shown Call Levels"
 msgstr ""
 
-#: treemap.cpp:3056 treemap.cpp:3067
-#, c-format
-msgid ""
-"_n: 1 Pixel\n"
-"%n Pixels"
+#: partselection.cpp:340
+msgid "Draw Names"
 msgstr ""
 
-#: treemap.cpp:3073
-msgid "Halve Area Limit (to %1)"
+#: partselection.cpp:341
+msgid "Draw Costs"
 msgstr ""
 
-#: treemap.cpp:3118
-#, c-format
-msgid "Depth %1"
+#: partselection.cpp:343
+msgid "Draw Frames"
 msgstr ""
 
-#: treemap.cpp:3122
-msgid "Decrement (to %1)"
+#: partselection.cpp:359
+msgid "Hide Info"
 msgstr ""
 
-#: treemap.cpp:3124
-msgid "Increment (to %1)"
+#: partselection.cpp:361
+msgid "Show Info"
 msgstr ""
 
-#: callitem.cpp:82 partlistitem.cpp:152
-msgid "(active)"
+#: partselection.cpp:541
+msgid "(no trace loaded)"
 msgstr ""
 
 #: instrview.cpp:129
@@ -2555,34 +2423,166 @@ msgstr ""
 msgid "Check that the ELF object used in the command exists."
 msgstr ""
 
-#: partlistitem.cpp:49
-msgid " (Thread %1)"
+#: instritem.cpp:137
+msgid "Jump %1 of %2 times to 0x%3"
 msgstr ""
 
-#: partlistitem.cpp:56
-msgid "(none)"
+#: instritem.cpp:142
+msgid "Jump %1 times to 0x%2"
 msgstr ""
 
-#: main.cpp:38
-msgid "Run <exec> under cachegrind"
+#: treemap.cpp:1281
+#, c-format
+msgid "Text %1"
 msgstr ""
 
-#: main.cpp:39
-msgid "Show information of this trace"
+#: treemap.cpp:2809
+msgid "Recursive Bisection"
 msgstr ""
 
-#: main.cpp:46
-msgid "KCachegrind"
+#: treemap.cpp:2810
+msgid "Columns"
 msgstr ""
 
-#: main.cpp:48
-msgid "TDE Frontend for Cachegrind"
+#: treemap.cpp:2811
+msgid "Rows"
 msgstr ""
 
-#: main.cpp:50
-msgid "(C) 2002, 2003, 2004"
+#: treemap.cpp:2812
+msgid "Always Best"
 msgstr ""
 
-#: main.cpp:53
-msgid "Author/Maintainer"
+#: treemap.cpp:2813
+msgid "Best"
+msgstr ""
+
+#: treemap.cpp:2814
+msgid "Alternate (V)"
+msgstr ""
+
+#: treemap.cpp:2815
+msgid "Alternate (H)"
+msgstr ""
+
+#: treemap.cpp:2872
+msgid "Nesting"
+msgstr ""
+
+#: treemap.cpp:2875
+msgid "Correct Borders Only"
+msgstr ""
+
+#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
+#, c-format
+msgid "Width %1"
+msgstr ""
+
+#: treemap.cpp:2902
+msgid "Visible"
+msgstr ""
+
+#: treemap.cpp:2903
+msgid "Take Space From Children"
+msgstr ""
+
+#: treemap.cpp:2905
+msgid "Top Left"
+msgstr ""
+
+#: treemap.cpp:2906
+msgid "Top Center"
+msgstr ""
+
+#: treemap.cpp:2907
+msgid "Top Right"
+msgstr ""
+
+#: treemap.cpp:2909
+msgid "Bottom Center"
+msgstr ""
+
+#: treemap.cpp:2910
+msgid "Bottom Right"
+msgstr ""
+
+#: treemap.cpp:2987
+msgid "No %1 Limit"
+msgstr ""
+
+#: treemap.cpp:3056 treemap.cpp:3067
+#, c-format
+msgid ""
+"_n: 1 Pixel\n"
+"%n Pixels"
+msgstr ""
+
+#: treemap.cpp:3073
+msgid "Halve Area Limit (to %1)"
+msgstr ""
+
+#: treemap.cpp:3118
+#, c-format
+msgid "Depth %1"
+msgstr ""
+
+#: treemap.cpp:3122
+msgid "Decrement (to %1)"
+msgstr ""
+
+#: treemap.cpp:3124
+msgid "Increment (to %1)"
+msgstr ""
+
+#: traceitemview.cpp:53
+msgid "No description available"
+msgstr ""
+
+#: coverageview.cpp:48 coverageview.cpp:54
+msgid "Distance"
+msgstr ""
+
+#: coverageview.cpp:55
+msgid "Calling"
+msgstr ""
+
+#: coverageview.cpp:90
+msgid ""
+"<b>List of all Callers</b>"
+"<p>This list shows all functions calling the current selected one, either "
+"directly or with several functions in-between on the stack; the number of "
+"functions in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the selected function while a "
+"listed function is active; relative cost is the percentage of all cost spent in "
+"the selected function while the listed one is active. The cost graphic shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls from the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
+msgstr ""
+
+#: coverageview.cpp:120
+msgid ""
+"<b>List of all Callees</b>"
+"<p>This list shows all functions called by the current selected one, either "
+"directly or with several function in-between on the stack; the number of "
+"function in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the listed function while the "
+"selected is active; relative cost is the percentage of all cost spent in the "
+"listed function while the selected one is active. The cost graphic always shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls to the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
diff --git a/tde-i18n-is/messages/tdesdk/tdefile_cpp.po b/tde-i18n-is/messages/tdesdk/tdefile_cpp.po
index b720d529fcb..f238577a5cc 100644
--- a/tde-i18n-is/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-is/messages/tdesdk/tdefile_cpp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_cpp\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/tdefile_diff.po b/tde-i18n-is/messages/tdesdk/tdefile_diff.po
index 6a75bcddc90..6fb97d7a75a 100644
--- a/tde-i18n-is/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-is/messages/tdesdk/tdefile_diff.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_diff\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/tdefile_po.po b/tde-i18n-is/messages/tdesdk/tdefile_po.po
index 5ab3b97c68f..fac51447772 100644
--- a/tde-i18n-is/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-is/messages/tdesdk/tdefile_po.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_po\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-01-21 15:20-0500\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/tdefile_ts.po b/tde-i18n-is/messages/tdesdk/tdefile_ts.po
index 6e1cbde0a97..ad6809128af 100644
--- a/tde-i18n-is/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-is/messages/tdesdk/tdefile_ts.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ts\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/tdeio_svn.po b/tde-i18n-is/messages/tdesdk/tdeio_svn.po
index c2972557e8d..d17045a4380 100644
--- a/tde-i18n-is/messages/tdesdk/tdeio_svn.po
+++ b/tde-i18n-is/messages/tdesdk/tdeio_svn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_svn\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-12-05 23:26+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
diff --git a/tde-i18n-is/messages/tdesdk/umbrello.po b/tde-i18n-is/messages/tdesdk/umbrello.po
index 365f8cc7dad..9ba77571b29 100644
--- a/tde-i18n-is/messages/tdesdk/umbrello.po
+++ b/tde-i18n-is/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2004-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -14,275 +14,247 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
 msgstr ""
 
-#: _translatorinfo.cpp:3
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
+
+#: docgenerators/main.cpp:64
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
 msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "AlignQt::Vertical Middle"
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "AlignQt::Horizontal Middle"
+#: worktoolbar.cpp:245
+msgid "Object"
 msgstr ""
 
-#: aligntoolbar.cpp:46
-msgid "AlignQt::Vertical Distribute"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "AlignQt::Horizontal Distribute"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
 msgstr ""
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
 msgstr ""
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
+#: worktoolbar.cpp:251
+msgid "Label"
 msgstr ""
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
+#: worktoolbar.cpp:252
+msgid "Note"
 msgstr ""
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
+#: worktoolbar.cpp:253
+msgid "Box"
 msgstr ""
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
 msgstr ""
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
 msgstr ""
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: worktoolbar.cpp:257
+msgid "Relationship"
 msgstr ""
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
 msgstr ""
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
 msgstr ""
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
 msgstr ""
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
 msgstr ""
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
 msgstr ""
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
 msgstr ""
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
 msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: worktoolbar.cpp:277
+msgid "Join"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
+#: worktoolbar.cpp:278
+msgid "Fork"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
 msgstr ""
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
 msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
 msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr ""
+
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
+
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr ""
+
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
+msgstr ""
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
 msgstr ""
 
 #: codegenerator.cpp:473
@@ -310,10 +282,6 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr ""
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr ""
-
 #: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 msgid "Enter State Name"
 msgstr ""
@@ -322,12 +290,8 @@ msgstr ""
 msgid "Enter the name of the new state:"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr ""
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: statewidget.cpp:176
+msgid "Enter Activity"
 msgstr ""
 
 #: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
@@ -340,1202 +304,1459 @@ msgstr ""
 msgid "new activity"
 msgstr ""
 
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
+#: umldoc.cpp:108
+msgid "Component View"
 msgstr ""
 
-#: operation.cpp:185
-msgid "new_parameter"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
 msgstr ""
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
 msgstr ""
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
+#: umldoc.cpp:942
+msgid "state diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
+#: umldoc.cpp:944
+msgid "activity diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: uml.cpp:179
-msgid "&Export model to DocBook"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 msgstr ""
 
-#: uml.cpp:182
-msgid "&Export model to XHTML"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: uml.cpp:186
-msgid "&New Class Wizard..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 msgstr ""
 
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
 msgstr ""
 
-#: uml.cpp:195
-msgid "&Generate All Code"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: uml.cpp:198
-msgid "&Import Classes..."
+#: umllistview.cpp:348
+msgid "Externalize Folder"
 msgstr ""
 
-#: uml.cpp:201
-msgid "Creates a new document"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
 msgstr ""
 
-#: uml.cpp:202
-msgid "Opens an existing document"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: uml.cpp:203
-msgid "Opens a recently used file"
+#: umllistview.cpp:1007
+msgid "Views"
 msgstr ""
 
-#: uml.cpp:204
-msgid "Saves the document"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: uml.cpp:205
-msgid "Saves the document as..."
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
 msgstr ""
 
-#: uml.cpp:206
-msgid "Closes the document"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: uml.cpp:207
-msgid "Prints out the document"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: uml.cpp:208
-msgid "Quits the application"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
 msgstr ""
 
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
 msgstr ""
 
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
 msgstr ""
 
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
 msgstr ""
 
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
 msgstr ""
 
-#: uml.cpp:214
-msgid "Set the default program preferences"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
-#: uml.cpp:216
-msgid "Delete &Selected"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: uml.cpp:224
-msgid "&Class Diagram..."
+#: association.cpp:89
+msgid "Collaboration Message"
 msgstr ""
 
-#: uml.cpp:228
-msgid "&Autolayout..."
+#: association.cpp:90
+msgid "Sequence Message"
 msgstr ""
 
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
+#: association.cpp:95
+msgid "Realization"
 msgstr ""
 
-#: uml.cpp:240
-msgid "S&tate Diagram..."
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: uml.cpp:243
-msgid "&Activity Diagram..."
+#. i18n: file umbrelloui.rc line 5
+#: rc.cpp:6
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
+#. i18n: file umbrelloui.rc line 13
+#: rc.cpp:12
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
+#. i18n: file umbrelloui.rc line 14
+#: rc.cpp:15
+#, no-c-format
+msgid "&New"
 msgstr ""
 
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
+#. i18n: file umbrelloui.rc line 31
+#: rc.cpp:18
+#, no-c-format
+msgid "Sh&ow"
 msgstr ""
 
-#: uml.cpp:258
-msgid "&Clear Diagram"
+#. i18n: file umbrelloui.rc line 43
+#: rc.cpp:24
+#, no-c-format
+msgid "&Code"
 msgstr ""
 
-#: uml.cpp:260
-msgid "&Snap to Grid"
+#. i18n: file umbrelloui.rc line 47
+#: rc.cpp:27
+#, no-c-format
+msgid "Active &Language"
 msgstr ""
 
-#: uml.cpp:262
-msgid "S&how Grid"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
+#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
+#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#, no-c-format
+msgid "Documentation"
 msgstr ""
 
-#: uml.cpp:265
-msgid "&Hide Grid"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
+#: rc.cpp:33 rc.cpp:156
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: uml.cpp:269
-msgid "&Export as Picture..."
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
+#: rc.cpp:36 rc.cpp:159
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: uml.cpp:271
-msgid "Export &All Diagrams as Pictures..."
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
+#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#, no-c-format
+msgid "Style:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
+#: rc.cpp:42
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: uml.cpp:286
-msgid "&Zoom Slider"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
+#, no-c-format
+msgid "General"
 msgstr ""
 
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
+#: rc.cpp:48
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: uml.cpp:295
-msgid "&Move Tab Left"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
+#: rc.cpp:51
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: uml.cpp:296
-msgid "&Move Tab Right"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
+#: rc.cpp:54
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: uml.cpp:308
-msgid "Select Diagram on Left"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
+#: rc.cpp:57 rc.cpp:81
+#, no-c-format
+msgid "vector"
 msgstr ""
 
-#: uml.cpp:309
-msgid "Select Diagram on Right"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
+#: rc.cpp:60
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: uml.cpp:327
-msgid "&Windows"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
+#: rc.cpp:63 rc.cpp:96
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
+#: rc.cpp:66
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
+#: rc.cpp:69 rc.cpp:90
+#, no-c-format
+msgid "string"
 msgstr ""
 
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
+#: rc.cpp:72
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
 msgstr ""
 
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
+#: rc.cpp:75
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
 msgstr ""
 
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
+#: rc.cpp:78
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: uml.cpp:352
-#, c-format
-msgid "&200%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
+#: rc.cpp:84
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: uml.cpp:353
-#, c-format
-msgid "3&00%"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
+#: rc.cpp:87
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: uml.cpp:394
-msgid "Diagram Toolbar"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
+#: rc.cpp:93
+#, no-c-format
+msgid "Class name"
 msgstr ""
 
-#: uml.cpp:398
-msgid "Alignment Toolbar"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
+#: rc.cpp:99
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
+#: rc.cpp:102
+#, no-c-format
+msgid "Project Generation"
 msgstr ""
 
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
+#: rc.cpp:105
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
+#: rc.cpp:108 rc.cpp:165
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
+#: rc.cpp:111 rc.cpp:168
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
+#: rc.cpp:114 rc.cpp:171
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
+#: rc.cpp:117 rc.cpp:174
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
+#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
+#, no-c-format
+msgid "Public"
 msgstr ""
 
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
 msgstr ""
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
 msgstr ""
 
-#: uml.cpp:458
-msgid "&Tree View"
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
+#: rc.cpp:129 rc.cpp:186
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: uml.cpp:467
-msgid "&Documentation"
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
+#: rc.cpp:132 rc.cpp:189
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
+#: rc.cpp:135 rc.cpp:192
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: uml.cpp:650
-msgid "Creating new document..."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
+#: rc.cpp:147 rc.cpp:204
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: uml.cpp:673
-msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
+#: rc.cpp:162
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: uml.cpp:677
-msgid "Open File"
+#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
+#: rc.cpp:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: uml.cpp:716
-msgid "Saving file..."
+#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
+#: rc.cpp:216
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
+#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
+#: rc.cpp:219
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: uml.cpp:732
-msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
 msgstr ""
 
-#: uml.cpp:740
-msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
+#: rc.cpp:228
+#, no-c-format
+msgid "Language"
 msgstr ""
 
-#: uml.cpp:740
-msgid "Overwrite"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
+#: rc.cpp:231
+#, no-c-format
+msgid "Folders"
 msgstr ""
 
-#: uml.cpp:764
-msgid "Closing file..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
+#: rc.cpp:234
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: uml.cpp:772
-msgid "Printing..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
+#: rc.cpp:237
+#, no-c-format
+msgid "Bro&wse..."
 msgstr ""
 
-#: uml.cpp:779
-#, c-format
-msgid "Print %1"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
+#: rc.cpp:240
+#, no-c-format
+msgid "B&rowse..."
 msgstr ""
 
-#: uml.cpp:787
-msgid "Exiting..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
+#: rc.cpp:243
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: uml.cpp:823
-msgid "Cutting selection..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
+#: rc.cpp:246
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
+#: rc.cpp:249
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
+#: rc.cpp:252
+#, no-c-format
+msgid "Overwrite Policy"
 msgstr ""
 
-#: uml.cpp:849
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
+#: rc.cpp:255
+#, no-c-format
 msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
-msgstr ""
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
 msgstr ""
 
-#: uml.cpp:863
-msgid "Toggling toolbar..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
+#: rc.cpp:259
+#, no-c-format
+msgid "O&verwrite"
 msgstr ""
 
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
+#: rc.cpp:262
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
+#: rc.cpp:265
+#, no-c-format
+msgid "As&k"
 msgstr ""
 
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
+#: rc.cpp:268
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
+#: rc.cpp:271
+#, no-c-format
+msgid "&Use a different name"
 msgstr ""
 
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
+#: rc.cpp:274
+#, no-c-format
+msgid ""
+"If a file already exists in the destination folder, select a different name to "
+"use by adding a suffix to the file name"
 msgstr ""
 
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
+#: rc.cpp:277
+#, no-c-format
+msgid "Formatting"
 msgstr ""
 
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
+#: rc.cpp:280
+#, no-c-format
+msgid "Lines"
 msgstr ""
 
-#: uml.cpp:1393
-msgid "*.pas|Pascal Files (*.pas)"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
+#: rc.cpp:283
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
+#: rc.cpp:286
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
+#: rc.cpp:289
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: uml.cpp:1399
-msgid "All Files"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
+#: rc.cpp:292
+#, no-c-format
+msgid ""
+"*NIX (\"\\n\")"
 msgstr ""
 
-#: uml.cpp:1401
-msgid "Select Code to Import"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
+#: rc.cpp:295
+#, no-c-format
+msgid ""
+"Windows (\"\\r\\n\")"
 msgstr ""
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
+#: rc.cpp:298
+#, no-c-format
+msgid "Mac (\"\\r\")"
 msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
+#: rc.cpp:301
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
+#: rc.cpp:304
+#, no-c-format
+msgid "Tab"
 msgstr ""
 
-#: object_factory.cpp:164
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
+#: rc.cpp:307
+#, no-c-format
+msgid "Space"
 msgstr ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
+#: rc.cpp:310
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
+#: rc.cpp:313
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
+#: rc.cpp:317
+#, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in a "
+"class, even if the sections are empty"
 msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
+#: rc.cpp:320
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
+#: rc.cpp:323
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
+#: rc.cpp:326
+#, no-c-format
+msgid "Language Options"
 msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 16
+#: rc.cpp:329
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 23
+#: rc.cpp:332
+#, no-c-format
+msgid "Select Classes"
 msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 41
+#: rc.cpp:335
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: worktoolbar.cpp:251
-msgid "Label"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 78
+#: rc.cpp:339
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 101
+#: rc.cpp:342
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 136
+#: rc.cpp:345
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 159
+#: rc.cpp:348
+#, no-c-format
+msgid "Classes Available"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 209
+#: rc.cpp:351
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 226
+#: rc.cpp:354
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 234
+#: rc.cpp:357 rc.cpp:363
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
 msgstr ""
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 43
+#: rc.cpp:369
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 59
+#: rc.cpp:372
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 86
+#: rc.cpp:378
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 45
+#: rc.cpp:381
+#, no-c-format
+msgid "Colors"
 msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 72
+#: rc.cpp:384
+#, no-c-format
+msgid "Font:"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 103
+#: rc.cpp:387
+#, no-c-format
+msgid "Paper:"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 134
+#: rc.cpp:390
+#, no-c-format
+msgid "Selected:"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 260
+#: rc.cpp:393
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 276
+#: rc.cpp:396
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 294
+#: rc.cpp:399
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#. i18n: file dialogs/codevieweroptionsbase.ui line 333
+#: rc.cpp:402
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
+#. i18n: file dialogs/diagrampropertiespage.ui line 30
+#: rc.cpp:405
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
 msgstr ""
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#. i18n: file dialogs/diagrampropertiespage.ui line 92
+#: rc.cpp:411
+#, no-c-format
+msgid "Zoom:"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#. i18n: file dialogs/diagrampropertiespage.ui line 119
+#: rc.cpp:414
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#. i18n: file dialogs/diagrampropertiespage.ui line 146
+#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#, no-c-format
+msgid "Show operation signature"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#. i18n: file dialogs/diagrampropertiespage.ui line 186
+#: rc.cpp:420
+#, no-c-format
+msgid "Show &grid"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
+#. i18n: file dialogs/diagrampropertiespage.ui line 194
+#: rc.cpp:423
+#, no-c-format
+msgid "Snap &to grid"
 msgstr ""
 
-#: worktoolbar.cpp:278
-msgid "Fork"
+#. i18n: file dialogs/diagrampropertiespage.ui line 202
+#: rc.cpp:426
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#. i18n: file dialogs/diagrampropertiespage.ui line 206
+#: rc.cpp:429
+#, no-c-format
+msgid ""
+"Snap the size of the components to be a multiple of the grid spacing.\n"
+"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
+"on all 4 sides."
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#. i18n: file dialogs/diagrampropertiespage.ui line 257
+#: rc.cpp:433
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#. i18n: file dialogs/diagrampropertiespage.ui line 265
+#: rc.cpp:436
+#, no-c-format
+msgid "X"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
+#. i18n: file dialogs/diagrampropertiespage.ui line 284
+#: rc.cpp:439
+#, no-c-format
+msgid "Y"
 msgstr ""
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
+#. i18n: file dialogs/diagrampropertiespage.ui line 346
+#: rc.cpp:442
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
+#: rc.cpp:448
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
+#: rc.cpp:451
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
+#: rc.cpp:454 rc.cpp:457
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
+#: rc.cpp:460
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
+#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
+#: rc.cpp:466
+#, no-c-format
+msgid "Use &folders"
 msgstr ""
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
+#: rc.cpp:469
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
+#: rc.cpp:473
+#, no-c-format
+msgid ""
+"The views are stored in folders in the document. The same tree structure used "
+"in the document to store the views can be created in the selected base "
+"directory with this option.\n"
+"Only the folders made by the user are created in the base directory (Logical "
+"view, use case view and so on aren't created)."
 msgstr ""
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
 msgstr ""
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
+#: rc.cpp:495
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
 msgstr ""
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-msgid "File to transform"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
+#: rc.cpp:507
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, no-c-format
+msgid "Implementation"
 msgstr ""
 
-#: docgenerators/main.cpp:64
+#: tips.txt:3
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr ""
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
 msgstr ""
 
-#: umlviewimageexporter.cpp:50
+#: tips.txt:9
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
 msgstr ""
 
-#: umlviewimageexporter.cpp:66
+#: tips.txt:14
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
 msgstr ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
+#: tips.txt:19
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
+#: tips.txt:25
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
 
-#: clipboard/umlclipboard.cpp:687
+#: tips.txt:30
 msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: tips.txt:37
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: tips.txt:43
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: tips.txt:48
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: tips.txt:53
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: tips.txt:60
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: tips.txt:66
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:229
+#: tips.txt:76
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
 msgstr ""
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
 
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
+#: tips.txt:91
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: tips.txt:97
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: tips.txt:108
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: listpopupmenu.cpp:231 listpopupmenu.cpp:486
+msgid "Change Font..."
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: listpopupmenu.cpp:233
+msgid "Delete Selected Items"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: listpopupmenu.cpp:240 listpopupmenu.cpp:718
+msgid "Draw as Circle"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: listpopupmenu.cpp:243 listpopupmenu.cpp:720
+msgid "Change into Class"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: listpopupmenu.cpp:247 listpopupmenu.cpp:726
+msgid "Change into Interface"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: listpopupmenu.cpp:281 listpopupmenu.cpp:1155
+msgid "Enum Literal..."
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: listpopupmenu.cpp:292 listpopupmenu.cpp:1143
+msgid "Entity Attribute..."
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: listpopupmenu.cpp:318
+msgid "Move Up"
 msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: listpopupmenu.cpp:319
+msgid "Move Down"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: listpopupmenu.cpp:325
+msgid "Rename Class..."
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: listpopupmenu.cpp:326
+msgid "Rename Object..."
 msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: listpopupmenu.cpp:334 listpopupmenu.cpp:423 listpopupmenu.cpp:564
+msgid "New Operation..."
 msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: listpopupmenu.cpp:335 listpopupmenu.cpp:424 listpopupmenu.cpp:1302
+msgid "Select Operation..."
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: listpopupmenu.cpp:346 listpopupmenu.cpp:430
+msgid "Change Text..."
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
+#: listpopupmenu.cpp:360 listpopupmenu.cpp:579 listpopupmenu.cpp:1043
+msgid "Activity..."
 msgstr ""
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
+#: listpopupmenu.cpp:366
+msgid "Change State Name..."
 msgstr ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: listpopupmenu.cpp:376
+msgid "FlipQt::Horizontal"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: listpopupmenu.cpp:378
+msgid "FlipQt::Vertical"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: listpopupmenu.cpp:388
+msgid "Change Activity Name..."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
+#: listpopupmenu.cpp:397 listpopupmenu.cpp:400 listpopupmenu.cpp:1268
+#: listpopupmenu.cpp:1272
+msgid "Change Multiplicity..."
 msgstr ""
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: listpopupmenu.cpp:403 listpopupmenu.cpp:1276
+msgid "Change Name"
 msgstr ""
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+#: listpopupmenu.cpp:406 listpopupmenu.cpp:1260 listpopupmenu.cpp:1282
+msgid "Change Role A Name..."
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
+#: listpopupmenu.cpp:409 listpopupmenu.cpp:1264 listpopupmenu.cpp:1283
+msgid "Change Role B Name..."
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
+#: listpopupmenu.cpp:461
+msgid "New"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
+#: listpopupmenu.cpp:471 listpopupmenu.cpp:1306
+msgid "Rename..."
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
+#: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
+msgid "Line Color..."
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
+#: listpopupmenu.cpp:492
+msgid "Expand All"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
+#: listpopupmenu.cpp:495
+msgid "Collapse All"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
+#: listpopupmenu.cpp:498
+msgid "Duplicate"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
+#: listpopupmenu.cpp:501
+msgid "Externalize Folder..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
+#: listpopupmenu.cpp:504
+msgid "Internalize Folder"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
+#: listpopupmenu.cpp:507
+msgid "Import Classes..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: listpopupmenu.cpp:512
+msgid "Subsystem"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
 msgstr ""
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
+#: listpopupmenu.cpp:535 listpopupmenu.cpp:608
+msgid "Folder"
 msgstr ""
 
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
+#: listpopupmenu.cpp:555
+msgid "Text Line..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
+#: listpopupmenu.cpp:558
+msgid "Reset Label Positions"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: listpopupmenu.cpp:561
+msgid "New Parameter..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: listpopupmenu.cpp:567
+msgid "New Attribute..."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
+#: listpopupmenu.cpp:570 listpopupmenu.cpp:1232
+msgid "New Template..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: listpopupmenu.cpp:573
+msgid "New Literal..."
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: listpopupmenu.cpp:576
+msgid "New Entity Attribute..."
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
+#: listpopupmenu.cpp:582
+msgid "Export as Picture..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: listpopupmenu.cpp:676
+msgid "Public Only"
 msgstr ""
 
 #: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
@@ -1544,2193 +1765,1929 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
+#: listpopupmenu.cpp:680
+msgid "Operation Signature"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
+#: listpopupmenu.cpp:686
+msgid "Attribute Signature"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
+#: listpopupmenu.cpp:707
+msgid "Attribute..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
+#: listpopupmenu.cpp:708
+msgid "Operation..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: listpopupmenu.cpp:722
+msgid "Refactor"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: listpopupmenu.cpp:723
+msgid "View Code"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: listpopupmenu.cpp:735 listpopupmenu.cpp:746
+msgid "Fill Color..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: listpopupmenu.cpp:736 listpopupmenu.cpp:747
+msgid "Use Fill Color"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
+#: listpopupmenu.cpp:1007
+msgid "Actor..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
+#: listpopupmenu.cpp:1008
+msgid "Use Case..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
+#: listpopupmenu.cpp:1017
+msgid "Class..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: listpopupmenu.cpp:1018
+msgid "Interface..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: listpopupmenu.cpp:1019
+msgid "Datatype..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
+#: listpopupmenu.cpp:1020
+msgid "Enum..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
+#: listpopupmenu.cpp:1021
+msgid "Package..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
+#: listpopupmenu.cpp:1032
+msgid "State..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: listpopupmenu.cpp:1053
+msgid "Subsystem..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
+#: listpopupmenu.cpp:1054
+msgid "Component..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
+#: listpopupmenu.cpp:1055
+msgid "Artifact..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: listpopupmenu.cpp:1063
+msgid "Node..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: listpopupmenu.cpp:1071
+msgid "Entity..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: listpopupmenu.cpp:1080
+msgid "Object..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
+#: listpopupmenu.cpp:1089
+msgid "Attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: listpopupmenu.cpp:1090 listpopupmenu.cpp:1099
+msgid "Operation"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
+#: listpopupmenu.cpp:1091 listpopupmenu.cpp:1100
+msgid "Template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: listpopupmenu.cpp:1256
+msgid "Delete Anchor"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: listpopupmenu.cpp:1281
+msgid "Change Association Name..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
+#: listpopupmenu.cpp:1339
+msgid "Clear Diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: listpopupmenu.cpp:1342
+msgid "Snap to Grid"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
+#: listpopupmenu.cpp:1344
+msgid "Show Grid"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
+#: main.cpp:40
+msgid "File to open"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
+#: main.cpp:42
+msgid "the directory of the file"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: main.cpp:95
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: _translatorinfo.cpp:1
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: umlwidgetcontroller.cpp:128
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
+#: umlwidgetcontroller.cpp:379
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
-msgid ""
-"<qt>"
-"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
-"before you have manually saved the file.</p>"
-"<p>If you've already saved it, the autosave file will be saved in the same "
-"folder as the file and will be named like the file's name, followed by the "
-"suffix specified.</p>"
-"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
-"will overwrite your file automatically.</p></qt>"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: objectwidget.cpp:90
+msgid "Rename Object"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
+#: objectwidget.cpp:91
+msgid "Enter object name:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: operation.cpp:185
+msgid "new_parameter"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
+#: uml.cpp:179
+msgid "&Export model to DocBook"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: uml.cpp:182
+msgid "&Export model to XHTML"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: uml.cpp:186
+msgid "&New Class Wizard..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: uml.cpp:195
+msgid "&Generate All Code"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#: uml.cpp:198
+msgid "&Import Classes..."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
+#: uml.cpp:201
+msgid "Creates a new document"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: uml.cpp:202
+msgid "Opens an existing document"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
+#: uml.cpp:203
+msgid "Opens a recently used file"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: uml.cpp:204
+msgid "Saves the document"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: uml.cpp:205
+msgid "Saves the document as..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: uml.cpp:206
+msgid "Closes the document"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: uml.cpp:207
+msgid "Prints out the document"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: uml.cpp:208
+msgid "Quits the application"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
+#: uml.cpp:209
+msgid "Exports the model to the docbook format"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
+#: uml.cpp:210
+msgid "Exports the model to the XHTML format"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: uml.cpp:211
+msgid "Cuts the selected section and puts it to the clipboard"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: uml.cpp:214
+msgid "Set the default program preferences"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+#: uml.cpp:216
+msgid "Delete &Selected"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+#: uml.cpp:224
+msgid "&Class Diagram..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
+#: uml.cpp:228
+msgid "&Autolayout..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+#: uml.cpp:240
+msgid "S&tate Diagram..."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:31
-msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+#: uml.cpp:243
+msgid "&Activity Diagram..."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
+#: uml.cpp:258
+msgid "&Clear Diagram"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: uml.cpp:260
+msgid "&Snap to Grid"
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: uml.cpp:262
+msgid "S&how Grid"
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: uml.cpp:265
+msgid "&Hide Grid"
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
+#: uml.cpp:269
+msgid "&Export as Picture..."
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: uml.cpp:271
+msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: uml.cpp:286
+msgid "&Zoom Slider"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: uml.cpp:295
+msgid "&Move Tab Left"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: uml.cpp:296
+msgid "&Move Tab Right"
 msgstr ""
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: uml.cpp:308
+msgid "Select Diagram on Left"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
+#: uml.cpp:309
+msgid "Select Diagram on Right"
 msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
+#: uml.cpp:327
+msgid "&Windows"
 msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
 msgstr ""
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
 msgstr ""
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: uml.cpp:352
+#, c-format
+msgid "&200%"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: uml.cpp:353
+#, c-format
+msgid "3&00%"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
+#: uml.cpp:394
+msgid "Diagram Toolbar"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
+#: uml.cpp:398
+msgid "Alignment Toolbar"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
+#: uml.cpp:458
+msgid "&Tree View"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
+#: uml.cpp:467
+msgid "&Documentation"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
+#: uml.cpp:650
+msgid "Creating new document..."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: uml.cpp:673
+msgid ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: uml.cpp:677
+msgid "Open File"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: uml.cpp:716
+msgid "Saving file..."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: uml.cpp:732
+msgid ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: uml.cpp:740
+msgid "Overwrite"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: uml.cpp:764
+msgid "Closing file..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: uml.cpp:772
+msgid "Printing..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
+#: uml.cpp:787
+msgid "Exiting..."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
+#: uml.cpp:823
+msgid "Cutting selection..."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
+#: uml.cpp:849
+msgid ""
+"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
+#: uml.cpp:863
+msgid "Toggling toolbar..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
+#: uml.cpp:1393
+msgid "*.pas|Pascal Files (*.pas)"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
+#: uml.cpp:1399
+msgid "All Files"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
+#: uml.cpp:1401
+msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:138
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr ""
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr ""
-
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr ""
-
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
 msgstr ""
 
-#: objectwidget.cpp:90
-msgid "Rename Object"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
 msgstr ""
 
-#: objectwidget.cpp:91
-msgid "Enter object name:"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, no-c-format
-msgid "Slash-Slash (//)"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/umlentityattributedialog.cpp:192
+msgid ""
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
-msgid ""
-"Files in this folder will be used as heading files in the generated code"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
-msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
-#, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, no-c-format
+#: dialogs/settingsdlg.cpp:148
 msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
-msgstr ""
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr ""
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr ""
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr ""
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr ""
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+"<qt>"
+"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
+"before you have manually saved the file.</p>"
+"<p>If you've already saved it, the autosave file will be saved in the same "
+"folder as the file and will be named like the file's name, followed by the "
+"suffix specified.</p>"
+"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
+"will overwrite your file automatically.</p></qt>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
+#: dialogs/umloperationdialog.cpp:339
+msgid ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"Snap the size of the components to be a multiple of the grid spacing.\n"
-"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
-"on all 4 sides."
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
-#: rc.cpp:454 rc.cpp:457
-#, no-c-format
-msgid "The base directory used to save the images"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
-msgid ""
-"The views are stored in folders in the document. The same tree structure used "
-"in the document to store the views can be created in the selected base "
-"directory with this option.\n"
-"Only the folders made by the user are created in the base directory (Logical "
-"view, use case view and so on aren't created)."
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
 msgstr ""
 
-#: listpopupmenu.cpp:231 listpopupmenu.cpp:486
-msgid "Change Font..."
+#: dialogs/umlattributedialog.cpp:163
+msgid ""
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#: listpopupmenu.cpp:233
-msgid "Delete Selected Items"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#: listpopupmenu.cpp:240 listpopupmenu.cpp:718
-msgid "Draw as Circle"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#: listpopupmenu.cpp:243 listpopupmenu.cpp:720
-msgid "Change into Class"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#: listpopupmenu.cpp:247 listpopupmenu.cpp:726
-msgid "Change into Interface"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#: listpopupmenu.cpp:281 listpopupmenu.cpp:1155
-msgid "Enum Literal..."
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 msgstr ""
 
-#: listpopupmenu.cpp:292 listpopupmenu.cpp:1143
-msgid "Entity Attribute..."
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#: listpopupmenu.cpp:318
-msgid "Move Up"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
 msgstr ""
 
-#: listpopupmenu.cpp:319
-msgid "Move Down"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 msgstr ""
 
-#: listpopupmenu.cpp:325
-msgid "Rename Class..."
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#: listpopupmenu.cpp:326
-msgid "Rename Object..."
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#: listpopupmenu.cpp:334 listpopupmenu.cpp:423 listpopupmenu.cpp:564
-msgid "New Operation..."
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#: listpopupmenu.cpp:335 listpopupmenu.cpp:424 listpopupmenu.cpp:1302
-msgid "Select Operation..."
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
 msgstr ""
 
-#: listpopupmenu.cpp:346 listpopupmenu.cpp:430
-msgid "Change Text..."
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#: listpopupmenu.cpp:360 listpopupmenu.cpp:579 listpopupmenu.cpp:1043
-msgid "Activity..."
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#: listpopupmenu.cpp:366
-msgid "Change State Name..."
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#: listpopupmenu.cpp:376
-msgid "FlipQt::Horizontal"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#: listpopupmenu.cpp:378
-msgid "FlipQt::Vertical"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
 msgstr ""
 
-#: listpopupmenu.cpp:388
-msgid "Change Activity Name..."
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#: listpopupmenu.cpp:397 listpopupmenu.cpp:400 listpopupmenu.cpp:1268
-#: listpopupmenu.cpp:1272
-msgid "Change Multiplicity..."
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
 msgstr ""
 
-#: listpopupmenu.cpp:403 listpopupmenu.cpp:1276
-msgid "Change Name"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
 msgstr ""
 
-#: listpopupmenu.cpp:406 listpopupmenu.cpp:1260 listpopupmenu.cpp:1282
-msgid "Change Role A Name..."
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#: listpopupmenu.cpp:409 listpopupmenu.cpp:1264 listpopupmenu.cpp:1283
-msgid "Change Role B Name..."
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#: listpopupmenu.cpp:461
-msgid "New"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#: listpopupmenu.cpp:471 listpopupmenu.cpp:1306
-msgid "Rename..."
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
-msgid "Line Color..."
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#: listpopupmenu.cpp:492
-msgid "Expand All"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
 msgstr ""
 
-#: listpopupmenu.cpp:495
-msgid "Collapse All"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 msgstr ""
 
-#: listpopupmenu.cpp:498
-msgid "Duplicate"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 msgstr ""
 
-#: listpopupmenu.cpp:501
-msgid "Externalize Folder..."
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
 msgstr ""
 
-#: listpopupmenu.cpp:504
-msgid "Internalize Folder"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
 msgstr ""
 
-#: listpopupmenu.cpp:507
-msgid "Import Classes..."
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#: listpopupmenu.cpp:512
-msgid "Subsystem"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 msgstr ""
 
-#: listpopupmenu.cpp:535 listpopupmenu.cpp:608
-msgid "Folder"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
 msgstr ""
 
-#: listpopupmenu.cpp:555
-msgid "Text Line..."
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
 msgstr ""
 
-#: listpopupmenu.cpp:558
-msgid "Reset Label Positions"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
 msgstr ""
 
-#: listpopupmenu.cpp:561
-msgid "New Parameter..."
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
 msgstr ""
 
-#: listpopupmenu.cpp:567
-msgid "New Attribute..."
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
 msgstr ""
 
-#: listpopupmenu.cpp:570 listpopupmenu.cpp:1232
-msgid "New Template..."
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
 msgstr ""
 
-#: listpopupmenu.cpp:573
-msgid "New Literal..."
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#: listpopupmenu.cpp:576
-msgid "New Entity Attribute..."
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
 msgstr ""
 
-#: listpopupmenu.cpp:582
-msgid "Export as Picture..."
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
 msgstr ""
 
-#: listpopupmenu.cpp:676
-msgid "Public Only"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
 msgstr ""
 
-#: listpopupmenu.cpp:680
-msgid "Operation Signature"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:686
-msgid "Attribute Signature"
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
 
-#: listpopupmenu.cpp:707
-msgid "Attribute..."
+#: dialogs/parmpropdlg.cpp:84
+msgid ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
+"is a parameter for reading and writing."
 msgstr ""
 
-#: listpopupmenu.cpp:708
-msgid "Operation..."
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
 msgstr ""
 
-#: listpopupmenu.cpp:722
-msgid "Refactor"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
 msgstr ""
 
-#: listpopupmenu.cpp:723
-msgid "View Code"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#: listpopupmenu.cpp:735 listpopupmenu.cpp:746
-msgid "Fill Color..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#: listpopupmenu.cpp:736 listpopupmenu.cpp:747
-msgid "Use Fill Color"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#: listpopupmenu.cpp:1007
-msgid "Actor..."
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
 
-#: listpopupmenu.cpp:1008
-msgid "Use Case..."
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 msgstr ""
 
-#: listpopupmenu.cpp:1017
-msgid "Class..."
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
 msgstr ""
 
-#: listpopupmenu.cpp:1018
-msgid "Interface..."
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#: listpopupmenu.cpp:1019
-msgid "Datatype..."
+#: dialogs/codegenerationwizard.cpp:168
+msgid ""
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
 
-#: listpopupmenu.cpp:1020
-msgid "Enum..."
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
 msgstr ""
 
-#: listpopupmenu.cpp:1021
-msgid "Package..."
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#: listpopupmenu.cpp:1032
-msgid "State..."
+#: dialogs/codegenerationwizard.cpp:184
+msgid ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#: listpopupmenu.cpp:1053
-msgid "Subsystem..."
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#: listpopupmenu.cpp:1054
-msgid "Component..."
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#: listpopupmenu.cpp:1055
-msgid "Artifact..."
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#: listpopupmenu.cpp:1063
-msgid "Node..."
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
 msgstr ""
 
-#: listpopupmenu.cpp:1071
-msgid "Entity..."
+#: dialogs/overwritedialogue.cpp:31
+msgid ""
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
 
-#: listpopupmenu.cpp:1080
-msgid "Object..."
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#: listpopupmenu.cpp:1089
-msgid "Attribute"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
 msgstr ""
 
-#: listpopupmenu.cpp:1090 listpopupmenu.cpp:1099
-msgid "Operation"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#: listpopupmenu.cpp:1091 listpopupmenu.cpp:1100
-msgid "Template"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#: listpopupmenu.cpp:1256
-msgid "Delete Anchor"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#: listpopupmenu.cpp:1281
-msgid "Change Association Name..."
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
 msgstr ""
 
-#: listpopupmenu.cpp:1339
-msgid "Clear Diagram"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: listpopupmenu.cpp:1342
-msgid "Snap to Grid"
+#: associationwidget.cpp:2346
+msgid "Association Name"
 msgstr ""
 
-#: listpopupmenu.cpp:1344
-msgid "Show Grid"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
 msgstr ""
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
+#: associationwidget.cpp:2366
+msgid "Role Name"
 msgstr ""
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
 msgstr ""
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
 msgstr ""
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
 msgstr ""
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
 msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
 msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
+#: aligntoolbar.cpp:44
+msgid "AlignQt::Vertical Middle"
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
+#: aligntoolbar.cpp:45
+msgid "AlignQt::Horizontal Middle"
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
+#: aligntoolbar.cpp:46
+msgid "AlignQt::Vertical Distribute"
 msgstr ""
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
+#: aligntoolbar.cpp:47
+msgid "AlignQt::Horizontal Distribute"
 msgstr ""
 
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
 msgstr ""
 
-#: main.cpp:40
-msgid "File to open"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
 
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
 msgstr ""
 
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
 msgstr ""
 
-#: main.cpp:42
-msgid "the directory of the file"
+#: umlviewimageexporter.cpp:50
+msgid ""
+"An error happened when exporting the image:\n"
 msgstr ""
 
-#: main.cpp:43
+#: umlviewimageexporter.cpp:66
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
 msgstr ""
 
 #: model_utils.cpp:244
@@ -3805,10 +3762,53 @@ msgstr ""
 msgid "Unspecified error"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr ""
+
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr ""
+
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr ""
+
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
author	Automated System <kb9vqf@pearsoncomputing.net>	2014-09-29 12:26:02 -0500
committer	Automated System <kb9vqf@pearsoncomputing.net>	2014-09-29 12:26:02 -0500
commit	ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c (patch)
tree	bf4fc5ad5f5d27517ae17ce5d396e492aafde6eb /tde-i18n-is/messages/tdesdk
parent	dde6a6f118e2358c2aace236dd18d5bca405381c (diff)
download	tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.tar.gz tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.zip