Update translation template.

2 files changed, 231 insertions, 290 deletions

diff --git a/template/messages/tdevelop/tdevelop.pot b/template/messages/tdevelop/tdevelop.pot
index d34fdac16e5..0391dfef391 100644
--- a/template/messages/tdevelop/tdevelop.pot
+++ b/template/messages/tdevelop/tdevelop.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-11-29 19:44+0100\n"
+"POT-Creation-Date: 2021-07-07 18:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -238,11 +238,9 @@ msgstr ""
 #: buildtools/autotools/addprefixdlg.cpp:29
 #: buildtools/autotools/addservicedlgbase.ui:175
 #: buildtools/lib/widgets/addenvvardlg.cpp:36
-#: kdevdesigner/designer/dbconnection.ui:132
-#: languages/ada/addclassdlg.ui:88
+#: kdevdesigner/designer/dbconnection.ui:132 languages/ada/addclassdlg.ui:88
 #: languages/cpp/cppnewclassdlgbase.ui:181
-#: parts/documentation/editbookmarkdlg.ui:32
-#: parts/snippet/snippetdlg.ui:106
+#: parts/documentation/editbookmarkdlg.ui:32 parts/snippet/snippetdlg.ui:106
 #: src/profileengine/editor/addprofilewidget.ui:41
 #, no-c-format
 msgid "&Name:"
@@ -586,9 +584,9 @@ msgstr ""
 #: buildtools/qmake/trollprojectpart.cpp:107
 #: buildtools/qmake/trollprojectwidget.cpp:125
 msgid ""
-"<b>Build project</b><p>Runs <b>make</b> from the project "
-"directory.<br>Environment variables and make arguments can be specified in "
-"the project settings dialog, <b>Make Options</b> tab."
+"<b>Build project</b><p>Runs <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
 #: buildtools/autotools/autoprojectpart.cpp:113
@@ -653,9 +651,8 @@ msgstr ""
 
 #: buildtools/autotools/autoprojectpart.cpp:145
 msgid ""
-"<b>Run automake && friends</b><p>Executes<br><b>make -f "
-"Makefile.cvs</b><br><b>./configure</b><br>commands from the project "
-"directory."
+"<b>Run automake && friends</b><p>Executes<br><b>make -f Makefile.cvs</"
+"b><br><b>./configure</b><br>commands from the project directory."
 msgstr ""
 
 #: buildtools/autotools/autoprojectpart.cpp:148
@@ -681,9 +678,9 @@ msgstr ""
 #: buildtools/autotools/autoprojectpart.cpp:159
 #: buildtools/custommakefiles/customprojectpart.cpp:111
 msgid ""
-"<b>Install</b><p>Runs <b>make install</b> command from the project "
-"directory.<br>Environment variables and make arguments can be specified in "
-"the project settings dialog, <b>Make Options</b> tab."
+"<b>Install</b><p>Runs <b>make install</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
 #: buildtools/autotools/autoprojectpart.cpp:164
@@ -768,8 +765,8 @@ msgstr ""
 msgid ""
 "<b>Build configuration menu</b><p>Allows to switch between project build "
 "configurations.<br>Build configuration is a set of build and top source "
-"directory settings, configure flags and arguments, compiler flags, "
-"etc.<br>Modify build configurations in project settings dialog, <b>Configure "
+"directory settings, configure flags and arguments, compiler flags, etc."
+"<br>Modify build configurations in project settings dialog, <b>Configure "
 "Options</b> tab."
 msgstr ""
 
@@ -1206,8 +1203,8 @@ msgstr ""
 #: buildtools/autotools/managecustomcommand.cpp:46
 msgid ""
 "_: this is a list of items in the combobox\n"
-"Make target,Make target (as root),Make command,Make command (as "
-"root),Command,Command (as root)"
+"Make target,Make target (as root),Make command,Make command (as root),"
+"Command,Command (as root)"
 msgstr ""
 
 #: buildtools/autotools/removefiledlg.cpp:65
@@ -1313,9 +1310,9 @@ msgstr ""
 
 #: buildtools/custommakefiles/customprojectpart.cpp:87
 msgid ""
-"<b>Build project</b><p>Runs <b>make</b> from the project "
-"directory.<br>Environment variables and make arguments can be specified in "
-"the project settings dialog, <b>Build Options</b> tab."
+"<b>Build project</b><p>Runs <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Build Options</b> tab."
 msgstr ""
 
 #: buildtools/custommakefiles/customprojectpart.cpp:91
@@ -1443,9 +1440,9 @@ msgstr ""
 
 #: buildtools/custommakefiles/customprojectpart.cpp:271
 msgid ""
-"<b>Add to blacklist</b><p>Adds the given file or directory to the "
-"blacklist.<br>The blacklist contains files and directories that should be "
-"ignored even if they match a project filetype pattern"
+"<b>Add to blacklist</b><p>Adds the given file or directory to the blacklist."
+"<br>The blacklist contains files and directories that should be ignored even "
+"if they match a project filetype pattern"
 msgstr ""
 
 #: buildtools/custommakefiles/customprojectpart.cpp:319
@@ -1580,8 +1577,8 @@ msgstr ""
 
 #: buildtools/qmake/createscopedlg.cpp:91
 msgid ""
-"You did not specify all needed information. The scope will not be "
-"created.<br>Do you want to abort the scope creation?"
+"You did not specify all needed information. The scope will not be created."
+"<br>Do you want to abort the scope creation?"
 msgstr ""
 
 #: buildtools/qmake/createscopedlg.cpp:93
@@ -1779,9 +1776,9 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:123
 msgid ""
-"<b>Install project</b><p>Runs <b>make install</b> from the project "
-"directory.<br>Environment variables and make arguments can be specified in "
-"the project settings dialog, <b>Make Options</b> tab."
+"<b>Install project</b><p>Runs <b>make install</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:135
@@ -1813,8 +1810,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectpart.cpp:147
 msgid ""
 "<b>Execute program</b><p>Executes the currently selected subproject if it is "
-"an application or the program specified in project settings, <b>Run "
-"Options</b> tab."
+"an application or the program specified in project settings, <b>Run Options</"
+"b> tab."
 msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:149
@@ -1830,9 +1827,9 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:241
 msgid ""
 "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject "
-"directory. Current subproject is a subproject selected in <b>TQMake "
-"manager</b> 'overview' window.<br>Environment variables and make arguments "
-"can be specified in the project settings dialog, <b>Make Options</b> tab."
+"directory. Current subproject is a subproject selected in <b>TQMake manager</"
+"b> 'overview' window.<br>Environment variables and make arguments can be "
+"specified in the project settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:158
@@ -1884,8 +1881,8 @@ msgid ""
 "<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject "
 "directory. The current subproject is the subproject selected in the "
 "<b>TQMake manager</b> 'overview' window.<br>Environment variables and make "
-"arguments can be specified in the project settings dialog, <b>Make "
-"Options</b> tab."
+"arguments can be specified in the project settings dialog, <b>Make Options</"
+"b> tab."
 msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:185
@@ -2031,10 +2028,10 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:154
 msgid ""
 "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> "
-"dialog for the currently selected subproject. It provides settings "
-"for:<br>subproject type and configuration,<br>include and library "
-"paths,<br>lists of dependencies and external libraries,<br>build "
-"order,<br>intermediate files locations,<br>compiler options."
+"dialog for the currently selected subproject. It provides settings for:"
+"<br>subproject type and configuration,<br>include and library paths,"
+"<br>lists of dependencies and external libraries,<br>build order,"
+"<br>intermediate files locations,<br>compiler options."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:204
@@ -2095,8 +2092,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:933
 msgid ""
 "Could not create subproject. This means that either the project you wanted "
-"to add a subproject to is not parsed correctly, or it is not a "
-"subdirs-project."
+"to add a subproject to is not parsed correctly, or it is not a subdirs-"
+"project."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:935
@@ -2114,9 +2111,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:956
 msgid ""
 "Could not delete subproject.\n"
-"This is an internal error, please write a bug report to "
-"bugs.trinitydesktop.org and include the output of tdevelop when runfrom a "
-"shell."
+"This is an internal error, please write a bug report to bugs.trinitydesktop."
+"org and include the output of tdevelop when runfrom a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:958
@@ -2130,9 +2126,9 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:997
 msgid ""
-"<b>Build</b><p>Runs <b>make</b> from the selected subproject "
-"directory.<br>Environment variables and make arguments can be specified in "
-"the project settings dialog, <b>Make Options</b> tab."
+"<b>Build</b><p>Runs <b>make</b> from the selected subproject directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1001
@@ -2216,10 +2212,10 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1039
 msgid ""
 "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> "
-"dialog. It provides settings for:<br>subproject type and "
-"configuration,<br>include and library paths,<br>lists of dependencies and "
-"external libraries,<br>build order,<br>intermediate files "
-"locations,<br>compiler options."
+"dialog. It provides settings for:<br>subproject type and configuration,"
+"<br>include and library paths,<br>lists of dependencies and external "
+"libraries,<br>build order,<br>intermediate files locations,<br>compiler "
+"options."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1046
@@ -2289,8 +2285,8 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1377
 msgid ""
-"Please enter a filepattern relative the current subproject (example "
-"docs/*.html):"
+"Please enter a filepattern relative the current subproject (example docs/*."
+"html):"
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1392
@@ -2482,9 +2478,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:2276
 msgid ""
 "Could not delete Function Scope.\n"
-"This is an internal error, please write a bug report to "
-"bugs.trinitydesktop.org and include the output of tdevelop when run from a "
-"shell."
+"This is an internal error, please write a bug report to bugs.trinitydesktop."
+"org and include the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2276
@@ -2494,9 +2489,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:2284
 msgid ""
 "Could not delete Include Scope.\n"
-"This is an internal error, please write a bug report to "
-"bugs.trinitydesktop.org and include the output of tdevelop when run from a "
-"shell."
+"This is an internal error, please write a bug report to bugs.trinitydesktop."
+"org and include the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2284
@@ -2506,9 +2500,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:2296
 msgid ""
 "Could not delete Scope.\n"
-"This is an internal error, please write a bug report to "
-"bugs.trinitydesktop.org and include the output of tdevelop when run from a "
-"shell."
+"This is an internal error, please write a bug report to bugs.trinitydesktop."
+"org and include the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2296
@@ -3165,8 +3158,7 @@ msgid "Edit connections..."
 msgstr ""
 
 #: kdevdesigner/designer/hierarchyview.cpp:191
-#: languages/cpp/cppnewclassdlgbase.ui:162
-#: parts/classview/classtreebase.cpp:51
+#: languages/cpp/cppnewclassdlgbase.ui:162 parts/classview/classtreebase.cpp:51
 #, no-c-format
 msgid "Class"
 msgstr ""
@@ -3492,10 +3484,10 @@ msgid ""
 "property) can be used to enter new values, open a special dialog, or to "
 "select values from a predefined list. Click <b>F1</b> to get detailed help "
 "for the selected property.</p><p>You can resize the columns of the editor by "
-"dragging the separators in the list's header.</p><p><b>Signal "
-"Handlers</b></p><p>In the Signal Handlers tab you can define connections "
-"between the signals emitted by widgets and the slots in the form. (These "
-"connections can also be made using the connection tool.)"
+"dragging the separators in the list's header.</p><p><b>Signal Handlers</b></"
+"p><p>In the Signal Handlers tab you can define connections between the "
+"signals emitted by widgets and the slots in the form. (These connections can "
+"also be made using the connection tool.)"
 msgstr ""
 
 #: kdevdesigner/designer/mainwindow.cpp:390
@@ -3762,8 +3754,8 @@ msgid ""
 "<b>%1 (custom widget)</b><p>Click <b>Edit Custom Widgets...</b> in the "
 "<b>Tools|Custom</b> menu to add and change custom widgets. You can add "
 "properties as well as signals and slots to integrate them into TQt Designer, "
-"and provide a pixmap which will be used to represent the widget on the "
-"form.</p>"
+"and provide a pixmap which will be used to represent the widget on the form."
+"</p>"
 msgstr ""
 
 #: kdevdesigner/designer/mainwindow.cpp:2844
@@ -4127,8 +4119,7 @@ msgid ""
 msgstr ""
 
 #: kdevdesigner/designer/mainwindowactions.cpp:586
-#: parts/appwizard/appwizarddlg.cpp:575
-#: parts/appwizard/appwizarddlgbase.ui:461
+#: parts/appwizard/appwizarddlg.cpp:575 parts/appwizard/appwizarddlgbase.ui:461
 #, no-c-format
 msgid "Custom"
 msgstr ""
@@ -4437,9 +4428,8 @@ msgstr ""
 
 #: kdevdesigner/designer/kdevdesigner_part.rc:64
 #: kdevdesigner/designer/kdevdesigner_part_sh.rc:72
-#: kdevdesigner/designer/mainwindowactions.cpp:937
-#: src/kdevassistantui.rc:106 src/simplemainwindow.cpp:714
-#: src/tdevelopui.rc:118
+#: kdevdesigner/designer/mainwindowactions.cpp:937 src/kdevassistantui.rc:106
+#: src/simplemainwindow.cpp:714 src/tdevelopui.rc:118
 #, no-c-format
 msgid "&Window"
 msgstr ""
@@ -5970,8 +5960,8 @@ msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:430
 msgid ""
-"<qt>Warn if an undefined identifier is evaluated in an <i>#if</i> "
-"directive</qt>"
+"<qt>Warn if an undefined identifier is evaluated in an <i>#if</i> directive</"
+"qt>"
 msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:432
@@ -6018,8 +6008,8 @@ msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:454
 msgid ""
-"<qt>Warn about functions which might be candidates for attribute "
-"'noreturn'</qt>"
+"<qt>Warn about functions which might be candidates for attribute 'noreturn'</"
+"qt>"
 msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:456
@@ -6099,8 +6089,8 @@ msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:496
 msgid ""
-"<qt>Warn if an <i>extern</i> declaration is encountered within a "
-"function</qt>"
+"<qt>Warn if an <i>extern</i> declaration is encountered within a function</"
+"qt>"
 msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:503
@@ -6651,8 +6641,7 @@ msgstr ""
 msgid "Please select a class."
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:1966
-#: languages/java/javasupportpart.cpp:713
+#: languages/cpp/cppsupportpart.cpp:1966 languages/java/javasupportpart.cpp:713
 msgid ""
 "Persistent class store will be disabled: you have a wrong version of pcs "
 "installed.\n"
@@ -6942,8 +6931,8 @@ msgstr ""
 msgid ""
 "<b>Machine code display</b><p>A machine code view into your running "
 "executable with the current instruction highlighted. You can step "
-"instruction by instruction using the debuggers toolbar buttons of \"step "
-"over\" instruction and \"step into\" instruction."
+"instruction by instruction using the debuggers toolbar buttons of \"step over"
+"\" instruction and \"step into\" instruction."
 msgstr ""
 
 #: languages/cpp/debugger/debuggerpart.cpp:152
@@ -7150,9 +7139,8 @@ msgstr ""
 #: languages/cpp/debugger/debuggerpart.cpp:287
 msgid ""
 "<b>Debugger viewers</b><p>Various information about application being "
-"executed. There are 4 views "
-"available:<br><b>Memory</b><br><b>Disassemble</b><br><b>Registers</b><br><b>L"
-"ibraries</b>"
+"executed. There are 4 views available:<br><b>Memory</b><br><b>Disassemble</"
+"b><br><b>Registers</b><br><b>Libraries</b>"
 msgstr ""
 
 #: languages/cpp/debugger/debuggerpart.cpp:294
@@ -7526,8 +7514,8 @@ msgstr ""
 
 #: languages/cpp/debugger/gdbcontroller.cpp:1157
 msgid ""
-"<b>Application does not exist</b><p>The application you are trying to "
-"debug,<br>    %1\n"
+"<b>Application does not exist</b><p>The application you are trying to debug,"
+"<br>    %1\n"
 "<br>does not exist. Check that you have specified the right application in "
 "the debugger configuration."
 msgstr ""
@@ -7593,9 +7581,9 @@ msgstr ""
 
 #: languages/cpp/debugger/gdboutputwidget.cpp:334
 msgid ""
-"Controls if commands issued internally by KDevelop will be shown or "
-"not.<br>This option will affect only future commands, it will not add or "
-"remove already issued commands from the view."
+"Controls if commands issued internally by KDevelop will be shown or not."
+"<br>This option will affect only future commands, it will not add or remove "
+"already issued commands from the view."
 msgstr ""
 
 #: languages/cpp/debugger/gdboutputwidget.cpp:339
@@ -7850,8 +7838,8 @@ msgstr ""
 msgid ""
 "<b>Problem reporter</b><p>This window shows various \"problems\" in your "
 "project. It displays TODO entries, FIXME's and errors reported by a language "
-"parser. To add a TODO or FIXME entry, just type<br><tt>//@todo my "
-"todo</tt><br><tt>//TODO: my todo</tt><br><tt>//FIXME fix this</tt>"
+"parser. To add a TODO or FIXME entry, just type<br><tt>//@todo my todo</"
+"tt><br><tt>//TODO: my todo</tt><br><tt>//FIXME fix this</tt>"
 msgstr ""
 
 #: languages/cpp/problemreporter.cpp:130 languages/php/phperrorview.cpp:120
@@ -7950,8 +7938,8 @@ msgstr ""
 
 #: languages/cpp/simpletype.cpp:36
 msgid ""
-"double long floating point value, 10 bytes, ranged ca. -3,4E+4932 to "
-"3,4E+4932"
+"double long floating point value, 10 bytes, ranged ca. -3,4E+4932 to 3,4E"
+"+4932"
 msgstr ""
 
 #: languages/cpp/simpletype.cpp:37
@@ -9423,16 +9411,14 @@ msgstr ""
 #: buildtools/pascal/pascalproject_optionsdlgbase.ui:90
 #: kdevdesigner/designer/configtoolboxdialog.ui:109
 #: kdevdesigner/designer/listeditor.ui:80
-#: kdevdesigner/designer/variabledialog.ui:171
-#: languages/ada/addclassdlg.ui:345
+#: kdevdesigner/designer/variabledialog.ui:171 languages/ada/addclassdlg.ui:345
 #: languages/cpp/cppnewclassdlgbase.ui:252
 #: languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui:41
 #: languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui:91
 #: languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui:81
 #: languages/java/configproblemreporter.ui:169
 #: languages/ruby/debugger/variablewidget.cpp:62
-#: lib/widgets/propeditor/qeditlistbox.cpp:121
-#: parts/snippet/snippetdlg.ui:52
+#: lib/widgets/propeditor/qeditlistbox.cpp:121 parts/snippet/snippetdlg.ui:52
 #, no-c-format
 msgid "&Add"
 msgstr ""
@@ -9823,8 +9809,7 @@ msgstr ""
 #: kdevdesigner/designer/projectsettings.ui:98
 #: kdevdesigner/designer/projectsettings.ui:149
 #: kdevdesigner/designer/tableeditor.ui:347
-#: kdevdesigner/designer/tableeditor.ui:614
-#: languages/ada/addclassdlg.ui:189
+#: kdevdesigner/designer/tableeditor.ui:614 languages/ada/addclassdlg.ui:189
 #: languages/cpp/addmethoddialogbase.ui:277
 #: languages/php/phpconfigwidgetbase.ui:379
 #: languages/php/phpconfigwidgetbase.ui:439
@@ -10157,9 +10142,9 @@ msgstr ""
 
 #: parts/astyle/astyle_part.cpp:56
 msgid ""
-"<b>Reformat source</b><p>Source reformatting functionality using "
-"<b>astyle</b> library. Also available in <b>New Class</b> and "
-"<b>Subclassing</b> wizards."
+"<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</"
+"b> library. Also available in <b>New Class</b> and <b>Subclassing</b> "
+"wizards."
 msgstr ""
 
 #: parts/astyle/astyle_part.cpp:59 parts/astyle/astyle_part.cpp:61
@@ -10593,14 +10578,13 @@ msgstr ""
 msgid "macro"
 msgstr ""
 
-#: kdevdesigner/designer/editfunctions.ui:498
-#: parts/ctags2/ctagskinds.cpp:37 parts/ctags2/ctagskinds.cpp:44
-#: parts/ctags2/ctagskinds.cpp:62 parts/ctags2/ctagskinds.cpp:95
-#: parts/ctags2/ctagskinds.cpp:121 parts/ctags2/ctagskinds.cpp:133
-#: parts/ctags2/ctagskinds.cpp:147 parts/ctags2/ctagskinds.cpp:154
-#: parts/ctags2/ctagskinds.cpp:167 parts/ctags2/ctagskinds.cpp:174
-#: parts/ctags2/ctagskinds.cpp:181 parts/ctags2/ctagskinds.cpp:187
-#: parts/ctags2/ctagskinds.cpp:200
+#: kdevdesigner/designer/editfunctions.ui:498 parts/ctags2/ctagskinds.cpp:37
+#: parts/ctags2/ctagskinds.cpp:44 parts/ctags2/ctagskinds.cpp:62
+#: parts/ctags2/ctagskinds.cpp:95 parts/ctags2/ctagskinds.cpp:121
+#: parts/ctags2/ctagskinds.cpp:133 parts/ctags2/ctagskinds.cpp:147
+#: parts/ctags2/ctagskinds.cpp:154 parts/ctags2/ctagskinds.cpp:167
+#: parts/ctags2/ctagskinds.cpp:174 parts/ctags2/ctagskinds.cpp:181
+#: parts/ctags2/ctagskinds.cpp:187 parts/ctags2/ctagskinds.cpp:200
 #, no-c-format
 msgid "function"
 msgstr ""
@@ -10618,8 +10602,7 @@ msgstr ""
 msgid "any pattern"
 msgstr ""
 
-#: kdevdesigner/designer/editfunctions.ui:493
-#: parts/ctags2/ctagskinds.cpp:52
+#: kdevdesigner/designer/editfunctions.ui:493 parts/ctags2/ctagskinds.cpp:52
 #, no-c-format
 msgid "slot"
 msgstr ""
@@ -10750,8 +10733,7 @@ msgstr ""
 msgid "mixin"
 msgstr ""
 
-#: languages/cpp/ccconfigwidgetbase.ui:1383
-#: parts/ctags2/ctagskinds.cpp:175
+#: languages/cpp/ccconfigwidgetbase.ui:1383 parts/ctags2/ctagskinds.cpp:175
 #, no-c-format
 msgid "set"
 msgstr ""
@@ -11424,8 +11406,7 @@ msgstr ""
 msgid "Update selected item"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:29
-#: src/profileengine/editor/profileeditor.cpp:141
+#: parts/doxygen/messages.cpp:29 src/profileengine/editor/profileeditor.cpp:141
 msgid "Project"
 msgstr ""
 
@@ -11971,8 +11952,7 @@ msgstr ""
 msgid "Generate Autogen DEF"
 msgstr ""
 
-#: languages/perl/perlconfigwidgetbase.ui:16
-#: parts/doxygen/messages.cpp:218
+#: languages/perl/perlconfigwidgetbase.ui:16 parts/doxygen/messages.cpp:218
 #, no-c-format
 msgid "Perl"
 msgstr ""
@@ -12214,8 +12194,7 @@ msgstr ""
 #: parts/abbrev/abbrevconfigwidgetbase.ui:76
 #: parts/filecreate/addglobaldlg.cpp:63
 #: parts/filecreate/fcconfigwidgetbase.ui:108
-#: parts/filecreate/fcconfigwidgetbase.ui:257
-#: src/languageselectwidget.cpp:83
+#: parts/filecreate/fcconfigwidgetbase.ui:257 src/languageselectwidget.cpp:83
 #: src/profileengine/editor/profileeditorbase.ui:97
 #, no-c-format
 msgid "Description"
@@ -12246,8 +12225,7 @@ msgid "Icon:"
 msgstr ""
 
 #: parts/appwizard/filepropspagebase.ui:97
-#: parts/filecreate/addglobaldlg.cpp:103
-#: src/generalinfowidgetbase.ui:59
+#: parts/filecreate/addglobaldlg.cpp:103 src/generalinfowidgetbase.ui:59
 #: src/pluginselectdialogbase.ui:74
 #, no-c-format
 msgid "Description:"
@@ -12291,8 +12269,7 @@ msgstr ""
 msgid "<b>New File Creation</b>"
 msgstr ""
 
-#: languages/php/phpnewclassdlgbase.ui:106
-#: parts/appwizard/importdlgbase.ui:27
+#: languages/php/phpnewclassdlgbase.ui:106 parts/appwizard/importdlgbase.ui:27
 #: parts/filecreate/filecreate_newfile.cpp:41 parts/grepview/grepdlg.cpp:132
 #, no-c-format
 msgid "&Directory:"
@@ -12571,9 +12548,9 @@ msgstr ""
 msgid ""
 "<p>If this option is enabled (default), the current filter will be restored "
 "when you start KDev.<p><strong>Note</strong> that if the session is handled "
-"by the TDE session manager, the filter is always "
-"restored.<p><strong>Note</strong> that some of the autosync settings may "
-"override the restored location if on."
+"by the TDE session manager, the filter is always restored.<p><strong>Note</"
+"strong> that some of the autosync settings may override the restored "
+"location if on."
 msgstr ""
 
 #: parts/fileselector/tdeactionselector.cpp:70
@@ -12775,8 +12752,7 @@ msgstr ""
 msgid "Find in Files"
 msgstr ""
 
-#: parts/abbrev/addtemplatedlgbase.ui:85
-#: parts/grepview/grepdlg.cpp:105
+#: parts/abbrev/addtemplatedlgbase.ui:85 parts/grepview/grepdlg.cpp:105
 #, no-c-format
 msgid "&Template:"
 msgstr ""
@@ -12829,16 +12805,16 @@ msgid ""
 "meta characters are:<ul><li><b>.</b> - Matches any character<li><b>^</b> - "
 "Matches the beginning of a line<li><b>$</b> - Matches the end of a "
 "line<li><b>\\&lt;</b> - Matches the beginning of a word<li><b>\\&gt;</b> - "
-"Matches the end of a word</ul>The following repetition operators "
-"exist:<ul><li><b>?</b> - The preceding item is matched at most "
-"once<li><b>*</b> - The preceding item is matched zero or more "
-"times<li><b>+</b> - The preceding item is matched one or more "
-"times<li><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> "
-"times<li><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more "
-"times<li><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> "
-"times<li><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least "
-"<i>n</i>, but at most <i>m</i> times.</ul>Furthermore, backreferences to "
-"bracketed subexpressions are available via the notation \\<i>n</i>.</qt>"
+"Matches the end of a word</ul>The following repetition operators exist:"
+"<ul><li><b>?</b> - The preceding item is matched at most once<li><b>*</b> - "
+"The preceding item is matched zero or more times<li><b>+</b> - The preceding "
+"item is matched one or more times<li><b>{<i>n</i>}</b> - The preceding item "
+"is matched exactly <i>n</i> times<li><b>{<i>n</i>,}</b> - The preceding item "
+"is matched <i>n</i> or more times<li><b>{,<i>n</i>}</b> - The preceding item "
+"is matched at most <i>n</i> times<li><b>{<i>n</i>,<i>m</i>}</b> - The "
+"preceding item is matched at least <i>n</i>, but at most <i>m</i> times.</"
+"ul>Furthermore, backreferences to bracketed subexpressions are available via "
+"the notation \\<i>n</i>.</qt>"
 msgstr ""
 
 #: parts/grepview/grepdlg.cpp:244
@@ -13072,8 +13048,8 @@ msgid ""
 "<b>Messages output</b><p>The messages window shows the output of the "
 "compiler and used build tools like make, ant, uic, dcopidl etc. For compiler "
 "error messages, click on the error message. This will automatically open the "
-"source file and set the cursor to the line that caused the compiler "
-"error/warning."
+"source file and set the cursor to the line that caused the compiler error/"
+"warning."
 msgstr ""
 
 #: parts/outputviews/makeviewpart.cpp:52
@@ -13280,8 +13256,7 @@ msgstr ""
 msgid "File &name:"
 msgstr ""
 
-#: parts/distpart/distpart_ui.ui:296
-#: parts/quickopen/quickopenfiledialog.cpp:42
+#: parts/distpart/distpart_ui.ui:296 parts/quickopen/quickopenfiledialog.cpp:42
 #: parts/quickopen/quickopenfiledialog.cpp:57
 #, no-c-format
 msgid "File &list:"
@@ -13304,14 +13279,12 @@ msgstr ""
 msgid "Error: cannot find matching name function."
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:85
-#: parts/regexptest/regexptestdlg.cpp:103
+#: parts/regexptest/regexptestdlg.cpp:85 parts/regexptest/regexptestdlg.cpp:103
 #: parts/regexptest/regexptestdlg.cpp:179
 msgid "No match"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:88
-#: parts/regexptest/regexptestdlg.cpp:106
+#: parts/regexptest/regexptestdlg.cpp:88 parts/regexptest/regexptestdlg.cpp:106
 #: parts/regexptest/regexptestdlg.cpp:183
 msgid "Successfully matched"
 msgstr ""
@@ -13579,8 +13552,7 @@ msgstr ""
 msgid "Tools Menu"
 msgstr ""
 
-#: parts/tools/tools_part.cpp:51
-#: parts/tools/toolsconfigwidgetbase.ui:16
+#: parts/tools/tools_part.cpp:51 parts/tools/toolsconfigwidgetbase.ui:16
 #, no-c-format
 msgid "External Tools"
 msgstr ""
@@ -13613,15 +13585,13 @@ msgstr ""
 msgid "Valgrind Memory Check"
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:80
-#: parts/valgrind/valgrind_dialog.cpp:140
+#: parts/valgrind/valgrind_dialog.cpp:80 parts/valgrind/valgrind_dialog.cpp:140
 msgid ""
 "Could not find valgrind in your $PATH. Please make sure it is installed "
 "properly."
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:82
-#: parts/valgrind/valgrind_dialog.cpp:142
+#: parts/valgrind/valgrind_dialog.cpp:82 parts/valgrind/valgrind_dialog.cpp:142
 msgid "Valgrind Not Found"
 msgstr ""
 
@@ -14143,8 +14113,8 @@ msgstr ""
 
 #: src/partcontroller.cpp:131
 msgid ""
-"<b>Open file</b><p>Opens an existing file without adding it to the "
-"project.</p>"
+"<b>Open file</b><p>Opens an existing file without adding it to the project.</"
+"p>"
 msgstr ""
 
 #: src/partcontroller.cpp:134
@@ -15428,8 +15398,7 @@ msgstr ""
 msgid "Subversion Output"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:87
-#: vcs/subversion/subversion_part.cpp:261
+#: vcs/subversion/subversion_part.cpp:87 vcs/subversion/subversion_part.cpp:261
 msgid "Subversion"
 msgstr ""
 
@@ -15996,8 +15965,7 @@ msgid "WordProcessing"
 msgstr ""
 
 #: buildtools/autotools/addapplicationdlgbase.ui:193
-#: parts/valgrind/dialog_widget.ui:187
-#: parts/valgrind/dialog_widget.ui:261
+#: parts/valgrind/dialog_widget.ui:187 parts/valgrind/dialog_widget.ui:261
 #, no-c-format
 msgid "E&xecutable:"
 msgstr ""
@@ -16301,8 +16269,8 @@ msgstr ""
 #: buildtools/autotools/choosetargetdlgbase.ui:159
 #, no-c-format
 msgid ""
-"<qt><b>Note:</b> If you cancel, your files will be created but will "
-"<b>not</b> be added to the project.</qt>"
+"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</"
+"b> be added to the project.</qt>"
 msgstr ""
 
 #: buildtools/autotools/choosetargetdlgbase.ui:172
@@ -16858,8 +16826,8 @@ msgstr ""
 msgid ""
 "Each entry contains a filetype used in the project in the form of a filename "
 "or a filename wildcard (using shell wildcards). \n"
-"This will be used when adding/removing files in directories and "
-"re-populating the project"
+"This will be used when adding/removing files in directories and re-"
+"populating the project"
 msgstr ""
 
 #: buildtools/custommakefiles/customotherconfigwidgetbase.ui:45
@@ -17245,8 +17213,7 @@ msgstr ""
 #: buildtools/qmake/createscopedlgbase.ui:263
 #: buildtools/qmake/disablesubprojectdlgbase.ui:77
 #: parts/ctags2/ctags2_selecttagfilebase.ui:78
-#: src/pluginselectdialogbase.ui:137
-#: vcs/subversion/svn_commitdlgbase.ui:90
+#: src/pluginselectdialogbase.ui:137 vcs/subversion/svn_commitdlgbase.ui:90
 #, no-c-format
 msgid "O&K"
 msgstr ""
@@ -18273,14 +18240,14 @@ msgstr ""
 #, no-c-format
 msgid ""
 "<b>Load Descriptions</b><p>Loads a file which contains descriptions of "
-"custom widgets, so that these custom widgets can be used in the Qt "
-"Designer.</p>\n"
+"custom widgets, so that these custom widgets can be used in the Qt Designer."
+"</p>\n"
 "<p>Since it is a lot of work to type in all the information for custom "
-"widgets, you should consider using the tqtcreatecw tool which is in "
-"$TQTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create "
-"custom widget description files for your custom widgets without the need to "
-"type in all the information manually. For more information about the README "
-"file in the tqtcreatecw directory</p>"
+"widgets, you should consider using the tqtcreatecw tool which is in $TQTDIR/"
+"tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom "
+"widget description files for your custom widgets without the need to type in "
+"all the information manually. For more information about the README file in "
+"the tqtcreatecw directory</p>"
 msgstr ""
 
 #: kdevdesigner/designer/customwidgeteditor.ui:190
@@ -19092,8 +19059,8 @@ msgstr ""
 #, no-c-format
 msgid ""
 "<b>Form Settings</b><p>Change settings for the form. Settings like "
-"<b>Comment</b> and <b>Author</b> are for your own use and are not "
-"required.</p>"
+"<b>Comment</b> and <b>Author</b> are for your own use and are not required.</"
+"p>"
 msgstr ""
 
 #: kdevdesigner/designer/formsettings.ui:64
@@ -19182,9 +19149,9 @@ msgstr ""
 #: kdevdesigner/designer/formsettings.ui:169
 #, no-c-format
 msgid ""
-"<b>Enter the name of the class that will be "
-"created.</b><p><em>classname.h</em> and <em>classname.cpp</em> will be "
-"generated as C++ output when it is compiled by uic.</p>"
+"<b>Enter the name of the class that will be created.</b><p><em>classname.h</"
+"em> and <em>classname.cpp</em> will be generated as C++ output when it is "
+"compiled by uic.</p>"
 msgstr ""
 
 #: kdevdesigner/designer/formsettings.ui:177
@@ -19296,10 +19263,10 @@ msgstr ""
 #: kdevdesigner/designer/iconvieweditor.ui:47
 #, no-c-format
 msgid ""
-"<b>Edit Iconview</b><p>Add, edit or delete items in the icon "
-"view.</p><p>Click the <b>New Item</b>-button to create a new item, then "
-"enter text and choose a pixmap.</p><p>Select an item from the view and click "
-"the <b>Delete Item</b>-button to remove the item from the iconview.</p>"
+"<b>Edit Iconview</b><p>Add, edit or delete items in the icon view.</"
+"p><p>Click the <b>New Item</b>-button to create a new item, then enter text "
+"and choose a pixmap.</p><p>Select an item from the view and click the "
+"<b>Delete Item</b>-button to remove the item from the iconview.</p>"
 msgstr ""
 
 #: kdevdesigner/designer/iconvieweditor.ui:78
@@ -19419,8 +19386,8 @@ msgstr ""
 
 #: kdevdesigner/designer/kdevdesigner_part.rc:29
 #: kdevdesigner/designer/kdevdesigner_part_sh.rc:36
-#: parts/distpart/kdevpart_distpart.rc:4
-#: src/kdevassistantui.rc:55 src/tdevelopui.rc:58
+#: parts/distpart/kdevpart_distpart.rc:4 src/kdevassistantui.rc:55
+#: src/tdevelopui.rc:58
 #, no-c-format
 msgid "&Project"
 msgstr ""
@@ -19534,9 +19501,9 @@ msgid ""
 "<b>Edit Listview</b><p>Use the controls on the <b>Items</b>-tab to add, edit "
 "or delete items in the listview. Change the column configuration of the "
 "listview using the controls on the <b>Columns</b>-tab.</p>Click the <b>New "
-"Item</b>-button to create a new item, then enter text and add a "
-"pixmap.</p><p>Select an item from the list and click the <b>Delete "
-"Item</b>-button to remove the item from the list.</p>"
+"Item</b>-button to create a new item, then enter text and add a pixmap.</"
+"p><p>Select an item from the list and click the <b>Delete Item</b>-button to "
+"remove the item from the list.</p>"
 msgstr ""
 
 #: kdevdesigner/designer/listvieweditor.ui:91
@@ -19782,15 +19749,15 @@ msgid ""
 "clicking on a toolbar item, the corresponding tag will be written to the "
 "editor, where you can insert your text. If you have already written some "
 "text and want to format it, hilight it and click on the desired button.  To "
-"improve visualization this editor also supports a simple "
-"html-syntax-highlighting scheme."
+"improve visualization this editor also supports a simple html-syntax-"
+"highlighting scheme."
 msgstr ""
 
 #: kdevdesigner/designer/newform.ui:47
 #, no-c-format
 msgid ""
-"<b>New Form</b><p>Select a template for the new form and click the "
-"<b>OK</b>-button to create it.</p>"
+"<b>New Form</b><p>Select a template for the new form and click the <b>OK</b>-"
+"button to create it.</p>"
 msgstr ""
 
 #: kdevdesigner/designer/newform.ui:115
@@ -20661,8 +20628,7 @@ msgstr ""
 msgid "&Documentation"
 msgstr ""
 
-#: languages/ada/addclassdlg.ui:260
-#: parts/distpart/distpart_ui.ui:424
+#: languages/ada/addclassdlg.ui:260 parts/distpart/distpart_ui.ui:424
 #, no-c-format
 msgid "&License:"
 msgstr ""
@@ -20857,16 +20823,16 @@ msgstr ""
 #: languages/cpp/app_templates/kde4app/prefs_base.ui:29
 #, no-c-format
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Serif'; font-size:9pt; "
 "font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Change the <span "
-"style=\" font-weight:600;\">background</span> color by clicking here and "
-"choose the new <span style=\" color:#ff0000;\">color</span> in the <span "
-"style=\" font-style:italic;\">color dialog</span>.</p></body></html>"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Change the <span style=\" "
+"font-weight:600;\">background</span> color by clicking here and choose the "
+"new <span style=\" color:#ff0000;\">color</span> in the <span style=\" font-"
+"style:italic;\">color dialog</span>.</p></body></html>"
 msgstr ""
 
 #: languages/cpp/app_templates/kde4app/prefs_base.ui:42
@@ -20895,16 +20861,16 @@ msgstr ""
 #: languages/cpp/app_templates/kde4app/prefs_base.ui:65
 #, no-c-format
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Serif'; font-size:9pt; "
 "font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Change the <span "
-"style=\" font-weight:600;\">foreground</span> color by clicking here and "
-"choose the new <span style=\" color:#ff0000;\">color</span> in the <span "
-"style=\" font-style:italic;\">color dialog</span>.</p></body></html>"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Change the <span style=\" "
+"font-weight:600;\">foreground</span> color by clicking here and choose the "
+"new <span style=\" color:#ff0000;\">color</span> in the <span style=\" font-"
+"style:italic;\">color dialog</span>.</p></body></html>"
 msgstr ""
 
 #: languages/cpp/app_templates/kde4app/prefs_base.ui:110
@@ -21165,8 +21131,8 @@ msgstr ""
 msgid ""
 "A semicolon-separated list of include-paths to be used while searching for "
 "headers. \n"
-"Paths not starting with '/' will be interpreted as relative to the "
-"project-folder."
+"Paths not starting with '/' will be interpreted as relative to the project-"
+"folder."
 msgstr ""
 
 #: languages/cpp/ccconfigwidgetbase.ui:524
@@ -21317,8 +21283,8 @@ msgstr ""
 #: languages/cpp/ccconfigwidgetbase.ui:806
 #, no-c-format
 msgid ""
-"These are the suffixes used by the Class Wizard when creating new "
-"classes.<br>Should be in the format: \".suffix\""
+"These are the suffixes used by the Class Wizard when creating new classes."
+"<br>Should be in the format: \".suffix\""
 msgstr ""
 
 #: languages/cpp/ccconfigwidgetbase.ui:827
@@ -21363,8 +21329,8 @@ msgstr ""
 #: languages/cpp/ccconfigwidgetbase.ui:925
 #, no-c-format
 msgid ""
-"Use Qt version 3 (When this is changed the project needs to be closed and "
-"re-opened.)"
+"Use Qt version 3 (When this is changed the project needs to be closed and re-"
+"opened.)"
 msgstr ""
 
 #: languages/cpp/ccconfigwidgetbase.ui:928
@@ -21382,8 +21348,8 @@ msgstr ""
 #: languages/cpp/ccconfigwidgetbase.ui:939
 #, no-c-format
 msgid ""
-"Use Qt version 4 (When this is changed the project needs to be closed and "
-"re-opened.)"
+"Use Qt version 4 (When this is changed the project needs to be closed and re-"
+"opened.)"
 msgstr ""
 
 #: languages/cpp/ccconfigwidgetbase.ui:942
@@ -21483,8 +21449,7 @@ msgstr ""
 msgid "UI Designer Integration"
 msgstr ""
 
-#: languages/cpp/ccconfigwidgetbase.ui:1113
-#: src/settingswidget.ui:396
+#: languages/cpp/ccconfigwidgetbase.ui:1113 src/settingswidget.ui:396
 #, no-c-format
 msgid "&Use TDevelop's embedded designer"
 msgstr ""
@@ -21494,8 +21459,7 @@ msgstr ""
 msgid "Start TDevelop's own designer embedded within TDevelop"
 msgstr ""
 
-#: languages/cpp/ccconfigwidgetbase.ui:1119
-#: src/settingswidget.ui:402
+#: languages/cpp/ccconfigwidgetbase.ui:1119 src/settingswidget.ui:402
 #, no-c-format
 msgid ""
 "TDevelop comes with its own UI designer that can either be embedded or be "
@@ -21513,8 +21477,7 @@ msgstr ""
 msgid "Start TDevelop's own designer externally"
 msgstr ""
 
-#: languages/cpp/ccconfigwidgetbase.ui:1133
-#: src/settingswidget.ui:416
+#: languages/cpp/ccconfigwidgetbase.ui:1133 src/settingswidget.ui:416
 #, no-c-format
 msgid ""
 "TDevelop comes with its own UI designer that can either be embedded or be "
@@ -21527,14 +21490,12 @@ msgstr ""
 msgid "Run Qt &Designer"
 msgstr ""
 
-#: languages/cpp/ccconfigwidgetbase.ui:1144
-#: src/settingswidget.ui:427
+#: languages/cpp/ccconfigwidgetbase.ui:1144 src/settingswidget.ui:427
 #, no-c-format
 msgid "Use Qt Designer externally"
 msgstr ""
 
-#: languages/cpp/ccconfigwidgetbase.ui:1147
-#: src/settingswidget.ui:430
+#: languages/cpp/ccconfigwidgetbase.ui:1147 src/settingswidget.ui:430
 #, no-c-format
 msgid ""
 "Check this button if you wish to use Qt Designer rather than TDevelop's "
@@ -22161,9 +22122,8 @@ msgstr ""
 msgid ""
 "To run \"gdb\" binary from $PATH, leave this field empty. To run custom gdb, "
 "for example, for a different architecture, enter the executable name here. "
-"You can either run gdb from $PATH, but with a different name (say, "
-"\"arm-gdb\"), by typing the name here, or specify full path to the gdb "
-"executable."
+"You can either run gdb from $PATH, but with a different name (say, \"arm-gdb"
+"\"), by typing the name here, or specify full path to the gdb executable."
 msgstr ""
 
 #: languages/cpp/debugger/debuggerconfigwidgetbase.ui:80
@@ -22430,15 +22390,13 @@ msgstr ""
 
 #: languages/cpp/debugger/kdevdebugger.rc:5
 #: languages/ruby/debugger/kdevrbdebugger.rc:5
-#: parts/valgrind/kdevpart_valgrind.rc:4
-#: src/tdevelopui.rc:79
+#: parts/valgrind/kdevpart_valgrind.rc:4 src/tdevelopui.rc:79
 #, no-c-format
 msgid "&Debug"
 msgstr ""
 
 #: languages/cpp/debugger/kdevdebugger.rc:29
-#: languages/ruby/debugger/kdevrbdebugger.rc:21
-#: src/tdevelopui.rc:182
+#: languages/ruby/debugger/kdevrbdebugger.rc:21 src/tdevelopui.rc:182
 #, no-c-format
 msgid "Debugger Toolbar"
 msgstr ""
@@ -23058,8 +23016,7 @@ msgstr ""
 msgid "Add Code Template"
 msgstr ""
 
-#: parts/abbrev/addtemplatedlgbase.ui:96
-#: parts/distpart/distpart_ui.ui:732
+#: parts/abbrev/addtemplatedlgbase.ui:96 parts/distpart/distpart_ui.ui:732
 #: src/profileengine/editor/addprofilewidget.ui:105
 #, no-c-format
 msgid "&Description:"
@@ -23118,20 +23075,17 @@ msgstr ""
 msgid "General Options"
 msgstr ""
 
-#: parts/appwizard/appwizarddlgbase.ui:359
-#: src/generalinfowidgetbase.ui:75
+#: parts/appwizard/appwizarddlgbase.ui:359 src/generalinfowidgetbase.ui:75
 #, no-c-format
 msgid "Author:"
 msgstr ""
 
-#: parts/appwizard/appwizarddlgbase.ui:370
-#: src/generalinfowidgetbase.ui:83
+#: parts/appwizard/appwizarddlgbase.ui:370 src/generalinfowidgetbase.ui:83
 #, no-c-format
 msgid "Email:"
 msgstr ""
 
-#: parts/appwizard/appwizarddlgbase.ui:381
-#: src/generalinfowidgetbase.ui:91
+#: parts/appwizard/appwizarddlgbase.ui:381 src/generalinfowidgetbase.ui:91
 #, no-c-format
 msgid "Version:"
 msgstr ""
@@ -23206,8 +23160,7 @@ msgstr ""
 msgid "&Email:"
 msgstr ""
 
-#: parts/appwizard/importdlgbase.ui:242
-#: parts/appwizard/importdlgbase.ui:262
+#: parts/appwizard/importdlgbase.ui:242 parts/appwizard/importdlgbase.ui:262
 #, no-c-format
 msgid ""
 "If there exists a file AUTHOR in the\n"
@@ -23374,8 +23327,7 @@ msgid ""
 "*.java"
 msgstr ""
 
-#: parts/astyle/astyleconfig.ui:265
-#: parts/astyle/astyleconfig.ui:271
+#: parts/astyle/astyleconfig.ui:265 parts/astyle/astyleconfig.ui:271
 #, no-c-format
 msgid ""
 "Set the extensions of files that the\n"
@@ -23517,8 +23469,7 @@ msgstr ""
 msgid "Contin&uation"
 msgstr ""
 
-#: parts/astyle/astyleconfig.ui:591
-#: parts/astyle/astyleconfig.ui:603
+#: parts/astyle/astyleconfig.ui:591 parts/astyle/astyleconfig.ui:603
 #, no-c-format
 msgid ""
 "Indent a maximal # spaces in a continuous statement,\n"
@@ -23535,8 +23486,7 @@ msgstr ""
 msgid "Minimum in conditional:"
 msgstr ""
 
-#: parts/astyle/astyleconfig.ui:615
-#: parts/astyle/astyleconfig.ui:633
+#: parts/astyle/astyleconfig.ui:615 parts/astyle/astyleconfig.ui:633
 #, no-c-format
 msgid ""
 "Indent a minimal # spaces in a continuous conditional\n"
@@ -23845,8 +23795,8 @@ msgstr ""
 msgid "Always show the bookmarked line in addition to the line number"
 msgstr ""
 
-#: parts/classview/kdevclassview.rc:14
-#: src/kdevassistantui.rc:150 src/tdevelopui.rc:165
+#: parts/classview/kdevclassview.rc:14 src/kdevassistantui.rc:150
+#: src/tdevelopui.rc:165
 #, no-c-format
 msgid "Browser Toolbar"
 msgstr ""
@@ -23973,8 +23923,8 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> will be "
-"executed via $PATH. Note that it is sometimes installed as "
-"<i>exuberant-ctags</i>."
+"executed via $PATH. Note that it is sometimes installed as <i>exuberant-"
+"ctags</i>."
 msgstr ""
 
 #: parts/ctags2/ctags2_settingswidgetbase.ui:172
@@ -24122,8 +24072,7 @@ msgstr ""
 msgid "&Create Source Archive"
 msgstr ""
 
-#: parts/distpart/distpart_ui.ui:286
-#: parts/distpart/distpart_ui.ui:919
+#: parts/distpart/distpart_ui.ui:286 parts/distpart/distpart_ui.ui:919
 #, no-c-format
 msgid "R&eset"
 msgstr ""
@@ -25281,8 +25230,7 @@ msgstr ""
 msgid "Add Tool"
 msgstr ""
 
-#: parts/tools/addtooldlg.ui:27
-#: parts/valgrind/dialog_widget.ui:40
+#: parts/tools/addtooldlg.ui:27 parts/valgrind/dialog_widget.ui:40
 #, no-c-format
 msgid "&Parameters:"
 msgstr ""
@@ -25299,8 +25247,7 @@ msgid ""
 "application output view; otherwise, all output will be ignored."
 msgstr ""
 
-#: parts/tools/addtooldlg.ui:49
-#: parts/valgrind/dialog_widget.ui:51
+#: parts/tools/addtooldlg.ui:49 parts/valgrind/dialog_widget.ui:51
 #, no-c-format
 msgid "&Executable:"
 msgstr ""
@@ -25447,8 +25394,7 @@ msgstr ""
 msgid "Note: Changes will take effect after TDevelop is restarted"
 msgstr ""
 
-#: parts/valgrind/dialog_widget.ui:87
-#: parts/valgrind/dialog_widget.ui:218
+#: parts/valgrind/dialog_widget.ui:87 parts/valgrind/dialog_widget.ui:218
 #, no-c-format
 msgid "Valgrind"
 msgstr ""
@@ -25463,14 +25409,12 @@ msgstr ""
 msgid "&Show still reachable blocks"
 msgstr ""
 
-#: parts/valgrind/dialog_widget.ui:147
-#: parts/valgrind/dialog_widget.ui:274
+#: parts/valgrind/dialog_widget.ui:147 parts/valgrind/dialog_widget.ui:274
 #, no-c-format
 msgid "&Trace children"
 msgstr ""
 
-#: parts/valgrind/dialog_widget.ui:166
-#: parts/valgrind/dialog_widget.ui:240
+#: parts/valgrind/dialog_widget.ui:166 parts/valgrind/dialog_widget.ui:240
 #, no-c-format
 msgid "Additional p&arameters:"
 msgstr ""
@@ -25886,11 +25830,11 @@ msgstr ""
 #: src/settingswidget.ui:449
 #, no-c-format
 msgid ""
-"The make tool usually will display messages like “Entering directory”, "
-"or “Leaving directory” when it switches the directories it currently "
-"works in. As this clutters the messages list in the Messages Output View "
-"window, TDevelop suppresses those messages by default. Mark the checkbox if "
-"you want to protocol which directories make worked in."
+"The make tool usually will display messages like “Entering directory”, or "
+"“Leaving directory” when it switches the directories it currently works in. "
+"As this clutters the messages list in the Messages Output View window, "
+"TDevelop suppresses those messages by default. Mark the checkbox if you want "
+"to protocol which directories make worked in."
 msgstr ""
 
 #: src/settingswidget.ui:497
@@ -25929,8 +25873,7 @@ msgstr ""
 msgid "Select Module"
 msgstr ""
 
-#: vcs/cvsservice/checkoutdialogbase.ui:137
-#: vcs/cvsservice/cvsformbase.ui:79
+#: vcs/cvsservice/checkoutdialogbase.ui:137 vcs/cvsservice/cvsformbase.ui:79
 #: vcs/cvsservice/integrator/fetcherdlgbase.ui:113
 #, no-c-format
 msgid "&Module:"
@@ -26289,8 +26232,7 @@ msgstr ""
 msgid "First Import"
 msgstr ""
 
-#: vcs/cvsservice/kdevcvsservicepart.rc:6
-#: vcs/perforce/kdevperforcepart.rc:6
+#: vcs/cvsservice/kdevcvsservicepart.rc:6 vcs/perforce/kdevperforcepart.rc:6
 #: vcs/subversion/kdevpart_subversion.rc:5
 #, no-c-format
 msgid "&Version Control"
@@ -26499,8 +26441,7 @@ msgstr ""
 msgid "&Revision:"
 msgstr ""
 
-#: vcs/subversion/svn_co.ui:107
-#: vcs/subversion/svn_copydlgwidget.ui:143
+#: vcs/subversion/svn_co.ui:107 vcs/subversion/svn_copydlgwidget.ui:143
 #: vcs/subversion/svn_mergeoptiondlgbase.ui:97
 #: vcs/subversion/svn_mergeoptiondlgbase.ui:202
 #, no-c-format
diff --git a/template/messages/tdevelop/tdevtipofday.pot b/template/messages/tdevelop/tdevtipofday.pot
index f067c0588fa..cbb73a6ad14 100644
--- a/template/messages/tdevelop/tdevtipofday.pot
+++ b/template/messages/tdevelop/tdevtipofday.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 04:14+0200\n"
+"POT-Creation-Date: 2021-07-07 18:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,8 +107,8 @@ msgstr ""
 msgid ""
 "<p>If you have found a bug in TDevelop, please let us know. Use the TDE "
 "Gitea Workspace (TGW) at https://mirror.git.trinitydesktop.org/gitea/ or TDE "
-"Bugzilla at http://bugs.trinitydesktop.org/ or select \"Help\"->\"Report "
-"Bug\" from the menu.\n"
+"Bugzilla at http://bugs.trinitydesktop.org/ or select \"Help\"->\"Report Bug"
+"\" from the menu.\n"
 msgstr ""
 
 #: tips:80
@@ -119,8 +119,8 @@ msgstr ""
 
 #: tips:87
 msgid ""
-"<p>...that you can create a new class with \"New Class\" from the "
-"\"Project\" menu?\n"
+"<p>...that you can create a new class with \"New Class\" from the \"Project"
+"\" menu?\n"
 msgstr ""
 
 #: tips:94
@@ -136,8 +136,8 @@ msgstr ""
 
 #: tips:108
 msgid ""
-"<p>...that you can debug your programs within TDevelop by selecting "
-"\"Debug\"->\"Start\" in the menu?\n"
+"<p>...that you can debug your programs within TDevelop by selecting \"Debug"
+"\"->\"Start\" in the menu?\n"
 msgstr ""
 
 #: tips:115
@@ -176,8 +176,8 @@ msgstr ""
 
 #: tips:157
 msgid ""
-"<p>...that you can access more internal debug functions selecting "
-"\"Debug\"->\"Viewers\"?\n"
+"<p>...that you can access more internal debug functions selecting \"Debug\"->"
+"\"Viewers\"?\n"
 msgstr ""
 
 #: tips:164
@@ -210,6 +210,6 @@ msgstr ""
 
 #: tips:199
 msgid ""
-"<p>...that you can compilie your project in \"debug-mode\" and "
-"\"optimized-mode\"?\n"
+"<p>...that you can compilie your project in \"debug-mode\" and \"optimized-"
+"mode\"?\n"
 msgstr ""