Index: kde-croatia/kde4/summit/hr/summit/messages/extragear-multimedia/amarok.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/extragear-multimedia/amarok.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/extragear-multimedia/amarok.po	(revision 816)
@@ -9,5 +9,5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-14 09:15+0100\n"
+"POT-Creation-Date: 2011-02-20 11:23+0100\n"
 "PO-Revision-Date: 2010-05-12 11:09+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -3807,5 +3807,5 @@
 #. +> trunk
 #: context/applets/labels/labelsReplacementSettings.ui:36
-#: dialogs/OrganizeCollectionDialogBase.ui:206
+#: dialogs/OrganizeCollectionDialogBase.ui:213
 msgid "with"
 msgstr "sa"
@@ -6403,5 +6403,5 @@
 #. +> trunk
 #: core/meta/support/MetaConstants.cpp:112
-#: dialogs/OrganizeCollectionDialog.cpp:151
+#: dialogs/OrganizeCollectionDialog.cpp:157
 #, fuzzy
 msgid "Track Number"
@@ -8811,6 +8811,6 @@
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:145
-#: dialogs/OrganizeCollectionDialog.cpp:148
+#: dialogs/OrganizeCollectionDialog.cpp:151
+#: dialogs/OrganizeCollectionDialog.cpp:154
 #, kde-format
 msgid "%1 or %2"
@@ -8818,40 +8818,40 @@
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:149
+#: dialogs/OrganizeCollectionDialog.cpp:155
 msgid "Artist's Initial"
 msgstr "Inicijali umjetnika"
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:150
+#: dialogs/OrganizeCollectionDialog.cpp:156
 msgid "File Extension of Source"
 msgstr ""
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:153
+#: dialogs/OrganizeCollectionDialog.cpp:159
 msgid "<h3>Custom Format String</h3>"
 msgstr ""
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:154
+#: dialogs/OrganizeCollectionDialog.cpp:160
 msgid "You can use the following tokens:"
 msgstr ""
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:161
+#: dialogs/OrganizeCollectionDialog.cpp:167
 msgid "If you surround sections of text that contain a token with curly-braces, that section will be hidden if the token is empty."
 msgstr ""
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:260
+#: dialogs/OrganizeCollectionDialog.cpp:266
 msgid "There is a filename conflict, existing files will be overwritten."
 msgstr ""
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:262
+#: dialogs/OrganizeCollectionDialog.cpp:268
 msgid "There is a filename conflict, existing files will not be changed."
 msgstr ""
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:383
+#: dialogs/OrganizeCollectionDialog.cpp:401
 #, fuzzy
 msgid "New Format Preset"
@@ -8859,5 +8859,5 @@
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:383
+#: dialogs/OrganizeCollectionDialog.cpp:401
 #, fuzzy
 msgid "Preset Name"
@@ -8865,5 +8865,5 @@
 
 #. +> trunk
-#: dialogs/OrganizeCollectionDialog.cpp:383
+#: dialogs/OrganizeCollectionDialog.cpp:401
 #, fuzzy
 msgid "New Preset"
@@ -8932,7 +8932,14 @@
 msgstr "Rezultati pretraÅŸivanjaÂ âŠ"
 
+#. i18n: ectx: property (text), widget (QPushButton, updatePresetButton)
+#. +> trunk
+#: dialogs/OrganizeCollectionDialogBase.ui:135
+#, fuzzy
+msgid "&Update Preset"
+msgstr "Rezultati pretraÅŸivanjaÂ âŠ"
+
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:159
+#: dialogs/OrganizeCollectionDialogBase.ui:166
 msgid "Character Replacement"
 msgstr ""
@@ -8940,5 +8947,5 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, spaceCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:174
+#: dialogs/OrganizeCollectionDialogBase.ui:181
 msgid "If checked, convert spaces to underscores."
 msgstr ""
@@ -8946,5 +8953,5 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, spaceCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:177
+#: dialogs/OrganizeCollectionDialogBase.ui:184
 msgid "If checked all spaces will be replaced with underscores in the file names. If not, spaces will be left as they are."
 msgstr ""
@@ -8952,5 +8959,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, spaceCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:180
+#: dialogs/OrganizeCollectionDialogBase.ui:187
 msgid "Replace spaces with &underscores"
 msgstr ""
@@ -8958,5 +8965,5 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:189
+#: dialogs/OrganizeCollectionDialogBase.ui:196
 msgid "Replace"
 msgstr "Zamijeni"
@@ -8964,5 +8971,5 @@
 #. i18n: ectx: property (toolTip), widget (KLineEdit, regexpEdit)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:199
+#: dialogs/OrganizeCollectionDialogBase.ui:206
 msgid "Regular expression"
 msgstr "Regularni izraz"
@@ -8970,5 +8977,5 @@
 #. i18n: ectx: property (toolTip), widget (KLineEdit, replaceEdit)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:216
+#: dialogs/OrganizeCollectionDialogBase.ui:223
 msgid "Character string"
 msgstr ""
@@ -8976,5 +8983,5 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, ignoreTheCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:231
+#: dialogs/OrganizeCollectionDialogBase.ui:238
 msgid "If checked, postfix artists' names starting with 'The' with ', The'."
 msgstr ""
@@ -8982,5 +8989,5 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreTheCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:234
+#: dialogs/OrganizeCollectionDialogBase.ui:241
 msgid "If checked all artists that have the word \"The\" at the beginning will be treated as if the \"The\" was not there. Example, \"The Beatles\" would become \"Beatles, The\""
 msgstr ""
@@ -8988,5 +8995,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreTheCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:237
+#: dialogs/OrganizeCollectionDialogBase.ui:244
 #, fuzzy
 msgid "I&gnore 'The' in artist names"
@@ -8995,5 +9002,5 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, asciiCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:258
+#: dialogs/OrganizeCollectionDialogBase.ui:265
 #, fuzzy
 msgid ""
@@ -9019,5 +9026,5 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, asciiCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:267
+#: dialogs/OrganizeCollectionDialogBase.ui:274
 #, fuzzy
 msgid ""
@@ -9039,5 +9046,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, asciiCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:270
+#: dialogs/OrganizeCollectionDialogBase.ui:277
 msgid "Restrict to &ASCII"
 msgstr ""
@@ -9045,5 +9052,5 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, vfatCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:285
+#: dialogs/OrganizeCollectionDialogBase.ui:292
 msgid ""
 "Replace characters that are incompatible with MS-DOS/VFAT file systems with underscores. \n"
@@ -9054,5 +9061,5 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, vfatCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:290
+#: dialogs/OrganizeCollectionDialogBase.ui:297
 msgid ""
 "If checked, replace characters that are incompatible with MS-DOS/VFAT file systems with underscores. Incompatible characters include |?*<\":>+[] and unicode control characters. \n"
@@ -9063,5 +9070,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, vfatCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:293
+#: dialogs/OrganizeCollectionDialogBase.ui:300
 msgid "&VFAT safe names"
 msgstr ""
@@ -9069,5 +9076,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, previewBox)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:309
+#: dialogs/OrganizeCollectionDialogBase.ui:316
 msgid "Destination Preview"
 msgstr ""
@@ -9075,5 +9082,5 @@
 #. i18n: ectx: property (text), widget (QTableWidget, previewTableWidget)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:322
+#: dialogs/OrganizeCollectionDialogBase.ui:329
 #, fuzzy
 msgid "Original"
@@ -9083,6 +9090,6 @@
 #. i18n: ectx: property (text), widget (QPushButton, previewButton)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:327
-#: dialogs/OrganizeCollectionDialogBase.ui:337
+#: dialogs/OrganizeCollectionDialogBase.ui:334
+#: dialogs/OrganizeCollectionDialogBase.ui:344
 #: playlist/layouts/PlaylistLayoutEditDialog.ui:336
 #, fuzzy
@@ -9092,5 +9099,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, autoPreviewCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:344
+#: dialogs/OrganizeCollectionDialogBase.ui:351
 #, fuzzy
 msgid "Automatic Preview"
@@ -9099,5 +9106,5 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, overwriteCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:383
+#: dialogs/OrganizeCollectionDialogBase.ui:390
 msgid "If checked, overwrite files of the same name without asking."
 msgstr ""
@@ -9105,5 +9112,5 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, overwriteCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:390
+#: dialogs/OrganizeCollectionDialogBase.ui:397
 #, fuzzy
 msgid ""
@@ -9122,5 +9129,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, overwriteCheck)
 #. +> trunk
-#: dialogs/OrganizeCollectionDialogBase.ui:393
+#: dialogs/OrganizeCollectionDialogBase.ui:400
 msgid "Overwrite &Destination"
 msgstr ""
Index: kde-croatia/kde4/summit/hr/summit/messages/extragear-network/ktorrent.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/extragear-network/ktorrent.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/extragear-network/ktorrent.po	(revision 816)
@@ -8,5 +8,5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-16 09:41+0100\n"
+"POT-Creation-Date: 2011-02-20 11:23+0100\n"
 "PO-Revision-Date: 2010-04-16 11:03+0200\n"
 "Last-Translator: Andrej Dundovic <adundovi@gmail.com>\n"
@@ -62,5 +62,5 @@
 #: kio-magnet/dbushandler.cpp:288
 #, kde-format
-msgid "The the found value (%1) for the hash is neither 32 nor 40 chars long."
+msgid "The found value (%1) for the hash is neither 32 nor 40 chars long."
 msgstr ""
 
@@ -1766,5 +1766,5 @@
 #. +> trunk stable
 #: ktorrent/main.cpp:94 ktorrent/pref/advancedpref.ui:174
-#: plugins/search/webview.cpp:152
+#: plugins/search/webview.cpp:158
 msgid "KTorrent"
 msgstr "KTorrent"
@@ -3699,5 +3699,5 @@
 #: ktorrent/tools/queuemanagerwidget.cpp:57
 #: plugins/search/searchactivity.cpp:81 plugins/search/searchtoolbar.cpp:70
-#: plugins/search/webview.cpp:155
+#: plugins/search/webview.cpp:161
 #, fuzzy
 msgid "Search"
@@ -7749,5 +7749,5 @@
 
 #. +> trunk stable
-#: plugins/search/webview.cpp:151
+#: plugins/search/webview.cpp:157
 #, fuzzy
 msgid "Home"
@@ -7755,5 +7755,5 @@
 
 #. +> trunk stable
-#: plugins/search/webview.cpp:153
+#: plugins/search/webview.cpp:159
 #, fuzzy
 msgctxt "KDE 4 tag line, see http://kde.org/img/kde40.png"
@@ -7762,5 +7762,5 @@
 
 #. +> trunk stable
-#: plugins/search/webview.cpp:154
+#: plugins/search/webview.cpp:160
 #, fuzzy
 msgid "Search the web for torrents."
@@ -7768,8 +7768,14 @@
 
 #. +> trunk
-#: plugins/search/webview.cpp:182
+#: plugins/search/webview.cpp:188
 #, fuzzy, kde-format
 msgid "Save %1 to"
 msgstr "Preimenuj gradijent"
+
+#. +> trunk
+#: plugins/search/webview.cpp:205
+#, fuzzy, kde-format
+msgid "Cannot open <b>%1</b>: %2"
+msgstr "Nije moguÄe otvoriti datoteku"
 
 #. i18n: ectx: Menu (shutdown)
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kate.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kate.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kate.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: desktop_kdesdk 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-18 09:49+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2009-10-27 17:52+0100\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -394,5 +394,5 @@
 
 #. +> trunk
-#: ktexteditor/kcm_ktexteditor.desktop:18
+#: ktexteditor/kcm_ktexteditor.desktop:19
 #, fuzzy
 msgctxt "Comment"
@@ -429,5 +429,5 @@
 
 #. +> trunk
-#: kwrite/kwrite.desktop:19
+#: kwrite/kwrite.desktop:20
 #, fuzzy
 msgctxt "Name"
@@ -452,5 +452,5 @@
 
 #. +> trunk
-#: part/plugins/autobookmarker/ktexteditor_autobookmarker.desktop:31
+#: part/plugins/autobookmarker/ktexteditor_autobookmarker.desktop:32
 #, fuzzy
 msgctxt "Comment"
@@ -466,5 +466,5 @@
 
 #. +> trunk
-#: part/plugins/autobrace/ktexteditor_autobrace.desktop:33
+#: part/plugins/autobrace/ktexteditor_autobrace.desktop:34
 #, fuzzy
 msgctxt "Comment"
@@ -487,5 +487,5 @@
 
 #. +> trunk
-#: part/plugins/exporter/ktexteditor_exporter.desktop:34
+#: part/plugins/exporter/ktexteditor_exporter.desktop:35
 #, fuzzy
 msgctxt "Comment"
@@ -501,5 +501,5 @@
 
 #. +> trunk
-#: part/plugins/hlselection/ktexteditor_hlselection.desktop:32
+#: part/plugins/hlselection/ktexteditor_hlselection.desktop:33
 msgctxt "Comment"
 msgid "Highlight all words based on the text selection"
@@ -514,5 +514,5 @@
 
 #. +> trunk
-#: part/plugins/insertfile/ktexteditor_insertfile.desktop:34
+#: part/plugins/insertfile/ktexteditor_insertfile.desktop:35
 #, fuzzy
 msgctxt "Comment"
@@ -528,5 +528,5 @@
 
 #. +> trunk
-#: part/plugins/kdatatool/ktexteditor_kdatatool.desktop:34
+#: part/plugins/kdatatool/ktexteditor_kdatatool.desktop:35
 #, fuzzy
 msgctxt "Comment"
@@ -542,5 +542,5 @@
 
 #. +> trunk
-#: part/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop:16
+#: part/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop:17
 #, fuzzy
 msgctxt "Name"
@@ -549,5 +549,5 @@
 
 #. +> trunk
-#: part/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop:29
+#: part/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop:31
 #, fuzzy
 msgctxt "GenericName"
@@ -562,5 +562,5 @@
 
 #. +> trunk
-#: part/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop:28
+#: part/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop:29
 msgctxt "Comment"
 msgid "A plugin, which does zen-coding like selector completion"
@@ -575,5 +575,5 @@
 
 #. +> trunk
-#: part/plugins/pythonencoding/ktexteditor_python-encoding.desktop:19
+#: part/plugins/pythonencoding/ktexteditor_python-encoding.desktop:20
 #, fuzzy
 msgctxt "Comment"
@@ -589,5 +589,5 @@
 
 #. +> trunk
-#: part/plugins/timedate/ktexteditor_timedate.desktop:35
+#: part/plugins/timedate/ktexteditor_timedate.desktop:36
 #, fuzzy
 msgctxt "Comment"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kde-runtime.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kde-runtime.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kde-runtime.po	(revision 816)
@@ -11,5 +11,5 @@
 "Project-Id-Version: desktop_kdebase 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-19 11:51+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2010-12-16 22:12+0100\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -6148,5 +6148,5 @@
 
 #. +> trunk stable
-#: platforms/win/kshutdown/kshutdown.desktop:12
+#: platforms/win/kshutdown/kshutdown.desktop:14
 msgctxt "Comment"
 msgid "kill running KDE applications and processes"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kde-workspace.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kde-workspace.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/desktop_kdebase_kde-workspace.po	(revision 816)
@@ -11,5 +11,5 @@
 "Project-Id-Version: desktop_kdebase 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-19 11:51+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2010-12-16 22:12+0100\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -5200,5 +5200,5 @@
 
 #. +> trunk
-#: plasma/generic/runners/activities/plasma-runner-activityrunner.desktop:12
+#: plasma/generic/runners/activities/plasma-runner-activityrunner.desktop:13
 #, fuzzy
 msgctxt "Comment"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/katepart4.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/katepart4.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/katepart4.po	(revision 816)
@@ -10,5 +10,5 @@
 "Project-Id-Version: katepart4 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-03 10:33+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2010-06-06 14:00+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -482,6 +482,6 @@
 msgstr "&Kategorija:"
 
+#. i18n: ectx: property (title), widget (QGroupBox, gbViInputMode)
 #. i18n: ectx: property (title), widget (QGroupBox, gbGeneral)
-#. i18n: ectx: property (title), widget (QGroupBox, gbViInputMode)
 #. +> trunk stable
 #: dialogs/completionconfigtab.ui:12 dialogs/katedialogs.cpp:652
@@ -492,5 +492,12 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, chkAutoCompletionEnabled)
-#. +> trunk stable
+#. +> trunk
+#: dialogs/completionconfigtab.ui:18
+#, fuzzy
+msgid "Enable &auto completion"
+msgstr "Savjeti o dopuni"
+
+#. i18n: ectx: property (text), widget (QCheckBox, chkAutoCompletionEnabled)
+#. +> stable
 #: dialogs/completionconfigtab.ui:18
 #, fuzzy
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/kcmkeyboard.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/kcmkeyboard.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/kcmkeyboard.po	(revision 816)
@@ -7,5 +7,5 @@
 "Project-Id-Version: kcmkeyboard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-01-25 09:19+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2011-02-20 16:32+0100\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -16,6 +16,5 @@
 "Language: hr\n"
 "X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
@@ -33,7 +32,6 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog, AddLayoutDialog)
-#. i18n: ectx: property (text), widget (QPushButton, addLayoutBtn)
-#. +> trunk stable
-#: kcm_add_layout_dialog.ui:14 kcm_keyboard.ui:290
+#. +> trunk stable
+#: kcm_add_layout_dialog.ui:14
 msgid "Add Layout"
 msgstr "Dodaj raspored"
@@ -78,16 +76,6 @@
 #. +> trunk stable
 #: kcm_keyboard.ui:50
-msgid ""
-"Here you can choose a keyboard model. This setting is independent of your "
-"keyboard layout and refers to the \"hardware\" model, i.e. the way your "
-"keyboard is manufactured. Modern keyboards that come with your computer "
-"usually have two extra keys and are referred to as \"104-key\" models, which "
-"is probably what you want if you do not know what kind of keyboard you have.\n"
-msgstr ""
-"Ovdje moÅŸete odabrati model tipkovnice. Ova postavka je nezavisna od vaÅ¡eg "
-"rasporeda tipkovnice i odnosi se na âhardverskiâ model, tj. naÄin na koji je "
-"VaÅ¡a tipkovnica proizvedena. Moderne tipkovnice koje dolaze s VaÅ¡im raÄunalom "
-"veÄinom imaju dvije dodatne tipke i poznatije su kao modeli s 104 tipke, Å¡to "
-"bi vjerojatno trebali izabrati ako ne znate toÄni model vaÅ¡e tipkovnice.\n"
+msgid "Here you can choose a keyboard model. This setting is independent of your keyboard layout and refers to the \"hardware\" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as \"104-key\" models, which is probably what you want if you do not know what kind of keyboard you have.\n"
+msgstr "Ovdje moÅŸete odabrati model tipkovnice. Ova postavka je nezavisna od vaÅ¡eg rasporeda tipkovnice i odnosi se na âhardverskiâ model, tj. naÄin na koji je VaÅ¡a tipkovnica proizvedena. Moderne tipkovnice koje dolaze s VaÅ¡im raÄunalom veÄinom imaju dvije dodatne tipke i poznatije su kao modeli s 104 tipke, Å¡to bi vjerojatno trebali izabrati ako ne znate toÄni model vaÅ¡e tipkovnice.\n"
 
 #. i18n: ectx: attribute (title), widget (QWidget, tabLayouts)
@@ -130,11 +118,6 @@
 #. +> trunk stable
 #: kcm_keyboard.ui:136
-msgid ""
-"If you select \"Application\" or \"Window\" switching policy, changing the "
-"keyboard layout will only affect the current application or window."
-msgstr ""
-"Ako odaberete pravilo prebacivanja \"Program\" ili \"Prozor\", promjena "
-"rasporeda tipaka Äe "
-"se odraziti samo na trenutni program ili prozor."
+msgid "If you select \"Application\" or \"Window\" switching policy, changing the keyboard layout will only affect the current application or window."
+msgstr "Ako odaberete pravilo prebacivanja \"Program\" ili \"Prozor\", promjena rasporeda tipaka Äe se odraziti samo na trenutni program ili prozor."
 
 #. i18n: ectx: property (title), widget (KButtonGroup, switchingPolicyButtonGroup)
@@ -183,11 +166,6 @@
 #. +> trunk stable
 #: kcm_keyboard.ui:198
-msgid ""
-"This is a shortcut for switching layouts which is handled by X.org. It allows "
-"modifier-only shortcuts."
-msgstr ""
-"Ovo je preÄac za promjenu rasporeda koju obraÄuje X.org. Dozvoljavaju se "
-"samo "
-"preÄice s tipkama Ctrl, Alt ili Shift."
+msgid "This is a shortcut for switching layouts which is handled by X.org. It allows modifier-only shortcuts."
+msgstr "Ovo je preÄac za promjenu rasporeda koju obraÄuje X.org. Dozvoljavaju se samo preÄice s tipkama Ctrl, Alt ili Shift."
 
 #. i18n: ectx: property (text), widget (QPushButton, xkbGrpShortcutBtn)
@@ -215,11 +193,6 @@
 #. +> trunk stable
 #: kcm_keyboard.ui:228
-msgid ""
-"This is a shortcut for switching to a third level of the active layout (if it "
-"has one) which is handled by X.org. It allows modifier-only shortcuts."
-msgstr ""
-"Ovo je preÄac za promjenu na treÄu razinu aktivnog rasporeda (ako ga ima) "
-"koju obraÄuje X.org. Dozvoljavaju se samo preÄaci s tipkama Ctrl, Alt ili "
-"Shift."
+msgid "This is a shortcut for switching to a third level of the active layout (if it has one) which is handled by X.org. It allows modifier-only shortcuts."
+msgstr "Ovo je preÄac za promjenu na treÄu razinu aktivnog rasporeda (ako ga ima) koju obraÄuje X.org. Dozvoljavaju se samo preÄaci s tipkama Ctrl, Alt ili Shift."
 
 #. i18n: ectx: property (text), widget (QLabel, label_2)
@@ -232,12 +205,6 @@
 #. +> trunk stable
 #: kcm_keyboard.ui:258
-msgid ""
-"This is a shortcut for switching layouts which is handled by KDE. It does not "
-"support modifier-only shortcuts and also may not work in some situations (e.g."
-" if popup is active or from screensaver)."
-msgstr ""
-"Ovo je preÄac za promjenu rasporeda koju obraÄuje KDE. Ona ne podrÅŸava samo "
-"preÄace s tipkama Ctrl, Alt ili Shift i zato moÅŸda neÄe raditi u svim "
-"situacijama (npr. ako je aktiviran Äuvar zaslona)."
+msgid "This is a shortcut for switching layouts which is handled by KDE. It does not support modifier-only shortcuts and also may not work in some situations (e.g. if popup is active or from screensaver)."
+msgstr "Ovo je preÄac za promjenu rasporeda koju obraÄuje KDE. Ona ne podrÅŸava samo preÄace s tipkama Ctrl, Alt ili Shift i zato moÅŸda neÄe raditi u svim situacijama (npr. ako je aktiviran Äuvar zaslona)."
 
 #. i18n: ectx: property (title), widget (QGroupBox, layoutsGroupBox)
@@ -247,6 +214,20 @@
 msgstr "Podesi rasporede"
 
+#. i18n: ectx: property (text), widget (QPushButton, addLayoutBtn)
+#. +> trunk
+#: kcm_keyboard.ui:290
+#, fuzzy
+msgid "Add"
+msgstr "Dodaj"
+
 #. i18n: ectx: property (text), widget (QPushButton, removeLayoutBtn)
-#. +> trunk stable
+#. +> trunk
+#: kcm_keyboard.ui:300
+#, fuzzy
+msgid "Remove"
+msgstr "Ukloni"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeLayoutBtn)
+#. +> stable
 #: kcm_keyboard.ui:300
 msgid "Remove Layout"
@@ -268,5 +249,4 @@
 #. +> trunk stable
 #: kcm_keyboard.ui:355
-#| msgid "Page &Layout..."
 msgid "Spare layouts"
 msgstr "Rezervni rasporedi"
@@ -274,5 +254,5 @@
 #. i18n: ectx: property (text), widget (QLabel, label_5)
 #. +> trunk stable
-#: kcm_keyboard.ui:368
+#: kcm_keyboard.ui:387
 msgid "Main layout count:"
 msgstr "Broj glavnih rasporeda:"
@@ -280,5 +260,5 @@
 #. i18n: ectx: attribute (title), widget (QWidget, tabAdvanced)
 #. +> trunk stable
-#: kcm_keyboard.ui:385
+#: kcm_keyboard.ui:417
 msgid "Advanced"
 msgstr "Napredno"
@@ -286,5 +266,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, configureKeyboardOptionsChk)
 #. +> trunk stable
-#: kcm_keyboard.ui:391
+#: kcm_keyboard.ui:423
 msgid "&Configure keyboard options"
 msgstr "Podesi opcije tipkovnice"
@@ -293,12 +273,6 @@
 #. +> trunk stable
 #: kcmmiscwidget.ui:17
-msgid ""
-"If supported, this option allows you to setup the state of NumLock after KDE "
-"startup.<p>You can configure NumLock to be turned on or off, or configure KDE "
-"not to set NumLock state."
-msgstr ""
-"Ako je podrÅŸana, ova opcija dopuÅ¡ta postavljanje stanja NumLock-a nakon "
-"starta KDE suÄelja. <p>MoÅŸete postaviti NumLock da bude iskljuÄen ili "
-"ukljuÄen ili podesiti KDE da ne postavlja stanje NumLock-a."
+msgid "If supported, this option allows you to setup the state of NumLock after KDE startup.<p>You can configure NumLock to be turned on or off, or configure KDE not to set NumLock state."
+msgstr "Ako je podrÅŸana, ova opcija dopuÅ¡ta postavljanje stanja NumLock-a nakon starta KDE suÄelja. <p>MoÅŸete postaviti NumLock da bude iskljuÄen ili ukljuÄen ili podesiti KDE da ne postavlja stanje NumLock-a."
 
 #. i18n: ectx: property (title), widget (KButtonGroup, numlockGroupBox)
@@ -338,13 +312,6 @@
 #. +> stable
 #: kcmmiscwidget.ui:59
-msgid ""
-"If you check this option, pressing and holding down a key emits the same "
-"character over and over again. For example, pressing and holding down the Tab "
-"key will have the same effect as that of pressing that key several times in "
-"succession: Tab characters continue to be emitted until you release the key."
-msgstr ""
-"Ako ukljuÄite ovu opciju, pritisak i drÅŸanje tipke stalno emitira isti znak. "
-"Na primjer, pritisak i drÅŸanje tipke Tab ima isti efekt kao i pojedinaÄno "
-"pritiskanje ove tipke: Tab znakovi emitiraju se sve dok ne pustite tipku. "
+msgid "If you check this option, pressing and holding down a key emits the same character over and over again. For example, pressing and holding down the Tab key will have the same effect as that of pressing that key several times in succession: Tab characters continue to be emitted until you release the key."
+msgstr "Ako ukljuÄite ovu opciju, pritisak i drÅŸanje tipke stalno emitira isti znak. Na primjer, pritisak i drÅŸanje tipke Tab ima isti efekt kao i pojedinaÄno pritiskanje ove tipke: Tab znakovi emitiraju se sve dok ne pustite tipku. "
 
 #. i18n: ectx: property (text), widget (QCheckBox, repeatBox)
@@ -364,12 +331,6 @@
 #. +> trunk stable
 #: kcmmiscwidget.ui:133 kcmmiscwidget.ui:161
-msgid ""
-"If supported, this option allows you to set the delay after which a pressed "
-"key will start generating keycodes. The 'Repeat rate' option controls the "
-"frequency of these keycodes."
-msgstr ""
-"Ako je podrÅŸana, ova opcija dozvoljava postavljanje pauze nakon koje Äe "
-"pritisnuta tipka poÄeti generirati znakove. Opcija 'Stopa ponavljanja' "
-"kontrolira frekvenciju emitiranja ovih znakova. "
+msgid "If supported, this option allows you to set the delay after which a pressed key will start generating keycodes. The 'Repeat rate' option controls the frequency of these keycodes."
+msgstr "Ako je podrÅŸana, ova opcija dozvoljava postavljanje pauze nakon koje Äe pritisnuta tipka poÄeti generirati znakove. Opcija 'Stopa ponavljanja' kontrolira frekvenciju emitiranja ovih znakova. "
 
 #. i18n: ectx: property (suffix), widget (KIntNumInput, delay)
@@ -389,15 +350,10 @@
 #. +> trunk stable
 #: kcmmiscwidget.ui:187 kcmmiscwidget.ui:215
-msgid ""
-"If supported, this option allows you to set the rate at which keycodes are "
-"generated while a key is pressed."
-msgstr ""
-"Ako je podrÅŸana, ova opcija dozvoljava postavljanje stope brzine ponavljanja "
-"znakova dok je tipka pritisnuta."
+msgid "If supported, this option allows you to set the rate at which keycodes are generated while a key is pressed."
+msgstr "Ako je podrÅŸana, ova opcija dozvoljava postavljanje stope brzine ponavljanja znakova dok je tipka pritisnuta."
 
 #. i18n: ectx: property (suffix), widget (KDoubleNumInput, rate)
 #. +> trunk stable
 #: kcmmiscwidget.ui:218
-#| msgid "Repeat:"
 msgid " repeats/s"
 msgstr " ponavljanja/s"
@@ -412,11 +368,6 @@
 #. +> trunk
 #: kcmmiscwidget.ui:243
-msgid ""
-"Allows to test keyboard repeat and click volume (just don't forget to apply "
-"the changes)."
-msgstr ""
-"OmoguÄuje isprobavanje ponavljanje tipkovnice i razinu glasnoÄe pritiska "
-"(samo nemojte zaboraviti "
-"primijeniti promjene)."
+msgid "Allows to test keyboard repeat and click volume (just don't forget to apply the changes)."
+msgstr "OmoguÄuje isprobavanje ponavljanje tipkovnice i razinu glasnoÄe pritiska (samo nemojte zaboraviti primijeniti promjene)."
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -430,18 +381,6 @@
 #: kcmmiscwidget.ui:260
 #, no-c-format
-msgid ""
-"If supported, this option allows you to hear audible clicks from your "
-"computer's speakers when you press the keys on your keyboard. This might be "
-"useful if your keyboard does not have mechanical keys, or if the sound that "
-"the keys make is very soft.<p>You can change the loudness of the key click "
-"feedback by dragging the slider button or by clicking the up/down arrows on "
-"the spin box. Setting the volume to 0% turns off the key click."
-msgstr ""
-"Ako je podrÅŸana, ova opcija dopuÅ¡ta Äuti \"klikove\" iz zvuÄnika vaÅ¡eg "
-"raÄunala kada pritisnete tipku na tipkovnici. Ovo moÅŸe biti korisno ako vaÅ¡a "
-"tipkovnica nema mehaniÄke tipke, ili ako je zvuk kojeg tipkovnica proizvodi "
-"pretih. <p>MoÅŸete mijenjati glasnoÄu \"klika\" tipki povlaÄeÄi klizni gumb "
-"ili klikanjem na gore/dolje strelice od spin box-a. Postavka glasnoÄe na 0% "
-"iskljuÄuje \"klikanje\" tipki."
+msgid "If supported, this option allows you to hear audible clicks from your computer's speakers when you press the keys on your keyboard. This might be useful if your keyboard does not have mechanical keys, or if the sound that the keys make is very soft.<p>You can change the loudness of the key click feedback by dragging the slider button or by clicking the up/down arrows on the spin box. Setting the volume to 0% turns off the key click."
+msgstr "Ako je podrÅŸana, ova opcija dopuÅ¡ta Äuti \"klikove\" iz zvuÄnika vaÅ¡eg raÄunala kada pritisnete tipku na tipkovnici. Ovo moÅŸe biti korisno ako vaÅ¡a tipkovnica nema mehaniÄke tipke, ili ako je zvuk kojeg tipkovnica proizvodi pretih. <p>MoÅŸete mijenjati glasnoÄu \"klika\" tipki povlaÄeÄi klizni gumb ili klikanjem na gore/dolje strelice od spin box-a. Postavka glasnoÄe na 0% iskljuÄuje \"klikanje\" tipki."
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/kwin_effects.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/kwin_effects.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/kwin_effects.po	(revision 816)
@@ -10,5 +10,5 @@
 "Project-Id-Version: kwin_effects\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-18 09:50+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2010-08-14 10:23+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -236,15 +236,15 @@
 
 #. +> trunk stable
-#: cube/cube.cpp:210 cube/cube_config.cpp:60
+#: cube/cube.cpp:211 cube/cube_config.cpp:60
 msgid "Desktop Cube"
 msgstr "Desktop Cube"
 
 #. +> trunk stable
-#: cube/cube.cpp:214 cube/cube_config.cpp:64
+#: cube/cube.cpp:215 cube/cube_config.cpp:64
 msgid "Desktop Cylinder"
 msgstr "Desktop Cylinder"
 
 #. +> trunk stable
-#: cube/cube.cpp:218 cube/cube_config.cpp:68
+#: cube/cube.cpp:219 cube/cube_config.cpp:68
 msgid "Desktop Sphere"
 msgstr "Desktop Kugla"
@@ -819,10 +819,10 @@
 
 #. +> trunk stable
-#: invert/invert.cpp:48 invert/invert_config.cpp:47
+#: invert/invert.cpp:49 invert/invert_config.cpp:47
 msgid "Toggle Invert Effect"
 msgstr "UkljuÄi obrnuti efekt"
 
 #. +> trunk stable
-#: invert/invert.cpp:53 invert/invert_config.cpp:52
+#: invert/invert.cpp:54 invert/invert_config.cpp:52
 msgid "Toggle Invert Effect on Window"
 msgstr "UkljuÄi obrnuti efekt na prozoru"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdebase/kxkb.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdebase/kxkb.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdebase/kxkb.po	(revision 816)
@@ -7,5 +7,5 @@
 "Project-Id-Version: kxkb 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-07 10:03+0100\n"
+"POT-Creation-Date: 2011-02-20 11:24+0100\n"
 "PO-Revision-Date: 2010-03-18 11:06+0100\n"
 "Last-Translator: Andrej Dundovic <adundovi@gmail.com>\n"
@@ -22,5 +22,5 @@
 
 #. +> trunk stable
-#: flags.cpp:119
+#: flags.cpp:132
 #, fuzzy, kde-format
 msgctxt "layout - variant"
@@ -55,5 +55,5 @@
 
 #. +> trunk stable
-#: kcm_keyboard_widget.cpp:192
+#: kcm_keyboard_widget.cpp:193
 msgctxt "unknown keyboard model vendor"
 msgid "Unknown"
@@ -61,5 +61,5 @@
 
 #. +> trunk stable
-#: kcm_keyboard_widget.cpp:194
+#: kcm_keyboard_widget.cpp:195
 #, fuzzy, kde-format
 #| msgctxt "vendor, keyboard model"
@@ -70,5 +70,5 @@
 
 #. +> trunk stable
-#: kcm_keyboard_widget.cpp:204
+#: kcm_keyboard_widget.cpp:205
 #, fuzzy, kde-format
 msgid "Only up to %1 keyboard layout is supported"
@@ -79,5 +79,5 @@
 
 #. +> trunk stable
-#: kcm_keyboard_widget.cpp:546
+#: kcm_keyboard_widget.cpp:548
 #, fuzzy
 msgctxt "no shortcuts defined"
@@ -86,5 +86,5 @@
 
 #. +> trunk stable
-#: kcm_keyboard_widget.cpp:562
+#: kcm_keyboard_widget.cpp:564
 #, fuzzy, kde-format
 #| msgid "%1 shortcuts"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdeedu/desktop_kdeedu.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdeedu/desktop_kdeedu.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdeedu/desktop_kdeedu.po	(revision 816)
@@ -7,5 +7,5 @@
 "Project-Id-Version: desktop_kdeedu 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-19 11:51+0100\n"
+"POT-Creation-Date: 2011-02-20 11:25+0100\n"
 "PO-Revision-Date: 2010-03-04 23:03+0100\n"
 "Last-Translator: Ivo Ugrina <ivo@iugrina.com>\n"
@@ -198,5 +198,5 @@
 
 #. +> trunk stable
-#: cantor/src/backends/null/nullbackend.desktop:38
+#: cantor/src/backends/null/nullbackend.desktop:39
 msgctxt "Comment"
 msgid "Backend for Cantor for testing purposes"
@@ -484,5 +484,5 @@
 
 #. +> trunk stable
-#: kalzium/plasmoid/applet/psePlasmoid/plasma-applet-Molmasscalculator.desktop:27
+#: kalzium/plasmoid/applet/psePlasmoid/plasma-applet-Molmasscalculator.desktop:28
 msgctxt "Comment"
 msgid "Small periodic table of elements with a molar mass calculator"
@@ -983,5 +983,5 @@
 
 #. +> trunk
-#: rocs/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop:16
+#: rocs/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop:20
 #, fuzzy
 msgctxt "Comment"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdeedu/ktouch.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdeedu/ktouch.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdeedu/ktouch.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: ktouch 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-09 10:35+0100\n"
+"POT-Creation-Date: 2011-02-20 11:25+0100\n"
 "PO-Revision-Date: 2010-06-27 20:45+0200\n"
 "Last-Translator: Oliver Mucafir <oliver.untwist@gmail.com>\n"
@@ -37,4 +37,11 @@
 msgstr "Arapski"
 
+#. +> trunk
+#: keyboards/bg.keyboard.xml:3
+#, fuzzy
+msgctxt "Keyboard Layout Name"
+msgid "Bulgarian"
+msgstr "Bugarski"
+
 #. +> trunk stable
 #: keyboards/colemak.keyboard.xml:3
Index: kde-croatia/kde4/summit/hr/summit/messages/kdegraphics/desktop_kdegraphics.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdegraphics/desktop_kdegraphics.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdegraphics/desktop_kdegraphics.po	(revision 816)
@@ -8,5 +8,5 @@
 "Project-Id-Version: desktop_kdegraphics 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-07 10:04+0100\n"
+"POT-Creation-Date: 2011-02-20 11:26+0100\n"
 "PO-Revision-Date: 2010-11-27 17:37+0100\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -61,46 +61,4 @@
 
 #. +> trunk stable
-#: kamera/kcontrol/kamera.desktop:2
-msgctxt "Comment"
-msgid "Configure Kamera"
-msgstr "PodeÅ¡avanje kamere"
-
-#. +> trunk stable
-#: kamera/kcontrol/kamera.desktop:120
-msgctxt "Name"
-msgid "Digital Camera"
-msgstr "Digitalna kamera"
-
-#. +> trunk stable
-#: kamera/solid_camera.desktop:9
-msgctxt "Name"
-msgid "Open with File Manager"
-msgstr "Otvori s preglednikom datoteka"
-
-#. +> trunk stable
-#: kcolorchooser/kcolorchooser.desktop:7
-msgctxt "GenericName"
-msgid "Color Chooser"
-msgstr "Izbornik boja"
-
-#. +> trunk stable
-#: kcolorchooser/kcolorchooser.desktop:79
-msgctxt "Name"
-msgid "KColorChooser"
-msgstr "Izbornik boja"
-
-#. +> trunk stable
-#: kgamma/kcmkgamma/kgamma.desktop:2
-msgctxt "Comment"
-msgid "A monitor calibration tool"
-msgstr "Alat za uÅ¡timavanje monitora"
-
-#. +> trunk stable
-#: kgamma/kcmkgamma/kgamma.desktop:66
-msgctxt "Name"
-msgid "Gamma"
-msgstr "Gama"
-
-#. +> trunk stable
 #: kolourpaint/kolourpaint.desktop:3
 msgctxt "Name"
@@ -161,16 +119,4 @@
 msgid "KSnapshot"
 msgstr "KSnapshot"
-
-#. +> trunk stable
-#: libs/libkipi/kipiplugin.desktop:5
-msgctxt "Name"
-msgid "KIPIPlugin"
-msgstr "KIPI-prikljuÄak"
-
-#. +> trunk stable
-#: libs/libkipi/kipiplugin.desktop:58
-msgctxt "Comment"
-msgid "A KIPI Plugin"
-msgstr "KIPI-prikljuÄak"
 
 #. +> trunk stable
@@ -424,46 +370,4 @@
 
 #. +> trunk stable
-#: strigi-analyzer/dds/kfile_dds.desktop:3
-msgctxt "Name"
-msgid "DirectDraw Surface Info"
-msgstr "Informacije DirectDraw Surfacea"
-
-#. +> trunk stable
-#: strigi-analyzer/exr/kfile_exr.desktop:3
-msgctxt "Name"
-msgid "EXR Info"
-msgstr "EXR-informacije"
-
-#. +> trunk stable
-#: strigi-analyzer/pnm/kfile_pnm.desktop:3
-msgctxt "Name"
-msgid "PNM Info"
-msgstr "PNM-informacije"
-
-#. +> trunk stable
-#: strigi-analyzer/raw/kfile_raw.desktop:3
-msgctxt "Name"
-msgid "RAW Camera Files"
-msgstr "Datoteke RAW"
-
-#. +> trunk stable
-#: strigi-analyzer/rgb/kfile_rgb.desktop:3
-msgctxt "Name"
-msgid "SGI Image (RGB)"
-msgstr "SGI-slika (RGB)"
-
-#. +> trunk stable
-#: strigi-analyzer/tiff/kfile_tiff.desktop:3
-msgctxt "Name"
-msgid "TIFF File Meta Info"
-msgstr "Meta informacije o TIFF-u"
-
-#. +> trunk stable
-#: strigi-analyzer/xps/kfile_xps.desktop:3
-msgctxt "Name"
-msgid "XML Paper Specification Info"
-msgstr "Informacije XML Paper Specificationa"
-
-#. +> trunk stable
 #: svgpart/svgpart.desktop:3
 msgctxt "Name"
@@ -471,21 +375,85 @@
 msgstr "Svg Part"
 
-#. +> trunk stable
-#: thumbnailers/mobi/mobithumbnail.desktop:3
-msgctxt "Name"
-msgid "Mobipocket Files"
-msgstr "Mobipocket datoteke"
-
-#. +> trunk stable
-#: thumbnailers/ps/gsthumbnail.desktop:3
-msgctxt "Name"
-msgid "PostScript, PDF and DVI Files"
-msgstr "Datoteke oblika PostScript, PDF i DVI"
-
-#. +> trunk stable
-#: thumbnailers/raw/rawthumbnail.desktop:3
-msgctxt "Name"
-msgid "RAW Photo Camera Files"
-msgstr "Fotografske datoteke RAW"
+#. +> stable
+#: kamera/kcontrol/kamera.desktop:2
+msgctxt "Comment"
+msgid "Configure Kamera"
+msgstr "PodeÅ¡avanje kamere"
+
+#. +> stable
+#: kamera/kcontrol/kamera.desktop:120
+msgctxt "Name"
+msgid "Digital Camera"
+msgstr "Digitalna kamera"
+
+#. +> stable
+#: kamera/solid_camera.desktop:9
+msgctxt "Name"
+msgid "Open with File Manager"
+msgstr "Otvori s preglednikom datoteka"
+
+#~ msgctxt "GenericName"
+#~ msgid "Color Chooser"
+#~ msgstr "Izbornik boja"
+
+#~ msgctxt "Name"
+#~ msgid "KColorChooser"
+#~ msgstr "Izbornik boja"
+
+#~ msgctxt "Comment"
+#~ msgid "A monitor calibration tool"
+#~ msgstr "Alat za uÅ¡timavanje monitora"
+
+#~ msgctxt "Name"
+#~ msgid "Gamma"
+#~ msgstr "Gama"
+
+#~ msgctxt "Name"
+#~ msgid "KIPIPlugin"
+#~ msgstr "KIPI-prikljuÄak"
+
+#~ msgctxt "Comment"
+#~ msgid "A KIPI Plugin"
+#~ msgstr "KIPI-prikljuÄak"
+
+#~ msgctxt "Name"
+#~ msgid "DirectDraw Surface Info"
+#~ msgstr "Informacije DirectDraw Surfacea"
+
+#~ msgctxt "Name"
+#~ msgid "EXR Info"
+#~ msgstr "EXR-informacije"
+
+#~ msgctxt "Name"
+#~ msgid "PNM Info"
+#~ msgstr "PNM-informacije"
+
+#~ msgctxt "Name"
+#~ msgid "RAW Camera Files"
+#~ msgstr "Datoteke RAW"
+
+#~ msgctxt "Name"
+#~ msgid "SGI Image (RGB)"
+#~ msgstr "SGI-slika (RGB)"
+
+#~ msgctxt "Name"
+#~ msgid "TIFF File Meta Info"
+#~ msgstr "Meta informacije o TIFF-u"
+
+#~ msgctxt "Name"
+#~ msgid "XML Paper Specification Info"
+#~ msgstr "Informacije XML Paper Specificationa"
+
+#~ msgctxt "Name"
+#~ msgid "Mobipocket Files"
+#~ msgstr "Mobipocket datoteke"
+
+#~ msgctxt "Name"
+#~ msgid "PostScript, PDF and DVI Files"
+#~ msgstr "Datoteke oblika PostScript, PDF i DVI"
+
+#~ msgctxt "Name"
+#~ msgid "RAW Photo Camera Files"
+#~ msgstr "Fotografske datoteke RAW"
 
 #~ msgctxt "Name"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdelibs/kdelibs4.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdelibs/kdelibs4.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdelibs/kdelibs4.po	(revision 816)
@@ -11,5 +11,5 @@
 "Project-Id-Version: kdelibs4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-15 10:33+0100\n"
+"POT-Creation-Date: 2011-02-20 11:26+0100\n"
 "PO-Revision-Date: 2010-06-17 22:35+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -5342,5 +5342,5 @@
 
 #. +> trunk stable
-#: kdeui/dialogs/kedittoolbar.cpp:602 khtml/html/html_formimpl.cpp:1836
+#: kdeui/dialogs/kedittoolbar.cpp:602 khtml/html/html_formimpl.cpp:1839
 #: khtml/khtmlview.cpp:2811 khtml/khtmlview.cpp:2844
 msgid "Reset"
@@ -10212,10 +10212,10 @@
 
 #. +> trunk stable
-#: khtml/ecma/kjs_html.cpp:2168 khtml/ecma/kjs_window.cpp:1650
+#: khtml/ecma/kjs_html.cpp:2174 khtml/ecma/kjs_window.cpp:1650
 msgid "Confirmation: JavaScript Popup"
 msgstr "Potvrda: JavaScript skoÄni prozor"
 
 #. +> trunk stable
-#: khtml/ecma/kjs_html.cpp:2170
+#: khtml/ecma/kjs_html.cpp:2176
 msgid ""
 "This site is submitting a form which will open up a new browser window via JavaScript.\n"
@@ -10226,5 +10226,5 @@
 
 #. +> trunk stable
-#: khtml/ecma/kjs_html.cpp:2173
+#: khtml/ecma/kjs_html.cpp:2179
 #, kde-format
 msgid "<qt>This site is submitting a form which will open <p>%1</p> in a new browser window via JavaScript.<br />Do you want to allow the form to be submitted?</qt>"
@@ -10232,10 +10232,10 @@
 
 #. +> trunk stable
-#: khtml/ecma/kjs_html.cpp:2175 khtml/ecma/kjs_window.cpp:1658
+#: khtml/ecma/kjs_html.cpp:2181 khtml/ecma/kjs_window.cpp:1658
 msgid "Allow"
 msgstr "Dopustiti"
 
 #. +> trunk stable
-#: khtml/ecma/kjs_html.cpp:2175 khtml/ecma/kjs_window.cpp:1658
+#: khtml/ecma/kjs_html.cpp:2181 khtml/ecma/kjs_window.cpp:1658
 msgid "Do Not Allow"
 msgstr "Nemoj dopustiti"
@@ -10335,5 +10335,5 @@
 
 #. +> trunk stable
-#: khtml/html/html_formimpl.cpp:1632 khtml/html/html_formimpl.cpp:1844
+#: khtml/html/html_formimpl.cpp:1635 khtml/html/html_formimpl.cpp:1847
 #: khtml/khtml_part.cpp:4761 khtml/khtmlview.cpp:2797 khtml/khtmlview.cpp:2839
 msgid "Submit"
@@ -10341,5 +10341,5 @@
 
 #. +> trunk stable
-#: khtml/html/html_formimpl.cpp:2688
+#: khtml/html/html_formimpl.cpp:2701
 msgid "Key Generator"
 msgstr "Generator tipke"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/desktop_kdenetwork.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/desktop_kdenetwork.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/desktop_kdenetwork.po	(revision 816)
@@ -8,5 +8,5 @@
 "Project-Id-Version: desktop_kdenetwork 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-17 09:13+0100\n"
+"POT-Creation-Date: 2011-02-20 11:26+0100\n"
 "PO-Revision-Date: 2010-05-26 11:57+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -23,17 +23,5 @@
 
 #. +> trunk stable
-#: filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop:20
-msgctxt "Comment"
-msgid "A module to configure shares for Microsoft Windows"
-msgstr "Modul za podeÅ¡avanje dijeljenja za Microsoft Windows"
-
-#. +> trunk stable
-#: filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop:114
-msgctxt "Name"
-msgid "Samba"
-msgstr "Samba"
-
-#. +> trunk stable
-#: filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop:4
+#: filesharing/samba/filepropertiesplugin/sambausershareplugin.desktop:4
 msgctxt "Name"
 msgid "Fileshare Konqueror Directory Properties Page"
@@ -41,20 +29,8 @@
 
 #. +> trunk stable
-#: filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop:67
+#: filesharing/samba/filepropertiesplugin/sambausershareplugin.desktop:67
 msgctxt "Comment"
 msgid "Konqueror properties dialog plugin to share a directory with the local network"
 msgstr "Dijalogni prikljuÄak postavki za Konqueror za dijeljenje direktorija na lokalnoj mreÅŸi"
-
-#. +> trunk stable
-#: filesharing/simple/fileshare.desktop:11
-msgctxt "Name"
-msgid "File Sharing"
-msgstr "Dijeljenje datoteka"
-
-#. +> trunk stable
-#: filesharing/simple/fileshare.desktop:83
-msgctxt "Comment"
-msgid "Enable or disable file sharing"
-msgstr "OmoguÄi ili onemoguÄi dijeljenje datoteka"
 
 #. +> trunk stable
@@ -846,5 +822,5 @@
 
 #. +> trunk
-#: kopete/kopete/kopete.notifyrc:3043
+#: kopete/kopete/kopete.notifyrc:3044
 #, fuzzy
 #| msgctxt "Comment"
@@ -861,5 +837,5 @@
 
 #. +> trunk
-#: kopete/kopete/kopete.notifyrc:3058
+#: kopete/kopete/kopete.notifyrc:3060
 #, fuzzy
 msgctxt "Name"
@@ -868,5 +844,5 @@
 
 #. +> trunk
-#: kopete/kopete/kopete.notifyrc:3074
+#: kopete/kopete/kopete.notifyrc:3077
 #, fuzzy
 #| msgctxt "Comment"
@@ -1781,4 +1757,28 @@
 msgstr "Primio sam neoÄekivanu vezu, prekid"
 
+#. +> stable
+#: filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop:20
+msgctxt "Comment"
+msgid "A module to configure shares for Microsoft Windows"
+msgstr "Modul za podeÅ¡avanje dijeljenja za Microsoft Windows"
+
+#. +> stable
+#: filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop:114
+msgctxt "Name"
+msgid "Samba"
+msgstr "Samba"
+
+#. +> stable
+#: filesharing/simple/fileshare.desktop:11
+msgctxt "Name"
+msgid "File Sharing"
+msgstr "Dijeljenje datoteka"
+
+#. +> stable
+#: filesharing/simple/fileshare.desktop:83
+msgctxt "Comment"
+msgid "Enable or disable file sharing"
+msgstr "OmoguÄi ili onemoguÄi dijeljenje datoteka"
+
 #~ msgctxt "Name"
 #~ msgid "DNS-SD Services Watcher"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/kfileshare.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/kfileshare.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/kfileshare.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-01-11 10:27+0100\n"
+"POT-Creation-Date: 2011-02-20 11:26+0100\n"
 "PO-Revision-Date: 2009-09-04 22:34+0200\n"
 "Last-Translator: Zarko Pintar <zarko.pintar@gmail.com>\n"
@@ -20,5 +20,79 @@
 "X-Text-Markup: kde4\n"
 
+#. +> trunk
+#: samba/filepropertiesplugin/delegate.cpp:40
+#, fuzzy
+msgid "---"
+msgstr "---"
+
+#. +> trunk
+#: samba/filepropertiesplugin/delegate.cpp:41
+#, fuzzy
+#| msgid "&All contacts"
+msgid "Full Control"
+msgstr "Odabrana polja"
+
+#. +> trunk
+#: samba/filepropertiesplugin/delegate.cpp:42
+#, fuzzy
+msgid "Read Only"
+msgstr "Samo za Äitanje"
+
+#. +> trunk
+#: samba/filepropertiesplugin/delegate.cpp:43
+#, fuzzy
+msgid "Deny"
+msgstr "Odbij"
+
 #. +> trunk stable
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:62
+#, fuzzy
+msgid "&Share"
+msgstr "&Dijeljeno"
+
+#. +> trunk
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:74
+#, fuzzy
+msgid "Samba is not installed on your system."
+msgstr "3D efekti nisu podrÅŸani od strane vaÅ¡eg raÄunala."
+
+#. +> trunk
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:76
+#, fuzzy
+msgid "Install Samba..."
+msgstr "Instaliraj temuÂ âŠ"
+
+#. +> trunk
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:127
+msgid "<qt><strong>Samba could not be installed.</strong><br />Please, check if kpackagekit is properly installed</qt>"
+msgstr ""
+
+#. +> trunk stable
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:205
+#, kde-format
+msgid "<qt>There is already a share with the name <strong>%1</strong>.<br /> Please choose another name.</qt>"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, sambaChk)
+#. +> trunk
+#: samba/filepropertiesplugin/sambausershareplugin.ui:19
+msgid "Share with S&amba (Microsoft Windows)"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. +> trunk stable
+#: samba/filepropertiesplugin/sambausershareplugin.ui:36
+#, fuzzy
+msgid "Name:"
+msgstr "Ime:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, sambaAllowGuestChk)
+#. +> trunk
+#: samba/filepropertiesplugin/sambausershareplugin.ui:56
+#, fuzzy
+msgid "Allow Guests"
+msgstr "Dozvoljeni korisnici"
+
+#. +> stable
 #: advanced/kcm_sambaconf/dictmanager.cpp:64
 #, kde-format
@@ -27,5 +101,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog, ExpertUserDlg)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:13
 msgid "User Settings"
@@ -33,5 +107,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:30
 msgid "&Valid users:"
@@ -39,5 +113,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:54
 msgid "&Admin users:"
@@ -45,5 +119,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:78
 msgid "&Invalid users:"
@@ -52,5 +126,5 @@
 #. i18n: ectx: property (text), widget (QPushButton)
 #. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:128
 #: advanced/kcm_sambaconf/filemodedlg.ui:374
@@ -66,5 +140,5 @@
 #. i18n: ectx: property (text), widget (QPushButton)
 #. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:144
 #: advanced/kcm_sambaconf/filemodedlg.ui:388
@@ -79,5 +153,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:183
 msgid "&Write list:"
@@ -85,5 +159,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/expertuserdlg.ui:210
 msgid "&Read list:"
@@ -91,5 +165,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:16
 msgid "Access Modifiers"
@@ -97,5 +171,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:34
 #, fuzzy
@@ -104,5 +178,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:103
 #, fuzzy
@@ -111,5 +185,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:115
 #, fuzzy
@@ -119,5 +193,5 @@
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:139
 #: advanced/kcm_sambaconf/share.ui:2274
@@ -127,5 +201,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:151
 #, fuzzy
@@ -135,5 +209,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:235
 #: advanced/kcm_sambaconf/share.ui:603
@@ -144,5 +218,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:259
 #: advanced/kcm_sambaconf/share.ui:608
@@ -152,5 +226,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:283
 #, fuzzy
@@ -159,5 +233,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:295
 #, fuzzy
@@ -166,5 +240,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:307
 #, fuzzy
@@ -173,5 +247,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:319
 #, fuzzy
@@ -181,5 +255,5 @@
 #. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
 #. i18n: ectx: property (text), widget (QPushButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:343
 #: advanced/kcm_sambaconf/share.ui:2539
@@ -191,5 +265,5 @@
 #. i18n: ectx: property (shortcut), widget (QPushButton, buttonHelp)
 #. i18n: ectx: property (accel), widget (QPushButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/filemodedlg.ui:346
 #: advanced/kcm_sambaconf/share.ui:2542
@@ -200,5 +274,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:16
 msgid "Select Groups"
@@ -206,5 +280,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:136
 msgid "Selec&t Groups"
@@ -218,5 +292,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
 #. i18n: ectx: property (text), widget (QTable)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:151
 #: advanced/kcm_sambaconf/kcminterface.ui:613
@@ -233,5 +307,5 @@
 #. i18n: ectx: property (text), widget (QListView)
 #. i18n: ectx: property (text), widget (QTable)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:162
 #: advanced/kcm_sambaconf/userselectdlg.ui:73
@@ -242,5 +316,5 @@
 
 #. i18n: ectx: property (title), widget (QButtonGroup)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:201
 #: advanced/kcm_sambaconf/userselectdlg.ui:104
@@ -250,5 +324,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:226
 #: advanced/kcm_sambaconf/userselectdlg.ui:121
@@ -258,5 +332,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:248
 #: advanced/kcm_sambaconf/userselectdlg.ui:135
@@ -265,5 +339,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:267
 #: advanced/kcm_sambaconf/userselectdlg.ui:146
@@ -272,5 +346,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:286
 #: advanced/kcm_sambaconf/userselectdlg.ui:157
@@ -279,5 +353,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:305
 #: advanced/kcm_sambaconf/userselectdlg.ui:168
@@ -286,5 +360,5 @@
 
 #. i18n: ectx: property (title), widget (QButtonGroup)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:318
 msgid "&Kind of Group"
@@ -292,5 +366,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:343
 msgid "&UNIX group"
@@ -298,5 +372,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:368
 msgid "NI&S group"
@@ -304,10 +378,10 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/groupselectdlg.ui:393
 msgid "UNIX and NIS gr&oup"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:119
 #, fuzzy
@@ -316,5 +390,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, vetoChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:120
 #: advanced/kcm_sambaconf/share.ui:644
@@ -322,30 +396,30 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:121
 msgid "&Veto Oplock"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:389
 msgid "<qt>Some files you have selected are hidden because they start with a dot; do you want to uncheck all files starting with a dot?</qt>"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:390
 msgid "Files Starting With Dot"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:390
 msgid "Uncheck Hidden"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:390
 msgid "Keep Hidden"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:409
 #, kde-format
@@ -353,15 +427,15 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:411
 msgid "Wildcarded String"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:411
 msgid "Uncheck Matches"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:411
 msgid "Keep Selected"
@@ -369,5 +443,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui:16
 msgid "Join Domain"
@@ -375,5 +449,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui:109
 #, fuzzy
@@ -382,5 +456,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui:120
 #, fuzzy
@@ -389,5 +463,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui:131
 #, fuzzy
@@ -396,5 +470,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui:142
 msgid "Domain co&ntroller:"
@@ -402,5 +476,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui:153
 #, fuzzy
@@ -408,5 +482,5 @@
 msgstr "&Domena:"
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui.h:15
 #, fuzzy
@@ -414,5 +488,5 @@
 msgstr "Åœalim"
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/joindomaindlg.ui.h:15
 #, fuzzy
@@ -420,5 +494,5 @@
 msgstr "Upisali ste dvije razliÄite zaporke. PokuÅ¡ajte ponovno."
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.cpp:74
 #: advanced/kcm_sambaconf/kcminterface.ui.h:63
@@ -426,5 +500,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.cpp:82
 #: advanced/kcm_sambaconf/kcminterface.ui.h:71
@@ -432,5 +506,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.cpp:91
 #: advanced/kcm_sambaconf/kcminterface.ui.h:80
@@ -438,5 +512,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.cpp:99
 #: advanced/kcm_sambaconf/kcminterface.ui.h:88
@@ -444,5 +518,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.cpp:107
 #: advanced/kcm_sambaconf/kcminterface.ui.h:96
@@ -451,5 +525,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QTabWidget, mainTab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:72
 msgid ""
@@ -473,5 +547,5 @@
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
 #. i18n: ectx: attribute (title), widget (QWidget, baseTab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:79 advanced/kcm_sambaconf/share.ui:47
 msgid "&Base Settings"
@@ -479,5 +553,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:102
 msgid "Samba config file:"
@@ -485,5 +559,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, loadBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:121
 #, fuzzy
@@ -492,5 +566,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:133
 msgid "Server Identification"
@@ -498,5 +572,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:160
 msgid "Wor&kgroup:"
@@ -504,5 +578,5 @@
 
 #. i18n: ectx: property (toolTip), widget (KLineEdit, workgroupEdit)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:176
 msgid "Enter here the name of your workgroup/domain."
@@ -510,5 +584,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:200
 msgid "Server strin&g:"
@@ -516,5 +590,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:216
 msgid "NetBIOS name:"
@@ -522,5 +596,5 @@
 
 #. i18n: ectx: property (title), widget (Q3ButtonGroup, securityLevelBtnGrp)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:235
 msgid "Securit&y Level"
@@ -528,5 +602,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, shareRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:276
 #, fuzzy
@@ -544,5 +618,5 @@
 #. i18n: ectx: property (shortcut), widget (QCheckBox, bindInterfacesOnlyChk)
 #. i18n: ectx: property (shortcut), widget (QCheckBox, unixExtensionsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:279
 #: advanced/kcm_sambaconf/kcminterface.ui:295
@@ -559,5 +633,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, userRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:292
 #, fuzzy
@@ -567,5 +641,5 @@
 #. i18n: ectx: property (text), widget (QRadioButton, serverRadio)
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox13_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:305
 #: advanced/kcm_sambaconf/kcminterface.ui:2279
@@ -575,5 +649,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, domainRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:318
 msgid "Domai&n"
@@ -581,5 +655,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, adsRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:328
 msgid "ADS"
@@ -587,5 +661,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, securityLevelHelpLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:349
 msgid "Use the <i>share</i> security level if you have a home network or a small office network.<br> It allows everyone to read all share names before a login is required."
@@ -593,5 +667,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox12)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:374
 msgid "Further Options"
@@ -599,5 +673,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, passwordServerLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:386
 msgid "Password server address/name:"
@@ -605,5 +679,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, realmLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:412
 msgid "Real&m:"
@@ -611,5 +685,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, allowGuestLoginsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:441
 msgid "Allo&w guest logins"
@@ -617,5 +691,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:477
 msgid "Guest acc&ount:"
@@ -623,5 +697,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox10)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:521
 #, fuzzy
@@ -630,5 +704,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:536
 msgid "For detailed help about every option please look at:"
@@ -636,5 +710,5 @@
 
 #. i18n: ectx: property (text), widget (KUrlLabel, KUrlLabel1)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:555
 msgid "man:smb.conf"
@@ -642,5 +716,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, shareTab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:579
 msgid "&Shares"
@@ -649,5 +723,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, shareListView)
 #. i18n: ectx: property (text), widget (K3ListView, listView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:618 simple/controlcenter.ui:265
 #, fuzzy
@@ -657,5 +731,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, shareListView)
 #. i18n: ectx: property (text), widget (K3ListView, printerListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:623
 #: advanced/kcm_sambaconf/kcminterface.ui:744
@@ -666,5 +740,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, shareListView)
 #. i18n: ectx: property (text), widget (K3ListView, printerListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:628
 #: advanced/kcm_sambaconf/kcminterface.ui:749
@@ -674,5 +748,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, editDefaultShareBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:653
 msgid "Edit Defau&lts..."
@@ -680,5 +754,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, addShareBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:673
 msgid "Add &New Share..."
@@ -686,5 +760,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, editShareBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:680
 msgid "Edit Share..."
@@ -692,5 +766,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, removeShareBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:690
 msgid "Re&move Share"
@@ -698,5 +772,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:700
 msgid "Prin&ters"
@@ -704,5 +778,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, printerListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:739
 #, fuzzy
@@ -711,5 +785,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, editDefaultPrinterBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:774
 msgid "Edit Defau&lts"
@@ -717,5 +791,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, addPrinterBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:794
 msgid "Add Ne&w Printer"
@@ -723,5 +797,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, editPrinterBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:801
 msgid "Edit Pri&nter"
@@ -729,5 +803,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, removePrinterBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:808
 msgid "Re&move Printer"
@@ -735,5 +809,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:818
 #: advanced/kcm_sambaconf/printerdlgimpl.cpp:113
@@ -744,5 +818,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox51_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:856
 msgid "Sa&mba Users"
@@ -753,5 +827,5 @@
 #. i18n: ectx: property (text), widget (K3ListView, unixUsersListView)
 #. i18n: ectx: property (text), widget (QTable)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:889
 #: advanced/kcm_sambaconf/kcminterface.ui:1039
@@ -765,5 +839,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, clientSigningCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, serverSigningCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:894
 #: advanced/kcm_sambaconf/kcminterface.ui:2216
@@ -774,5 +848,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, sambaUsersListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:899
 msgid "No Password"
@@ -780,5 +854,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, addSambaUserBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:949
 #, fuzzy
@@ -788,5 +862,5 @@
 #. i18n: ectx: property (text), widget (QPushButton, removeSambaUserBtn)
 #. i18n: ectx: property (text), widget (KPushButton, removeShareBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:981 simple/controlcenter.ui:336
 msgid "Rem&ove"
@@ -794,5 +868,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox52_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1006
 msgid "UNI&X Users"
@@ -800,5 +874,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, sambaUserPasswordBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1069
 #, fuzzy
@@ -807,5 +881,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, joinADomainBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1079
 msgid "&Join Domain"
@@ -813,5 +887,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, advanced)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1102
 msgid "Advan&ced"
@@ -819,5 +893,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1183
 #: advanced/kcm_sambaconf/share.ui:887
@@ -829,5 +903,5 @@
 #. i18n: ectx: attribute (title), widget (QWidget, advancedDumpTab)
 #. i18n: ectx: attribute (title), widget (QWidget, advancedDumpTabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1196
 #: advanced/kcm_sambaconf/share.ui:900
@@ -836,5 +910,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1224
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:320
@@ -847,5 +921,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox52)
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox59)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1252
 #: advanced/kcm_sambaconf/kcminterface.ui:3210
@@ -856,5 +930,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox66)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1292
 msgid "PAM"
@@ -862,5 +936,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, obeyPamRestrictionsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1316
 msgid "Obey PAM restrictions"
@@ -868,5 +942,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, pamPasswordChangeChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1329
 msgid "PAM password change"
@@ -874,5 +948,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox67)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1342
 msgid "Other Switches"
@@ -880,5 +954,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, allowTrustedDomainsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1366
 msgid "A&llow trusted domains"
@@ -886,5 +960,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, paranoidServerSecurityChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1373
 msgid "Paranoid server security"
@@ -894,5 +968,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox36_2)
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox58)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1386
 #: advanced/kcm_sambaconf/kcminterface.ui:2472
@@ -903,5 +977,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_2_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1413
 msgid "Auth methods:"
@@ -909,5 +983,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1429
 msgid "Root director&y:"
@@ -915,5 +989,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1442
 msgid "I&nterfaces:"
@@ -921,5 +995,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1464
 msgid "Map to guest:"
@@ -927,5 +1001,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, bindInterfacesOnlyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1477
 msgid "Bind interfaces only"
@@ -933,5 +1007,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, mapToGuestCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1488
 #, fuzzy
@@ -940,5 +1014,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, mapToGuestCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1493
 msgid "Bad User"
@@ -946,5 +1020,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, mapToGuestCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1498
 msgid "Bad Password"
@@ -952,5 +1026,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1509
 msgid "Hosts e&quiv:"
@@ -958,5 +1032,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_7_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1548
 msgid "Algorithmic rid base:"
@@ -964,5 +1038,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_2_3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1584
 msgid "Private dir:"
@@ -970,5 +1044,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1608
 msgid "Pass&word"
@@ -976,5 +1050,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox75)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1614
 msgid "Samba Passwords"
@@ -982,5 +1056,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, encryptPasswordsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1641
 msgid "E&ncrypt passwords"
@@ -988,5 +1062,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1654
 msgid "Smb passwd file:"
@@ -994,5 +1068,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1677
 msgid "Passdb bac&kend:"
@@ -1000,5 +1074,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1707
 msgid "Passwd chat:"
@@ -1006,5 +1080,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, passwdChatDebugChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1723
 msgid "Passwd chat debug"
@@ -1020,5 +1094,5 @@
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_5_2_4_2_2_2)
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_5_4_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1730
 #: advanced/kcm_sambaconf/kcminterface.ui:1854
@@ -1035,5 +1109,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1743
 msgid "Passwd chat timeout:"
@@ -1041,5 +1115,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox74)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1766
 #, fuzzy
@@ -1048,5 +1122,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, nullPasswordsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1775
 msgid "Nu&ll passwords"
@@ -1054,5 +1128,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_7)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1785
 msgid "Password level:"
@@ -1060,5 +1134,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1811
 msgid "Min password length:"
@@ -1066,5 +1140,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1834
 msgid "Machine password timeout:"
@@ -1072,5 +1146,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox73)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1880
 msgid "Migration"
@@ -1078,5 +1152,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, updateEncryptedChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1904
 msgid "Update encr&ypted"
@@ -1084,5 +1158,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox76)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1914
 msgid "UNIX Passwords"
@@ -1090,5 +1164,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_2_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1941
 msgid "Passwd program:"
@@ -1096,5 +1170,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, unixPasswordSyncChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1964
 msgid "UNI&X password sync"
@@ -1102,5 +1176,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:1991
 msgid "Userna&me"
@@ -1108,5 +1182,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2018
 msgid "User&name map:"
@@ -1114,5 +1188,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2041
 msgid "Username &level:"
@@ -1120,5 +1194,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hideLocalUsersChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2067
 msgid "Hide local users"
@@ -1126,5 +1200,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, restrictAnonymousChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2077
 msgid "Restrict anon&ymous"
@@ -1132,5 +1206,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, useRhostsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2087
 msgid "Use rhosts"
@@ -1138,5 +1212,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2124
 msgid "Authenticati&on"
@@ -1144,5 +1218,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox13)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2148
 #, fuzzy
@@ -1151,5 +1225,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2172
 msgid "C&lient signing:"
@@ -1157,5 +1231,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, clientPlaintextAuthChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2188
 msgid "Client plainte&xt authentication"
@@ -1163,5 +1237,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, clientLanmanAuthChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2198
 msgid "Client lanman authentication"
@@ -1176,5 +1250,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, caseSensitiveCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, strictLockingCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2206
 #: advanced/kcm_sambaconf/kcminterface.ui:2235
@@ -1190,5 +1264,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, clientSigningCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, serverSigningCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2211
 #: advanced/kcm_sambaconf/kcminterface.ui:2332
@@ -1202,5 +1276,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, caseSensitiveCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, strictLockingCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2225
 #: advanced/kcm_sambaconf/kcminterface.ui:2346
@@ -1218,5 +1292,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, caseSensitiveCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, strictLockingCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2230
 #: advanced/kcm_sambaconf/kcminterface.ui:2351
@@ -1229,5 +1303,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2243
 msgid "Client channel:"
@@ -1235,5 +1309,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, clientUseSpnegoChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2259
 msgid "Client use spnego"
@@ -1241,5 +1315,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, clientNTLMv2AuthChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2269
 msgid "Client NTLMv&2 authentication"
@@ -1247,5 +1321,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_2_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2303
 msgid "Server signing:"
@@ -1253,5 +1327,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, lanmanAuthChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2319
 msgid "Lanman authentication"
@@ -1259,5 +1333,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_2_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2364
 msgid "Server channel:"
@@ -1265,5 +1339,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, useSpnegoChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2380
 msgid "Use sp&nego"
@@ -1271,5 +1345,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, ntlmAuthChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2390
 msgid "NTLM authentication"
@@ -1277,5 +1351,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2421
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:323
@@ -1285,5 +1359,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_3_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2496
 msgid "L&og file:"
@@ -1291,5 +1365,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2512
 msgid "kB"
@@ -1297,5 +1371,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2522
 msgid "Ma&x log size:"
@@ -1303,5 +1377,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_3_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2535
 msgid "S&yslog:"
@@ -1309,5 +1383,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2567
 msgid "Log &level:"
@@ -1317,5 +1391,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox49)
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox70)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2593
 #: advanced/kcm_sambaconf/kcminterface.ui:3407
@@ -1325,5 +1399,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, syslogOnlyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2620
 msgid "Syslog o&nly"
@@ -1331,5 +1405,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, statusChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2627
 #, fuzzy
@@ -1338,5 +1412,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, timestampChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2643
 msgid "Ti&mestamp"
@@ -1345,5 +1419,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, microsecondsChk)
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2656
 #: advanced/kcm_sambaconf/kcminterface.ui:4252
@@ -1352,5 +1426,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, debugPidChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2669
 msgid "Debug pid"
@@ -1358,5 +1432,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, debugUidChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2676
 msgid "Debu&g uid"
@@ -1364,5 +1438,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2706
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:326
@@ -1372,5 +1446,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox37_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2712
 #, fuzzy
@@ -1379,5 +1453,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2733
 msgid "Pre&load modules:"
@@ -1385,5 +1459,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox44)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2752
 msgid "Switches"
@@ -1391,5 +1465,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, getwdCacheChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2773
 msgid "&Getwd cache"
@@ -1397,5 +1471,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, useMmapChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2780
 msgid "Use &mmap"
@@ -1403,5 +1477,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, kernelChangeNotifyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2787
 msgid "Kernel change notif&y"
@@ -1409,5 +1483,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hostnameLookupsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2794
 msgid "H&ostname lookups"
@@ -1415,5 +1489,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, readRawChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2804
 msgid "Read ra&w"
@@ -1421,5 +1495,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, writeRawChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2817
 msgid "Write raw"
@@ -1427,5 +1501,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox45)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2830
 msgid "Times"
@@ -1433,5 +1507,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2854
 msgid "Change notify timeout:"
@@ -1439,5 +1513,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2877
 msgid "&Keepalive:"
@@ -1445,5 +1519,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2914
 msgctxt "minutes"
@@ -1452,5 +1526,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2924
 msgid "Deadtime:"
@@ -1458,5 +1532,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2944
 msgid "Lp&q cache time:"
@@ -1464,5 +1538,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:2984
 msgid "&Name cache timeout:"
@@ -1470,5 +1544,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox46)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3007
 #, fuzzy
@@ -1477,5 +1551,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_2_2_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3013
 msgid "Max disk size:"
@@ -1483,5 +1557,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_3_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3033
 msgctxt "mega byte"
@@ -1490,5 +1564,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_2_2_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3056
 msgid "Read si&ze:"
@@ -1496,5 +1570,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_2_2_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3076
 msgid "Stat cache size:"
@@ -1502,5 +1576,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_4_2_7_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3099
 msgid "Ma&x xmit:"
@@ -1508,5 +1582,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox47)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3125
 #, fuzzy
@@ -1516,5 +1590,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3131
 msgid "Max smbd processes:"
@@ -1522,5 +1596,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_3_2_2_2_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3164
 msgid "Max open files:"
@@ -1528,5 +1602,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3204
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:335
@@ -1536,5 +1610,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3216
 msgid "Total print &jobs:"
@@ -1542,5 +1616,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox51)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3252
 msgid "Drivers"
@@ -1548,5 +1622,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3276
 msgid "OS&2 driver map:"
@@ -1554,5 +1628,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_3_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3289
 msgid "Printcap na&me:"
@@ -1560,5 +1634,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, printerDriverLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3313
 msgid "Pri&nter driver file: "
@@ -1567,5 +1641,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox50)
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3332
 #: advanced/kcm_sambaconf/kcminterface.ui:6988
@@ -1576,5 +1650,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3356
 msgid "Enumports command:"
@@ -1582,5 +1656,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3369
 msgid "Addprinter command:"
@@ -1588,5 +1662,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3382
 msgid "Deleteprinter command:"
@@ -1594,5 +1668,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, loadPrintersChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3428
 msgid "L&oad printers"
@@ -1600,5 +1674,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, disableSpoolssChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3435
 msgid "Disab&le spools"
@@ -1606,5 +1680,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, showAddPrinterWizardChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3442
 msgid "Show add printer wi&zard"
@@ -1612,5 +1686,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3469
 #, fuzzy
@@ -1619,5 +1693,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, localMasterChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3512
 msgid "L&ocal master"
@@ -1625,5 +1699,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, domainMasterChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3519
 msgid "Domai&n master"
@@ -1631,5 +1705,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, domainLogonsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3526
 msgid "Domain lo&gons"
@@ -1637,5 +1711,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, preferredMasterChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3539
 msgid "Preferred &master"
@@ -1643,5 +1717,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3552
 msgid "OS &level:"
@@ -1649,5 +1723,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3568
 msgid "Domain admin group:"
@@ -1655,5 +1729,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_3_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3584
 msgid "Domain guest group:"
@@ -1661,5 +1735,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3630
 msgid "WINS"
@@ -1667,5 +1741,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, noWinsSupportRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3660
 msgid "Deactivate &WINS"
@@ -1673,5 +1747,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, winsSupportRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3673
 msgid "Act as a WI&NS server"
@@ -1679,5 +1753,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, otherWinsRadio)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3680
 msgid "Use an&other WINS server"
@@ -1685,5 +1759,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox35)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3693
 msgid "WINS Server Settin&gs"
@@ -1691,5 +1765,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, dnsProxyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3702
 msgid "DNS prox&y"
@@ -1697,5 +1771,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, winsHookLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3715
 msgid "WINS hoo&k:"
@@ -1703,5 +1777,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_4_2_4_3_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3738
 msgid "Max WINS tt&l:"
@@ -1709,5 +1783,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_4_2_5_3_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3790
 msgid "&Min WINS ttl:"
@@ -1715,5 +1789,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox36)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3832
 msgid "WINS Server IP or DNS Name"
@@ -1721,5 +1795,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox37)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3863
 #, fuzzy
@@ -1728,5 +1802,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3887
 msgid "WINS partners:"
@@ -1734,5 +1808,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winsProxyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3912
 msgid "WINS pro&xy"
@@ -1740,5 +1814,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3942
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:329
@@ -1748,5 +1822,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox54)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3948
 msgid "Ge&neral"
@@ -1754,5 +1828,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, stripDotChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3969
 msgid "Strip d&ot"
@@ -1760,5 +1834,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox55)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3979
 msgid "&Mangling"
@@ -1766,5 +1840,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:3991
 msgid "Mangled stac&k:"
@@ -1772,5 +1846,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4036
 msgid "Mangle prefi&x:"
@@ -1778,5 +1852,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox53)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4062
 msgid "Specia&l"
@@ -1784,5 +1858,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, statCacheChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4083
 msgid "Stat cache"
@@ -1790,5 +1864,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4110
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:332
@@ -1798,5 +1872,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, kernelOplocksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4137
 msgid "Use ker&nel oplocks"
@@ -1804,5 +1878,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox56)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4147
 msgid "Direct&ories"
@@ -1810,5 +1884,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4171
 msgid "Loc&k directory:"
@@ -1816,5 +1890,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4187
 msgid "Pid director&y:"
@@ -1822,5 +1896,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox57)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4206
 msgid "Lock Spin"
@@ -1828,5 +1902,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4212
 msgid "&Lock spin count:"
@@ -1834,5 +1908,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4232
 msgid "Lock spin ti&me:"
@@ -1840,5 +1914,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox58)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4278
 msgid "Very Advanced"
@@ -1846,5 +1920,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4287
 msgid "Oplock break &wait time:"
@@ -1853,5 +1927,5 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4310
 #: advanced/kcm_sambaconf/kcminterface.ui:6877
@@ -1860,5 +1934,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4353
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:341
@@ -1868,5 +1942,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox40)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4374
 msgid "Samba &3.x"
@@ -1874,5 +1948,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_4_2_2_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4401
 msgid "D&OS charset:"
@@ -1880,5 +1954,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_4_2_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4424
 msgid "UNI&X charset:"
@@ -1886,5 +1960,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_4_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4447
 msgid "Displa&y charset:"
@@ -1892,5 +1966,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, unicodeChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4467
 msgid "U&nicode"
@@ -1898,5 +1972,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox39)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4477
 msgid "Samba &2.x"
@@ -1904,5 +1978,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4501
 msgid "Character set:"
@@ -1910,5 +1984,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4524
 msgid "Va&lid chars:"
@@ -1916,5 +1990,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_4_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4550
 msgid "Code page directory:"
@@ -1922,5 +1996,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_4_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4573
 msgid "Codin&g system:"
@@ -1928,5 +2002,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4589
 msgid "Client code page:"
@@ -1935,5 +2009,5 @@
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox63)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4622
 #: advanced/kcm_sambaconf/kcminterface.ui:4927
@@ -1943,5 +2017,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox60)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4646
 msgid "Add Scripts"
@@ -1949,5 +2023,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4670
 msgid "Add user script:"
@@ -1955,5 +2029,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4686
 msgid "Add user to group script:"
@@ -1961,5 +2035,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4699
 msgid "Add gr&oup script:"
@@ -1967,5 +2041,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4718
 msgid "Add machine script:"
@@ -1973,5 +2047,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox61)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4753
 msgid "Delete Scripts"
@@ -1979,5 +2053,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4786
 msgid "Delete group script:"
@@ -1985,5 +2059,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4799
 msgid "Delete user script:"
@@ -1991,5 +2065,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4812
 msgid "Delete user from group script:"
@@ -1997,5 +2071,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox64)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4828
 msgid "Primary Group Script"
@@ -2003,5 +2077,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_5_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4849
 msgid "Set primar&y group script:"
@@ -2009,5 +2083,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox62)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4868
 #, fuzzy
@@ -2016,5 +2090,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4892
 msgid "Shutdo&wn script:"
@@ -2022,5 +2096,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4905
 msgid "Abort shutdown script:"
@@ -2028,5 +2102,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4951
 msgid "Logo&n path:"
@@ -2034,5 +2108,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4967
 msgid "Logon ho&me:"
@@ -2040,5 +2114,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4983
 msgid "&Logon drive:"
@@ -2046,5 +2120,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:4999
 msgid "Lo&gon script:"
@@ -2052,5 +2126,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5019
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:344
@@ -2059,5 +2133,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel15)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5042
 msgid "Socket address:"
@@ -2066,5 +2140,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox7)
 #. i18n: ectx: property (windowTitle), widget (QDialog)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5060
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:37
@@ -2073,5 +2147,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, TCP_NODELAYChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5066
 msgid "TCP_NODELA&Y"
@@ -2079,5 +2153,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, SO_SNDBUFChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5073
 msgid "SO_S&NDBUF:"
@@ -2086,5 +2160,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, IPTOS_LOWDELAYChk)
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5103
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:141
@@ -2094,5 +2168,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, SO_RCVBUFChk)
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5110
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:103
@@ -2101,5 +2175,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, IPTOS_THROUGHPUTChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5127
 msgid "IPTOS_THROU&GHPUT"
@@ -2107,5 +2181,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, SO_SNDLOWATChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5134
 msgid "SO_SNDLO&WAT:"
@@ -2113,5 +2187,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, SO_KEEPALIVEChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5151
 msgid "SO_&KEEPALIVE"
@@ -2119,5 +2193,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, SO_RCVLOWATChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5158
 msgid "SO_RCV&LOWAT:"
@@ -2125,5 +2199,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, SO_REUSEADDRChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5175
 msgid "S&O_REUSEADDR"
@@ -2132,5 +2206,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, SO_BROADCASTChk)
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5182
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:133
@@ -2139,5 +2213,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5209
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:347
@@ -2147,5 +2221,5 @@
 
 #. i18n: ectx: property (toolTip), widget (QCheckBox, sslChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5215
 msgid "Enables or disables the entire SSL mode"
@@ -2153,5 +2227,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, sslChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5220
 msgid ""
@@ -2162,5 +2236,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, sslChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5223
 msgid "E&nable SSL"
@@ -2168,5 +2242,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5277
 msgid "SSL h&osts:"
@@ -2174,5 +2248,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5310
 msgid "SSL entrop&y bytes:"
@@ -2180,5 +2254,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel14_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5344
 msgid "SSL ciphers:"
@@ -2186,5 +2260,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_7)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5357
 msgid "SSL hosts resi&gn:"
@@ -2192,5 +2266,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, sslVersionCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5388
 msgid "ssl2"
@@ -2198,5 +2272,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, sslVersionCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5393
 msgid "ssl3"
@@ -2204,5 +2278,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, sslVersionCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5398
 msgid "ssl2or3"
@@ -2210,5 +2284,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, sslVersionCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5403
 msgid "tls1"
@@ -2216,5 +2290,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, sslCompatibilityChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5411
 msgid "SSL co&mpatibility"
@@ -2222,5 +2296,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5433
 msgid "SSL CA certDir:"
@@ -2228,5 +2302,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel11_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5449
 msgid "SSL entropy file:"
@@ -2234,5 +2308,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel10_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5462
 msgid "SSL egd socket:"
@@ -2240,5 +2314,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel15_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5475
 #, fuzzy
@@ -2247,5 +2321,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_4_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5491
 msgid "SSL CA certFile:"
@@ -2253,5 +2327,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, sslRequireClientcertChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5529
 msgid "SSL require clientcert"
@@ -2259,5 +2333,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel9_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5536
 msgid "SSL client key:"
@@ -2265,5 +2339,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, sslRequireServercertChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5549
 msgid "SSL re&quire servercert"
@@ -2271,5 +2345,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_6_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5559
 msgid "SS&L server cert:"
@@ -2277,5 +2351,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5572
 msgid "SSL client cert:"
@@ -2283,5 +2357,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5591
 msgid "SSL server &key:"
@@ -2289,5 +2363,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5626
 msgid "Protocol"
@@ -2295,5 +2369,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, timeServerChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5638
 msgid "Ti&me server"
@@ -2301,5 +2375,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, largeReadWriteChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5645
 msgid "Lar&ge readwrite"
@@ -2307,5 +2381,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, unixExtensionsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5652
 msgid "UNIX extensions"
@@ -2313,5 +2387,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, readBmpxChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5678
 msgid "Read bmpx"
@@ -2319,5 +2393,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox71)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5688
 msgid "Protocol Versions"
@@ -2325,5 +2399,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_6_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5694
 msgid "A&nnounce as:"
@@ -2331,5 +2405,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, announceAsCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5714
 msgid "NT"
@@ -2337,5 +2411,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, announceAsCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5719
 msgid "NT Workstation"
@@ -2343,5 +2417,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, announceAsCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5724
 msgid "win95"
@@ -2349,5 +2423,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, announceAsCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5729
 msgid "WfW"
@@ -2355,5 +2429,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5750
 msgid "Announce version:"
@@ -2361,5 +2435,5 @@
 
 #. i18n: ectx: property (text), widget (QLineEdit, announceVersionEdit)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5769
 #, fuzzy
@@ -2368,5 +2442,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_3_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5776
 msgid "Pr&otocol:"
@@ -2376,5 +2450,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, maxProtocolCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, minProtocolCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5796
 #: advanced/kcm_sambaconf/kcminterface.ui:5844
@@ -2386,5 +2460,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, maxProtocolCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, minProtocolCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5801
 #: advanced/kcm_sambaconf/kcminterface.ui:5849
@@ -2396,5 +2470,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, maxProtocolCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, minProtocolCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5806
 #: advanced/kcm_sambaconf/kcminterface.ui:5854
@@ -2406,5 +2480,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, maxProtocolCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, minProtocolCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5811
 #: advanced/kcm_sambaconf/kcminterface.ui:5859
@@ -2416,5 +2490,5 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, maxProtocolCombo)
 #. i18n: ectx: property (text), item, widget (QComboBox, minProtocolCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5816
 #: advanced/kcm_sambaconf/kcminterface.ui:5864
@@ -2424,5 +2498,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5824
 msgid "Max protocol:"
@@ -2430,5 +2504,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_3_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5872
 msgid "Min protocol:"
@@ -2436,5 +2510,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox69)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5923
 #, fuzzy
@@ -2443,5 +2517,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_4_4_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5932
 msgid "Ma&x mux:"
@@ -2449,5 +2523,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_4_2_3_3_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:5958
 msgid "Max tt&l:"
@@ -2455,5 +2529,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox72)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6007
 msgid "Listening SMB Ports"
@@ -2461,5 +2535,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_4_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6028
 msgid "SMB ports:"
@@ -2467,5 +2541,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6080
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:350
@@ -2475,5 +2549,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6104
 msgid "LM i&nterval:"
@@ -2481,5 +2555,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6117
 msgid "L&M announce:"
@@ -2488,5 +2562,5 @@
 #. i18n: ectx: property (text), widget (QLabel, TextLabel27_2)
 #. i18n: ectx: property (text), widget (QLabel, TextLabel27)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6133
 #: advanced/kcm_sambaconf/kcminterface.ui:6356
@@ -2495,5 +2569,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel14)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6150
 msgid "Remote browse s&ync:"
@@ -2501,5 +2575,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, browseListChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6182
 msgid "Bro&wse list"
@@ -2507,5 +2581,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, enhancedBrowsingChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6189
 msgid "Enhanced browsin&g"
@@ -2513,5 +2587,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6212
 msgid "Pre&load:"
@@ -2519,5 +2593,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6242
 msgid "Winbind"
@@ -2525,5 +2599,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel21)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6260
 msgid "&Winbind/Idmap UID:"
@@ -2531,5 +2605,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel21_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6279
 msgid "Winbind/Idmap &GID:"
@@ -2537,5 +2611,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel22)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6292
 msgid "Template h&omedir:"
@@ -2543,5 +2617,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel23)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6308
 msgid "Temp&late shell:"
@@ -2549,5 +2623,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel24)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6324
 msgid "Winbind separator:"
@@ -2555,5 +2629,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel24_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6340
 msgid "Template primary group:"
@@ -2561,5 +2635,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel25)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6366
 msgid "Winbind cache ti&me:"
@@ -2567,5 +2641,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, aclCompatibilityCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6390
 msgid "Windows NT 4"
@@ -2573,5 +2647,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, aclCompatibilityCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6395
 msgid "Windows 2000"
@@ -2579,5 +2653,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6408
 msgid "Acl compatibilit&y:"
@@ -2585,5 +2659,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winbindEnumUsersChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6421
 msgid "Wi&nbind enum users"
@@ -2591,5 +2665,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winbindEnumGroupsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6428
 msgid "Winbind enum groups"
@@ -2597,5 +2671,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winbindUseDefaultDomainChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6435
 msgid "Winbind use default domain"
@@ -2603,5 +2677,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winbindEnableLocalAccountsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6442
 msgid "Winbind enable local accounts"
@@ -2609,5 +2683,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winbindTrustedDomainsOnlyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6449
 msgid "Winbind trusted domains only"
@@ -2615,5 +2689,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, winbindNestedGroupsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6456
 msgid "Winbind nested groups"
@@ -2621,5 +2695,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6493
 msgid "NetBIOS"
@@ -2627,5 +2701,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6536
 msgid "NetBIOS sc&ope:"
@@ -2633,5 +2707,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6552
 msgid "&NetBIOS aliases:"
@@ -2639,5 +2713,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, disableNetbiosChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6565
 msgid "Disab&le netbios"
@@ -2645,5 +2719,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6572
 msgid "Na&me resolve order:"
@@ -2651,5 +2725,5 @@
 
 #. i18n: ectx: property (text), widget (QLineEdit, nameResolveOrderEdit)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6611
 msgid "lmhosts host wins bcast"
@@ -2657,5 +2731,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6619
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:359
@@ -2665,5 +2739,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hostMsdfsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6640
 msgid "H&ost msdfs"
@@ -2671,5 +2745,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6664
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:365
@@ -2679,5 +2753,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6673
 msgid "LDAP suffi&x:"
@@ -2685,5 +2759,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6696
 msgid "LDAP machine suffix:"
@@ -2691,5 +2765,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6719
 msgid "LDAP user suffix:"
@@ -2697,5 +2771,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6742
 msgid "LDAP &group suffix:"
@@ -2703,5 +2777,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6765
 msgid "LDAP idmap suffix:"
@@ -2709,5 +2783,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2_2_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6788
 msgid "LDAP filter:"
@@ -2715,5 +2789,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2_2_6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6811
 msgid "LDAP ad&min dn:"
@@ -2721,5 +2795,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6834
 msgid "Idmap bac&kend:"
@@ -2727,5 +2801,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_4_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6857
 msgid "LDAP replication sleep:"
@@ -2733,5 +2807,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6900
 msgid "&LDAP ssl:"
@@ -2739,5 +2813,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, ldapSslCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6914
 #, fuzzy
@@ -2746,5 +2820,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, ldapSslCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6919
 msgid "Start_tls"
@@ -2752,5 +2826,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, ldapSslCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6924
 #, fuzzy
@@ -2759,5 +2833,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_5_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6932
 msgid "LDAP s&ync:"
@@ -2765,5 +2839,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, ldapSyncCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6956
 msgid "Only"
@@ -2771,5 +2845,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, ldapDeleteDnChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:6964
 msgid "LDAP delete d&n"
@@ -2777,5 +2851,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7012
 msgid "Add share c&ommand:"
@@ -2783,5 +2857,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7025
 msgid "Change share command:"
@@ -2789,5 +2863,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7038
 msgid "De&lete share command:"
@@ -2795,5 +2869,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel10)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7051
 msgid "Messa&ge command:"
@@ -2801,5 +2875,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel11)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7064
 msgid "Dfree co&mmand:"
@@ -2807,5 +2881,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7077
 msgid "Set &quota command:"
@@ -2813,5 +2887,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7090
 msgid "Get quota command:"
@@ -2819,5 +2893,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel20)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7119
 msgid "Pa&nic action:"
@@ -2825,5 +2899,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7157
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:353
@@ -2834,5 +2908,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox12)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7163
 #, fuzzy
@@ -2841,5 +2915,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, CheckBox68)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7169
 msgid "Hide &local users"
@@ -2847,5 +2921,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel9)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7176
 msgid "Default service:"
@@ -2853,5 +2927,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel17)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7192
 msgid "Time &offset:"
@@ -2859,5 +2933,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel18)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7215
 msgctxt "minurtes"
@@ -2866,5 +2940,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel13)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7238
 msgid "Remote a&nnounce:"
@@ -2872,5 +2946,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel19)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7254
 msgid "Source environment:"
@@ -2878,5 +2952,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox11)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7273
 msgid "NIS"
@@ -2884,5 +2958,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, nisHomedirChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7297
 msgid "NIS homedir"
@@ -2890,5 +2964,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel16)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7304
 msgid "Homedir map:"
@@ -2896,5 +2970,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox9)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7323
 msgid "UTMP"
@@ -2902,5 +2976,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7347
 msgid "Utmp director&y:"
@@ -2908,5 +2982,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7363
 msgid "&Wtmp directory:"
@@ -2914,5 +2988,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, CheckBox51)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7379
 msgid "Ut&mp"
@@ -2920,5 +2994,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7406
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:362
@@ -2928,5 +3002,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, ntStatusSupportChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7427
 msgid "&NT status support"
@@ -2934,5 +3008,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, ntSmbSupportChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7437
 msgid "NT S&MB support"
@@ -2940,15 +3014,15 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, ntPipeSupportChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcminterface.ui:7450
 msgid "NT pipe supp&ort"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:552
 msgid "Error while opening file"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1172
 #, kde-format
@@ -2956,5 +3030,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1240
 #, kde-format
@@ -2962,5 +3036,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1248
 #, kde-format
@@ -2968,5 +3042,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1277
 #, kde-format
@@ -2974,5 +3048,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1299
 #, kde-format
@@ -2980,5 +3054,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1305
 #, kde-format
@@ -2986,10 +3060,10 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/kcmsambaconf.cpp:1489
 msgid "<h1>Samba Configuration</h1> here you can configure your SAMBA server."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:116
 #, kde-format
@@ -2997,5 +3071,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:119
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:134
@@ -3006,5 +3080,5 @@
 msgstr "Upozorenje"
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:131
 #, kde-format
@@ -3012,5 +3086,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:169
 #, kde-format
@@ -3018,5 +3092,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:192
 #, kde-format
@@ -3024,5 +3098,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/sambafile.cpp:220
 #, fuzzy
@@ -3031,5 +3105,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog, KcmShareDlg)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:34
 msgid "Add/Edit Share"
@@ -3037,5 +3111,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, directoryPixLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:100
 #, fuzzy
@@ -3044,5 +3118,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, directoryGrp)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:116
 msgid "D&irectory"
@@ -3050,5 +3124,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:157
 #, fuzzy
@@ -3057,5 +3131,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, homeChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:179
 msgid "Share all home &directories"
@@ -3063,5 +3137,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, identifierGrp)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:191
 msgid "Iden&tifier"
@@ -3069,5 +3143,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, Lbl_shareName)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:215
 #, fuzzy
@@ -3076,5 +3150,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:228
 msgid "Comme&nt:"
@@ -3082,5 +3156,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:250
 msgid "Main P&roperties"
@@ -3088,5 +3162,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, readOnlyBaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:271
 msgid "Read onl&y"
@@ -3094,5 +3168,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, publicBaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:281
 msgid "Pub&lic"
@@ -3100,5 +3174,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, browseableBaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:288
 msgid "Bro&wseable"
@@ -3106,5 +3180,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, availableBaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:295
 msgid "A&vailable"
@@ -3112,5 +3186,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, securityTab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:322
 msgid "&Security"
@@ -3118,5 +3192,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox19)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:328
 msgid "Gu&ests"
@@ -3124,5 +3198,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QLabel, guestAccountLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:339
 msgid "This is a username which will be used for access to services which are specified as guest ok. Whatever privileges this user has will be available to any client connecting to the guest service. Typically this user will exist in the password file, but will not have a valid login. The user account \\\"ftp\\\" is often a good choice for this parameter. If a username is specified in a given service, the specified username overrides this one."
@@ -3130,5 +3204,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, guestAccountLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:342
 msgid "&Guest account:"
@@ -3137,5 +3211,5 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, guestOnlyChk)
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, onlyUserChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:376 advanced/kcm_sambaconf/share.ui:519
 msgid "If this is checked , then no password is required to connect to the service. Privileges will be those of the guest account."
@@ -3143,5 +3217,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, guestOnlyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:379
 msgid "Only allow guest connect&ions"
@@ -3149,5 +3223,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox18)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:389
 msgid "Hos&ts"
@@ -3156,5 +3230,5 @@
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, hostsDenyEdit)
 #. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:413 advanced/kcm_sambaconf/share.ui:436
 msgid "The opposite of hosts allow - hosts listed here are NOT permitted access to services unless the specific services have their own lists to override this one. Where the lists conflict, the allow list takes precedence."
@@ -3172,5 +3246,5 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel5_2_2)
 #. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel5_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:420 advanced/kcm_sambaconf/share.ui:452
 #: advanced/kcm_sambaconf/share.ui:952 advanced/kcm_sambaconf/share.ui:968
@@ -3183,5 +3257,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:423
 msgid "Hosts allo&w:"
@@ -3189,5 +3263,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:439
 msgid "Hosts &deny:"
@@ -3195,5 +3269,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox17)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:462
 msgid "Sy&mbolic Links"
@@ -3201,5 +3275,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, followSymlinksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:483
 msgid "Allow following of symbolic lin&ks"
@@ -3207,5 +3281,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, wideLinksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:493
 msgid "Allow following of symbolic links that &point to areas outside the directory tree"
@@ -3213,5 +3287,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_4_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:503
 msgid "<qt>Validate password against the following usernames if the client cannot supply a username:</qt>"
@@ -3219,5 +3293,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, onlyUserChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:522
 msgid "Only allow connections with use&rnames specified in this username list"
@@ -3225,5 +3299,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, hiddenFilesTab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:543
 msgid "Hidden &Files"
@@ -3231,5 +3305,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:573
 #, fuzzy
@@ -3238,5 +3312,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:578
 msgid "Veto"
@@ -3244,5 +3318,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:583
 msgid "Veto Oplock"
@@ -3250,5 +3324,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:588
 #, fuzzy
@@ -3257,5 +3331,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:593
 #, fuzzy
@@ -3264,5 +3338,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, hiddenListView)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:598
 #, fuzzy
@@ -3271,5 +3345,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, selGrpBx)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:616
 msgid "Se&lected Files"
@@ -3277,5 +3351,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hiddenChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:637
 msgid "Hi&de"
@@ -3283,5 +3357,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, vetoOplockChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:651
 msgid "Veto oploc&k"
@@ -3289,5 +3363,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox13_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:661
 msgid "&Manual Configuration"
@@ -3295,5 +3369,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:702
 msgid "Ve&to files:"
@@ -3301,5 +3375,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:715
 msgid "Veto oplock f&iles:"
@@ -3307,5 +3381,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:737
 msgid "Hidde&n files:"
@@ -3313,5 +3387,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hideUnwriteableFilesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:772
 msgid "Hide un&writable files"
@@ -3319,5 +3393,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hideSpecialFilesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:779
 msgid "Hide s&pecial files"
@@ -3325,5 +3399,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hideDotFilesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:786
 msgid "Hide files startin&g with a dot "
@@ -3331,5 +3405,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hideUnreadableChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:793
 msgid "Hide un&readable files"
@@ -3337,5 +3411,5 @@
 
 #. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:806
 #, fuzzy
@@ -3344,5 +3418,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox11_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:928
 msgid "Force Modes"
@@ -3350,5 +3424,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_3_2_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:955
 msgid "Forc&e directory security mode:"
@@ -3356,5 +3430,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_3_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:971
 msgid "Fo&rce security mode:"
@@ -3362,5 +3436,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_3_2_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:987
 msgid "Force director&y mode:"
@@ -3368,5 +3442,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1003
 msgid "Force create mo&de:"
@@ -3381,5 +3455,5 @@
 #. i18n: ectx: property (text), widget (QToolButton, directorySecurityMaskBtn)
 #. i18n: ectx: property (text), widget (QToolButton, createMaskBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1028 advanced/kcm_sambaconf/share.ui:1047
 #: advanced/kcm_sambaconf/share.ui:1118 advanced/kcm_sambaconf/share.ui:1137
@@ -3399,5 +3473,5 @@
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, createMaskEdit)
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, forceUnknownAclUserEdit)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1060 advanced/kcm_sambaconf/share.ui:1073
 #: advanced/kcm_sambaconf/share.ui:1086 advanced/kcm_sambaconf/share.ui:1099
@@ -3409,5 +3483,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox10_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1163
 msgid "Masks"
@@ -3415,5 +3489,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_4_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1190
 msgid "Directory security mask:"
@@ -3421,5 +3495,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_4_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1206
 msgid "Security &mask:"
@@ -3427,5 +3501,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_4_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1222
 msgid "Direc&tory mask:"
@@ -3433,5 +3507,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1334
 msgid "Create mas&k:"
@@ -3439,5 +3513,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox56)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1382
 msgid "ACL"
@@ -3445,5 +3519,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, profileAclsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1406
 msgid "&Profile acls"
@@ -3451,5 +3525,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, inheritAclsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1413
 msgid "Inherit ac&ls"
@@ -3457,5 +3531,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, ntAclSupportChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1420
 msgid "&NT ACL support"
@@ -3463,5 +3537,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1433
 msgid "Force unkno&wn acl user:"
@@ -3469,5 +3543,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mapAclInheritChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1446
 msgid "Map acl &inherit"
@@ -3475,5 +3549,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, inheritPermissionsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1490
 msgid "Inherit permissions from parent directory"
@@ -3481,5 +3555,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, deleteReadonlyChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1497
 msgid "Allow deletion of readonly files"
@@ -3487,5 +3561,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox57)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1507
 msgid "DOS Attribute Mapping"
@@ -3493,5 +3567,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mapArchiveChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1528
 msgid "Map DOS archi&ve to UNIX owner execute"
@@ -3499,5 +3573,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mapHiddenChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1535
 msgid "Map DOS hidden to UNI&X world execute"
@@ -3505,5 +3579,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mapSystemChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1542
 msgid "Map DOS system to UNIX &group execute"
@@ -3511,5 +3585,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, storeDosAttributesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1549
 msgid "Store DOS attributes onto extended attribute"
@@ -3517,5 +3591,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox76)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1562
 msgid "OS/2"
@@ -3523,5 +3597,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, eaSupportChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1568
 msgid "OS/2 style extended attributes support"
@@ -3529,5 +3603,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, strictSyncChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1585
 msgid "Strict s&ync"
@@ -3535,5 +3609,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, syncAlwaysChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1595
 msgid "Sync al&ways"
@@ -3541,5 +3615,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, strictAllocateChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1602
 msgid "St&rict allocate"
@@ -3547,5 +3621,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, useSendfileChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1609
 msgid "Use sen&dfile"
@@ -3553,5 +3627,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_3_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1616
 msgid "&Maximum number of simultaneous connections:"
@@ -3559,5 +3633,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1639
 msgid "Write cache si&ze:"
@@ -3566,5 +3640,5 @@
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_7)
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_7_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1662 advanced/kcm_sambaconf/share.ui:1695
 msgid "bytes"
@@ -3572,5 +3646,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1672
 msgid "Bloc&k size:"
@@ -3578,5 +3652,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1705
 msgid "Client-side cachin&g policy:"
@@ -3584,5 +3658,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, cscPolicyCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1719
 msgid "manual"
@@ -3590,5 +3664,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, cscPolicyCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1724
 msgid "documents"
@@ -3596,5 +3670,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, cscPolicyCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1729
 msgid "programs"
@@ -3602,5 +3676,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, cscPolicyCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1734
 msgid "disable"
@@ -3608,5 +3682,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1771
 msgid "Name Mangling"
@@ -3614,5 +3688,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mangledNamesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1777
 msgid "Enable na&me mangling"
@@ -3620,5 +3694,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mangleCaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1784
 msgid "Man&gle case"
@@ -3626,5 +3700,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, preserveCaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1791
 msgid "Preser&ve case"
@@ -3632,5 +3706,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, shortPreserveCaseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1801
 msgid "Short pr&eserve case"
@@ -3638,5 +3712,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, label)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1808
 msgid "Case sensi&tive"
@@ -3644,5 +3718,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1837
 msgid "Defau&lt case:"
@@ -3650,5 +3724,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, defaultCaseCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1857
 #, fuzzy
@@ -3657,5 +3731,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, defaultCaseCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1862
 #, fuzzy
@@ -3664,5 +3738,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1876
 msgid "Mangling cha&r:"
@@ -3670,5 +3744,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_5)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1916
 msgid "Mangled ma&p:"
@@ -3676,5 +3750,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1932
 msgid "Mangling method:"
@@ -3682,5 +3756,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, manglingMethodCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1946
 msgid "hash"
@@ -3688,5 +3762,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox, manglingMethodCombo)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1951
 msgid "hash2"
@@ -3694,5 +3768,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox9)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1970
 #, fuzzy
@@ -3701,5 +3775,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, hideTrailingDotChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1976
 msgid "Hide traili&ng dot"
@@ -3707,5 +3781,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox15)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:1986
 #, fuzzy
@@ -3714,5 +3788,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, dosFilemodeChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2007
 msgid "&DOS file mode"
@@ -3720,5 +3794,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, dosFiletimesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2014
 msgid "DOS f&ile times"
@@ -3726,5 +3800,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, dosFiletimeResolutionChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2021
 msgid "DOS file time resolution"
@@ -3732,5 +3806,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, lockingChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2040
 msgid "Enable lock&ing"
@@ -3738,5 +3812,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox47)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2050
 msgid "Locki&ng"
@@ -3744,5 +3818,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2058
 msgid "S&trict locking"
@@ -3750,5 +3824,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, blockingLocksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2102
 msgid "Blockin&g locks"
@@ -3756,5 +3830,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, posixLockingChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2109
 msgid "Posi&x locking"
@@ -3762,5 +3836,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, shareModesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2116
 msgid "Share mo&des"
@@ -3768,5 +3842,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, oplocksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2123
 msgid "Issue oppo&rtunistic locks (oplocks) "
@@ -3774,5 +3848,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox59)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2130
 msgid "O&plocks"
@@ -3780,5 +3854,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, level2OplocksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2136
 msgid "Le&vel2 oplocks"
@@ -3786,5 +3860,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_3_3_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2148
 msgid "Oplock contention li&mit:"
@@ -3792,5 +3866,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, fakeOplocksChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2189
 msgid "Fak&e oplocks"
@@ -3798,5 +3872,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_6)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2225
 msgid "Vfs ob&jects:"
@@ -3804,5 +3878,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_6_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2241
 msgid "Vfs o&ptions:"
@@ -3810,5 +3884,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2280
 msgid "P&reexec:"
@@ -3816,5 +3890,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2296
 msgid "Root pr&eexec:"
@@ -3822,5 +3896,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2312
 msgid "Pos&texec:"
@@ -3828,5 +3902,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5_2_4)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2328
 msgid "Root &postexec:"
@@ -3834,5 +3908,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, preexecCloseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2344
 msgid "preexec c&lose"
@@ -3840,5 +3914,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, rootPreexecCloseChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2351
 msgid "root pree&xec close"
@@ -3846,5 +3920,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2381
 #, fuzzy
@@ -3853,5 +3927,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2397
 msgid "Fst&ype:"
@@ -3859,5 +3933,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2413
 msgid "Ma&gic script:"
@@ -3865,5 +3939,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_2_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2429
 msgid "Mag&ic output:"
@@ -3871,5 +3945,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_3_2)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2445
 msgid "Do &not descend:"
@@ -3877,5 +3951,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6_2_3_3)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2461
 msgid "Msdfs pro&xy"
@@ -3883,5 +3957,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, setDirectoryChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2477
 msgid "Setdir command allo&wed"
@@ -3889,5 +3963,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, fakeDirectoryCreateTimesChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2484
 msgid "Fa&ke directory create times"
@@ -3895,10 +3969,10 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, msdfsRootChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/share.ui:2491
 msgid "Ms&dfs root"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:51
 msgid ""
@@ -3907,10 +3981,10 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:56
 msgid "Specify Location"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:72
 msgid ""
@@ -3919,10 +3993,10 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:73
 msgid "Get smb.conf Location"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:78
 #, kde-format
@@ -3930,5 +4004,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/smbconfconfigwidget.cpp:78
 msgid "Could Not Read File"
@@ -3936,5 +4010,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:71
 msgid "SO_SNDLOWAT:"
@@ -3942,5 +4016,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:79
 msgid "IPTOS_THROUGHPUT"
@@ -3948,5 +4022,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:87
 msgid "SO_SNDBUF:"
@@ -3954,5 +4028,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:95
 msgid "SO_KEEPALIVE"
@@ -3960,5 +4034,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:149
 msgid "TCP_NODELAY"
@@ -3966,5 +4040,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:157
 msgid "SO_RCVLOWAT:"
@@ -3972,5 +4046,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/socketoptionsdlg.ui:187
 msgid "SO_REUSEADDR"
@@ -3978,5 +4052,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QDialog)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/userselectdlg.ui:16
 msgid "Select Users"
@@ -3984,5 +4058,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/userselectdlg.ui:36
 msgid "Select &Users"
@@ -3990,5 +4064,5 @@
 
 #. i18n: ectx: property (windowTitle), widget (QWidget)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:16
 #, fuzzy
@@ -3997,5 +4071,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:27
 msgid "All U&nspecified Users"
@@ -4003,5 +4077,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:36
 #, fuzzy
@@ -4010,5 +4084,5 @@
 
 #. i18n: ectx: property (text), item, widget (QComboBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:41
 #: advanced/kcm_sambaconf/usertabimpl.cpp:222
@@ -4018,5 +4092,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:63
 msgid "Spec&ified Users"
@@ -4024,5 +4098,5 @@
 
 #. i18n: ectx: property (text), widget (QTable)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:87
 #, fuzzy
@@ -4031,5 +4105,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:125
 msgid "A&dd User..."
@@ -4037,5 +4111,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:133
 msgid "E&xpert"
@@ -4043,5 +4117,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:141
 msgid "Add &Group..."
@@ -4049,5 +4123,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:149
 msgid "Remo&ve Selected"
@@ -4055,5 +4129,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:184
 msgid "All Users Should be Forced to the Follo&wing User/Group"
@@ -4061,5 +4135,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:203
 msgid "Forc&e user:"
@@ -4067,10 +4141,10 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertab.ui:235
 msgid "Fo&rce group:"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertabimpl.cpp:222
 #, fuzzy
@@ -4078,5 +4152,5 @@
 msgstr "Pretpostavljeni"
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertabimpl.cpp:222
 #, fuzzy
@@ -4084,24 +4158,16 @@
 msgstr "Samo za Äitanje"
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertabimpl.cpp:222
 msgid "Writeable"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertabimpl.cpp:222
 msgid "Admin"
 msgstr ""
 
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. +> trunk stable
-#: advanced/kcm_sambaconf/usertabimpl.cpp:279
-#: advanced/propsdlgplugin/propertiespagegui.ui:172
-#, fuzzy
-msgid "Name:"
-msgstr "Ime:"
-
 #. i18n: ectx: property (text), widget (KPushButton, addBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/kcm_sambaconf/usertabimpl.cpp:279 simple/groupconfiggui.ui:89
 msgid "Add User"
@@ -4109,5 +4175,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:50 advanced/nfs/nfshostdlg.cpp:40
 msgid "Host Properties"
@@ -4115,5 +4181,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:67
 msgid "&Name/address:"
@@ -4121,5 +4187,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:107
 msgid ""
@@ -4151,5 +4217,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:115
 msgid "&Public access"
@@ -4157,5 +4223,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:122
 msgid ""
@@ -4168,5 +4234,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:140
 #, fuzzy
@@ -4176,5 +4242,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox)
 #. i18n: ectx: property (text), widget (QCheckBox, writableSambaChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:157
 #: advanced/propsdlgplugin/propertiespagegui.ui:199
@@ -4183,5 +4249,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:166
 msgid ""
@@ -4196,5 +4262,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:174
 msgid "&Insecure"
@@ -4202,5 +4268,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:183
 msgid ""
@@ -4215,5 +4281,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:191
 #, fuzzy
@@ -4222,5 +4288,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:200
 msgid ""
@@ -4235,5 +4301,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:211
 msgid "No w&delay"
@@ -4241,5 +4307,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:216
 msgid ""
@@ -4250,5 +4316,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:224
 msgid "No &hide"
@@ -4256,5 +4322,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:242
 msgid ""
@@ -4278,5 +4344,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:250
 msgid "No su&btree check"
@@ -4284,5 +4350,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:268
 msgid ""
@@ -4306,5 +4372,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:276
 msgid "Insecure loc&ks"
@@ -4312,5 +4378,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:285
 msgid ""
@@ -4325,5 +4391,5 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:303
 msgid "User Mapping"
@@ -4331,5 +4397,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:323
 msgid "All s&quash"
@@ -4337,5 +4403,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:328
 msgid ""
@@ -4346,5 +4412,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:336
 msgid "No &root squash"
@@ -4352,5 +4418,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:346
 msgid ""
@@ -4366,5 +4432,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:362
 msgid "Anonym. &UID:"
@@ -4372,5 +4438,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:368 advanced/nfs/hostprops.ui:414
 msgid "<b>Anonym. UID/GID</b> <p> These options explicitly set the uid and gid of the anonymous account. This option is primarily useful for PC/NFS clients, where you might want all requests appear to be from one user. </p>"
@@ -4378,5 +4444,5 @@
 
 #. i18n: ectx: property (text), widget (QLineEdit)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:390 advanced/nfs/hostprops.ui:436
 msgid "FF"
@@ -4384,5 +4450,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/hostprops.ui:408
 msgid "Anonym. &GID:"
@@ -4390,5 +4456,5 @@
 
 #. i18n: ectx: property (title), widget (Q3GroupBox, nfsGrp)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialog.cpp:64
 #: advanced/propsdlgplugin/propertiespagegui.ui:78
@@ -4397,5 +4463,5 @@
 
 #. i18n: ectx: property (title), widget (Q3GroupBox, groupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:25
 msgid "Allowed &Hosts"
@@ -4403,5 +4469,5 @@
 
 #. i18n: ectx: property (toolTip), widget (Q3GroupBox, groupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:28
 msgid "A list of allowed hosts"
@@ -4409,5 +4475,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (Q3GroupBox, groupBox)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:32
 msgid ""
@@ -4417,5 +4483,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, addHostBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:44
 #, fuzzy
@@ -4424,5 +4490,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, modifyHostBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:54
 msgid "Mo&dify Host..."
@@ -4430,5 +4496,5 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, removeHostBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:64
 #, fuzzy
@@ -4437,5 +4503,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, listView)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:94
 msgid "Name/Address"
@@ -4443,5 +4509,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, listView)
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfsdialoggui.ui:105
 #, fuzzy
@@ -4449,25 +4515,25 @@
 msgstr "Parametri"
 
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfshostdlg.cpp:156
 msgid "There already exists a public entry."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfshostdlg.cpp:157 advanced/nfs/nfshostdlg.cpp:174
 msgid "Host Already Exists"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfshostdlg.cpp:166
 msgid "Please enter a hostname or an IP address."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfshostdlg.cpp:167
 msgid "No Hostname/IP-Address"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: advanced/nfs/nfshostdlg.cpp:173
 #, kde-format
@@ -4475,72 +4541,66 @@
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:136
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:137
 msgid "Reading Samba configuration file ..."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:137
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:138
 msgid "Reading NFS configuration file ..."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:340
+msgid "Please enter a valid path."
+msgstr ""
+
+#. +> stable
 #: advanced/propsdlgplugin/propertiespage.cpp:349
-msgid "Please enter a valid path."
-msgstr ""
-
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:358
 msgid "Only local folders can be shared."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:369
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:361
 msgid "The folder does not exists."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:378
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:372
 msgid "Only folders can be shared."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:388
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:383
 msgid "The folder is already shared."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:403
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:397
 msgid "The administrator does not allow sharing with NFS."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:411
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:405
 msgid "Error: could not read NFS configuration file."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:499
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:489
 msgid "The administrator does not allow sharing with Samba."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:507
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:496
 msgid "Error: could not read Samba configuration file."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:583
+#. +> stable
+#: advanced/propsdlgplugin/propertiespage.cpp:568
 msgid "You have to enter a name for the Samba share."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propertiespage.cpp:593
-#, kde-format
-msgid "<qt>There is already a share with the name <strong>%1</strong>.<br /> Please choose another name.</qt>"
-msgstr ""
-
 #. i18n: ectx: property (text), widget (QLabel, folderLbl)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:21
 #, fuzzy
@@ -4549,5 +4609,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, shareChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:36
 msgid "S&hare this folder in the local network"
@@ -4555,5 +4615,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, nfsChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:68
 msgid "Share with &NFS (Linux/UNIX)"
@@ -4561,5 +4621,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, publicNFSChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:86
 msgid "Pu&blic"
@@ -4567,5 +4627,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, writableNFSChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:96
 msgid "W&ritable"
@@ -4573,5 +4633,5 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, moreNFSBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:126
 msgid "More NFS Op&tions"
@@ -4579,5 +4639,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, sambaChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:154
 msgid "Share with S&amba (Microsoft(R) Windows(R))"
@@ -4585,5 +4645,5 @@
 
 #. i18n: ectx: property (title), widget (Q3GroupBox, sambaGrp)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:164
 msgid "Samba Options"
@@ -4591,5 +4651,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, publicSambaChk)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:189
 msgid "P&ublic"
@@ -4597,28 +4657,22 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, moreSambaBtn)
-#. +> trunk stable
+#. +> stable
 #: advanced/propsdlgplugin/propertiespagegui.ui:229
 msgid "Mor&e Samba Options"
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:59
-#, fuzzy
-msgid "&Share"
-msgstr "&Dijeljeno"
-
-#. +> trunk stable
-#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:69
+#. +> stable
+#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:73
 msgid "You need to be authorized to share directories."
 msgstr ""
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:72
+#. +> stable
+#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:77
 #, fuzzy
 msgid "File sharing is disabled."
 msgstr "Dijeljenje direktorija je onemoguÄeno."
 
-#. +> trunk stable
-#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:75
+#. +> stable
+#: advanced/propsdlgplugin/propsdlgshareplugin.cpp:80
 #, fuzzy
 msgid "Configure File Sharing..."
@@ -4626,5 +4680,5 @@
 
 #. i18n: ectx: property (text), widget (KRichTextLabel, infoLbl)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:22
 msgid "SMB and NFS servers are not installed on this machine, to enable this module the servers must be installed."
@@ -4632,5 +4686,5 @@
 
 #. i18n: ectx: property (title), widget (Q3ButtonGroup, shareGrp)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:35
 msgid "Enable Local Networ&k File Sharing"
@@ -4638,5 +4692,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, simpleRadio)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:47
 msgid "Si&mple sharing"
@@ -4644,5 +4698,5 @@
 
 #. i18n: ectx: property (text), widget (KRichTextLabel, textLabel1)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:94
 msgid "Enable simple sharing to allow users to share folders from their HOME folder, without knowing the root password."
@@ -4650,5 +4704,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, advancedRadio)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:109
 msgid "Advanced sharin&g"
@@ -4656,5 +4710,5 @@
 
 #. i18n: ectx: property (text), widget (KRichTextLabel, textLabel1_2)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:153
 msgid "Enable advanced sharing to allow users to share any folders, as long as they have write access to the needed configuration files, or they know the root password."
@@ -4662,5 +4716,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, nfsChk)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:200
 msgid "Use &NFS (Linux/UNIX)"
@@ -4668,5 +4722,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, sambaChk)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:213
 msgid "Use Sam&ba (Microsoft(R) Windows(R))"
@@ -4674,5 +4728,5 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, allowedUsersBtn)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:227
 msgid "Allo&wed Users"
@@ -4680,5 +4734,5 @@
 
 #. i18n: ectx: property (title), widget (Q3GroupBox, sharedFoldersGroupBox)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:255
 msgid "Shared Folders"
@@ -4686,5 +4740,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, listView)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:276
 #, fuzzy
@@ -4693,5 +4747,5 @@
 
 #. i18n: ectx: property (text), widget (K3ListView, listView)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:287
 msgid "NFS"
@@ -4699,5 +4753,5 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, addShareBtn)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:316
 #, fuzzy
@@ -4706,5 +4760,5 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, changeShareBtn)
-#. +> trunk stable
+#. +> stable
 #: simple/controlcenter.ui:326
 #, fuzzy
@@ -4712,20 +4766,20 @@
 msgstr "Skupovi &znakovaÂ âŠ"
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:125
 msgid "No NFS server installed on this system"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:131
 msgid "No Samba server installed on this system"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:326
 msgid "Could not save settings."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:327
 #, kde-format
@@ -4733,20 +4787,20 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:329
 msgid "Saving Failed"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:370
 msgid "<h1>File Sharing</h1><p>This module can be used to enable file sharing over the network using the \"Network File System\" (NFS) or SMB in Konqueror. The latter enables you to share your files with Windows(R) computers on your network.</p>"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/fileshare.cpp:389
 msgid "Share Folder"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:72 simple/groupconfigdlg.cpp:285
 #, fuzzy
@@ -4754,5 +4808,5 @@
 msgstr "Dozvoljeni korisnici"
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:146
 #, kde-format
@@ -4760,5 +4814,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:163
 #, fuzzy
@@ -4766,10 +4820,10 @@
 msgstr "Odaberite korisnika"
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:164
 msgid "Select a user:"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:191
 #, kde-format
@@ -4777,5 +4831,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:203
 #, kde-format
@@ -4783,25 +4837,25 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:218
 msgid "You have to choose a valid group."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:294
 msgid "New file share group:"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:301
 msgid "Add users from the old file share group to the new one"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:305
 msgid "Remove users from old file share group"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:309
 msgid "Delete the old file share group"
@@ -4809,5 +4863,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, groupUsersRadio)
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:355 simple/groupconfiggui.ui:41
 #, kde-format, no-c-format
@@ -4816,5 +4870,5 @@
 
 #. i18n: ectx: property (title), widget (Q3GroupBox, usersGrpBx)
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:357 simple/groupconfiggui.ui:54
 #, kde-format, no-c-format
@@ -4823,20 +4877,20 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, otherGroupBtn)
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:359 simple/groupconfiggui.ui:135
 msgid "Change Group..."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:362
 msgid "Only users of a certain group are allowed to share folders"
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:363
 msgid "Choose Group..."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:383
 #, kde-format
@@ -4844,5 +4898,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:400
 #, kde-format
@@ -4850,5 +4904,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:407
 #, kde-format
@@ -4856,10 +4910,10 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:416
 msgid "Please choose a valid group."
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:421
 #, kde-format
@@ -4867,5 +4921,5 @@
 msgstr ""
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:421
 #, fuzzy
@@ -4873,5 +4927,5 @@
 msgstr "Stvori"
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:421
 #, fuzzy
@@ -4879,5 +4933,5 @@
 msgstr "Nemoj stvoriti"
 
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfigdlg.cpp:428
 #, kde-format
@@ -4886,5 +4940,5 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, allUsersRadio)
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfiggui.ui:31
 msgid "Allow all users to share folders"
@@ -4892,5 +4946,5 @@
 
 #. i18n: ectx: property (text), widget (KPushButton, removeBtn)
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfiggui.ui:82
 msgid "Remove User"
@@ -4898,5 +4952,5 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, writeAccessChk)
-#. +> trunk stable
+#. +> stable
 #: simple/groupconfiggui.ui:96
 msgid "Group members can share folders without root password"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/kopete.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/kopete.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdenetwork/kopete.po	(revision 816)
@@ -7,5 +7,5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-19 11:53+0100\n"
+"POT-Creation-Date: 2011-02-20 11:26+0100\n"
 "PO-Revision-Date: 2010-02-20 02:39+0100\n"
 "Last-Translator: Andrej Dundovic <adundovi@gmail.com>\n"
@@ -1392,5 +1392,5 @@
 #: kopete/contactlist/kopetecontactlistview.cpp:412
 #: kopete/contactlist/kopetecontactlistview.cpp:837
-#: libkopete/kopetecontact.cpp:454 plugins/highlight/highlightprefsbase.ui:66
+#: libkopete/kopetecontact.cpp:452 plugins/highlight/highlightprefsbase.ui:66
 #: plugins/privacy/privacydialog.ui:92 plugins/privacy/privacydialog.ui:176
 #: protocols/jabber/jabberprotocol.cpp:464 protocols/jabber/ui/privacy.ui:249
@@ -3182,5 +3182,5 @@
 #. +> trunk stable
 #: kopete/contactlist/kopetecontactlistview.cpp:816
-#: libkopete/kopetecontact.cpp:454
+#: libkopete/kopetecontact.cpp:452
 msgid "Remove Contact"
 msgstr ""
@@ -3774,5 +3774,5 @@
 
 #. +> trunk stable
-#: kopete/kopetewindow.cpp:1330 libkopete/kopetecontact.cpp:657
+#: kopete/kopetewindow.cpp:1330 libkopete/kopetecontact.cpp:655
 #, kde-format
 msgctxt "@label:textbox formatted status message"
@@ -5726,10 +5726,10 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:243
+#: libkopete/kopetecontact.cpp:241
 msgid "&Add to Your Contact List"
 msgstr ""
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:287 libkopete/ui/kopetestdaction.cpp:113
+#: libkopete/kopetecontact.cpp:285 libkopete/ui/kopetestdaction.cpp:113
 #, fuzzy
 msgid "Visible when offline"
@@ -5737,30 +5737,30 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:318
+#: libkopete/kopetecontact.cpp:316
 msgid "Move Contact"
 msgstr ""
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:326
+#: libkopete/kopetecontact.cpp:324
 msgid "Select the meta contact to which you want to move this contact:"
 msgstr ""
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:329
+#: libkopete/kopetecontact.cpp:327
 msgid "Create a new metacontact for this contact"
 msgstr ""
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:330
+#: libkopete/kopetecontact.cpp:328
 msgid "If you select this option, a new metacontact will be created in the top-level group with the name of this contact and the contact will be moved to it."
 msgstr ""
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:445
+#: libkopete/kopetecontact.cpp:443
 msgid "This user is not reachable at the moment. Please try a protocol that supports offline sending, or wait until this user comes online."
 msgstr ""
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:446 libkopete/kopetemetacontact.cpp:332
+#: libkopete/kopetecontact.cpp:444 libkopete/kopetemetacontact.cpp:332
 #: libkopete/kopetemetacontact.cpp:350 libkopete/kopetemetacontact.cpp:427
 msgid "User is Not Reachable"
@@ -5768,5 +5768,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:453
+#: libkopete/kopetecontact.cpp:451
 #, kde-format
 msgid "Are you sure you want to remove the contact  '%1' from your contact list?"
@@ -5774,5 +5774,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:595
+#: libkopete/kopetecontact.cpp:593
 #, kde-format
 msgctxt "@label:textbox %3 is contact-display-name, %1 is its status"
@@ -5781,5 +5781,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:602
+#: libkopete/kopetecontact.cpp:600
 #, kde-format
 msgctxt "@label:textbox %4 is contact-display-name, %3 is contact-id, %1 is its status"
@@ -5788,5 +5788,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:620
+#: libkopete/kopetecontact.cpp:618
 #, kde-format
 msgctxt "@label:textbox formatted name"
@@ -5795,5 +5795,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:629
+#: libkopete/kopetecontact.cpp:627
 #, kde-format
 msgctxt "@label:textbox formatted idle time"
@@ -5802,5 +5802,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:638
+#: libkopete/kopetecontact.cpp:636
 #, kde-format
 msgctxt "@label:textbox formatted url"
@@ -5809,5 +5809,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:648
+#: libkopete/kopetecontact.cpp:646
 #, kde-format
 msgctxt "@label:textbox formatted status title"
@@ -5816,5 +5816,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:694
+#: libkopete/kopetecontact.cpp:692
 #, kde-format
 msgctxt "@label:textbox property label %2 is name, %1 is value"
@@ -5823,5 +5823,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:717
+#: libkopete/kopetecontact.cpp:715
 #, kde-format
 msgctxt "firstName lastName"
@@ -5830,5 +5830,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:753
+#: libkopete/kopetecontact.cpp:751
 #, kde-format
 msgctxt "<days>d <hours>h <minutes>m <seconds>s"
@@ -5837,5 +5837,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:761
+#: libkopete/kopetecontact.cpp:759
 #, kde-format
 msgctxt "<hours>h <minutes>m <seconds>s"
@@ -5844,5 +5844,5 @@
 
 #. +> trunk stable
-#: libkopete/kopetecontact.cpp:769
+#: libkopete/kopetecontact.cpp:767
 #, kde-format, no-c-format
 msgctxt "<minutes>m <seconds>s"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdepim/korganizer.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdepim/korganizer.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdepim/korganizer.po	(revision 816)
@@ -5,5 +5,5 @@
 "Project-Id-Version: korganizer 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-19 11:53+0100\n"
+"POT-Creation-Date: 2011-02-20 11:27+0100\n"
 "PO-Revision-Date: 2004-04-20 13:27+CEST\n"
 "Last-Translator: auto\n"
@@ -369,5 +369,5 @@
 #: actionmanager.cpp:442 actionmanager.cpp:660 actionmanager.cpp:1686
 #: actionmanager.cpp:1717 filteredit_base.ui:44
-#: views/journalview/journalview.cpp:196 views/todoview/kotodoview.cpp:188
+#: views/journalview/journalview.cpp:196 views/todoview/kotodoview.cpp:193
 #, fuzzy
 msgid "&Delete"
@@ -553,5 +553,5 @@
 
 #. +> trunk
-#: actionmanager.cpp:619 kodaymatrix.cpp:526 views/todoview/kotodoview.cpp:197
+#: actionmanager.cpp:619 kodaymatrix.cpp:526 views/todoview/kotodoview.cpp:202
 #, fuzzy
 msgid "New &To-do..."
@@ -565,5 +565,5 @@
 
 #. +> trunk
-#: actionmanager.cpp:626 views/todoview/kotodoview.cpp:200
+#: actionmanager.cpp:626 views/todoview/kotodoview.cpp:205
 #, fuzzy
 msgid "New Su&b-to-do..."
@@ -601,5 +601,5 @@
 #. +> trunk
 #: actionmanager.cpp:650 actionmanager.cpp:1680 actionmanager.cpp:1715
-#: koeventpopupmenu.cpp:48 views/todoview/kotodoview.cpp:168
+#: koeventpopupmenu.cpp:48 views/todoview/kotodoview.cpp:173
 msgid "&Show"
 msgstr "Pri&kaÅŸi"
@@ -607,5 +607,5 @@
 #. +> trunk
 #: actionmanager.cpp:655 actionmanager.cpp:1683 actionmanager.cpp:1716
-#: koeventpopupmenu.cpp:51 views/todoview/kotodoview.cpp:172
+#: koeventpopupmenu.cpp:51 views/todoview/kotodoview.cpp:177
 msgid "&Edit..."
 msgstr "&UrediÂ âŠ"
@@ -2461,5 +2461,5 @@
 
 #. +> trunk
-#: koeventpopupmenu.cpp:54 views/todoview/kotodoview.cpp:179
+#: koeventpopupmenu.cpp:54 views/todoview/kotodoview.cpp:184
 #, fuzzy
 msgid "&Print..."
@@ -2467,5 +2467,5 @@
 
 #. +> trunk
-#: koeventpopupmenu.cpp:56 views/todoview/kotodoview.cpp:183
+#: koeventpopupmenu.cpp:56 views/todoview/kotodoview.cpp:188
 #, fuzzy
 msgid "Print Previe&w..."
@@ -8031,5 +8031,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:133
+#: views/todoview/kotodoview.cpp:136
 #, fuzzy
 msgctxt "Checkbox to display todos not hirarchical"
@@ -8038,5 +8038,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:136
+#: views/todoview/kotodoview.cpp:139
 msgctxt "@info:tooltip"
 msgid "Display to-dos in flat list instead of a tree"
@@ -8044,5 +8044,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:139
+#: views/todoview/kotodoview.cpp:142
 msgctxt "@info:whatsthis"
 msgid "Checking this option will cause the to-dos to be displayed as a flat list instead of a hierarchical tree; the parental relationships are removed in the display."
@@ -8050,5 +8050,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:204
+#: views/todoview/kotodoview.cpp:209
 #, fuzzy
 msgid "&Make this To-do Independent"
@@ -8056,5 +8056,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:207
+#: views/todoview/kotodoview.cpp:212
 #, fuzzy
 msgid "Make all Sub-to-dos &Independent"
@@ -8062,5 +8062,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:222
+#: views/todoview/kotodoview.cpp:227
 #, fuzzy
 msgid "&Copy To"
@@ -8068,5 +8068,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:234
+#: views/todoview/kotodoview.cpp:239
 #, fuzzy
 msgid "&Move To"
@@ -8074,5 +8074,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:247
+#: views/todoview/kotodoview.cpp:252
 #, fuzzy
 msgctxt "delete completed to-dos"
@@ -8081,5 +8081,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:251
+#: views/todoview/kotodoview.cpp:256
 #, fuzzy
 msgctxt "unspecified priority"
@@ -8088,5 +8088,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:252
+#: views/todoview/kotodoview.cpp:257
 #, fuzzy
 msgctxt "highest priority"
@@ -8095,20 +8095,20 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:253
+#: views/todoview/kotodoview.cpp:258
 msgid "2"
 msgstr "2"
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:254
+#: views/todoview/kotodoview.cpp:259
 msgid "3"
 msgstr "3"
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:255
+#: views/todoview/kotodoview.cpp:260
 msgid "4"
 msgstr "4"
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:256
+#: views/todoview/kotodoview.cpp:261
 msgctxt "medium priority"
 msgid "5 (medium)"
@@ -8116,5 +8116,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:257
+#: views/todoview/kotodoview.cpp:262
 #, fuzzy
 msgid "6"
@@ -8122,5 +8122,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:258
+#: views/todoview/kotodoview.cpp:263
 #, fuzzy
 msgid "7"
@@ -8128,5 +8128,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:259
+#: views/todoview/kotodoview.cpp:264
 #, fuzzy
 msgid "8"
@@ -8134,5 +8134,5 @@
 
 #. +> trunk
-#: views/todoview/kotodoview.cpp:260
+#: views/todoview/kotodoview.cpp:265
 #, fuzzy
 msgctxt "lowest priority"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdeplasma-addons/libplasma_groupingcontainment.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdeplasma-addons/libplasma_groupingcontainment.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdeplasma-addons/libplasma_groupingcontainment.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-03 02:40+0100\n"
+"POT-Creation-Date: 2011-01-11 10:29+0100\n"
 "PO-Revision-Date: 2011-02-21 00:00+0100\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -15,18 +15,20 @@
 "Language: hr\n"
 "X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
+#. +> trunk stable
 #: abstractgroup.cpp:789
 msgid "Group Configuration"
 msgstr "PodeÅ¡avanje grupe"
 
+#. +> trunk stable
 #: groupingcontainment.cpp:65
 msgid "Add Groups"
 msgstr "Dodaj grupe"
 
+#. +> trunk stable
 #: groupingcontainment.cpp:940
 #, kde-format
@@ -34,4 +36,5 @@
 msgstr "Ukloni ovu %1"
 
+#. +> trunk stable
 #: groupingcontainment.cpp:944
 #, kde-format
@@ -39,32 +42,45 @@
 msgstr "Podesi ovu %1"
 
+#. +> trunk stable
 #: groups/floatinggroup.cpp:60
 msgid "Floating Group"
 msgstr "LebdeÄa grupa"
 
+#. +> trunk stable
 #: groups/flowgroup.cpp:386
 msgid "Flow Group"
 msgstr "PlutajuÄa grupa"
 
+#. +> trunk stable
+#: groups/gridgroup.cpp:652
+msgid "Grid Group"
+msgstr "MreÅŸasta grupa"
+
+#. +> trunk stable
 #: groups/gridmanager.cpp:161 groups/gridmanager.cpp:163
 msgid "Add a new column"
 msgstr "Dodaj novi stupac"
 
+#. +> trunk stable
 #: groups/gridmanager.cpp:162 groups/gridmanager.cpp:164
 msgid "Remove a column"
 msgstr "Ukloni stupac"
 
+#. +> trunk stable
 #: groups/gridmanager.cpp:167 groups/gridmanager.cpp:169
 msgid "Add a new row"
 msgstr "Dodaj novi redak"
 
+#. +> trunk stable
 #: groups/gridmanager.cpp:168 groups/gridmanager.cpp:170
 msgid "Remove a row"
 msgstr "Ukloni redak"
 
+#. +> trunk stable
 #: groups/stackinggroup.cpp:215
 msgid "Stacking Group"
 msgstr "GomilajuÄa grupa"
 
+#. +> trunk stable
 #: groups/tabbinggroup.cpp:170
 msgctxt "a general page in the config dialog"
@@ -72,39 +88,36 @@
 msgstr "OpÄe"
 
+#. +> trunk stable
 #: groups/tabbinggroup.cpp:195
 msgid "New Tab"
 msgstr "Nova kartica"
 
+#. +> trunk stable
 #: groups/tabbinggroup.cpp:375
 msgid "Tabbing Group"
 msgstr "KartiÄna grupa"
 
-#: groups/gridgroup.cpp:652
-msgid "Grid Group"
-msgstr "MreÅŸasta grupa"
-
-#. i18n: file: groups/tabbinggroup_config.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, TabbingGroupConfig)
-#. i18n: file: groups/tabbinggroup_config.ui:22
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3 rc.cpp:6
+#. +> trunk stable
+#: groups/tabbinggroup_config.ui:14 groups/tabbinggroup_config.ui:22
 msgid "Pages"
 msgstr "Stranice"
 
-#. i18n: file: groups/tabbinggroup_config.ui:45
 #. i18n: ectx: property (text), widget (QPushButton, modButton)
-#: rc.cpp:9
+#. +> trunk stable
+#: groups/tabbinggroup_config.ui:45
 msgid "Rename page"
 msgstr "Preimenuj stranicu"
 
-#. i18n: file: groups/tabbinggroup_config.ui:52
 #. i18n: ectx: property (text), widget (QPushButton, upButton)
-#: rc.cpp:12
+#. +> trunk stable
+#: groups/tabbinggroup_config.ui:52
 msgid "Move up"
 msgstr "Prema vrhu"
 
-#. i18n: file: groups/tabbinggroup_config.ui:59
 #. i18n: ectx: property (text), widget (QPushButton, downButton)
-#: rc.cpp:15
+#. +> trunk stable
+#: groups/tabbinggroup_config.ui:59
 msgid "Move down"
 msgstr "Prema dnu"
Index: kde-croatia/kde4/summit/hr/summit/messages/kdeutils/desktop_kdeutils.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/kdeutils/desktop_kdeutils.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/kdeutils/desktop_kdeutils.po	(revision 816)
@@ -7,5 +7,5 @@
 "Project-Id-Version: desktop_kdeutils 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-16 09:44+0100\n"
+"POT-Creation-Date: 2011-02-20 11:27+0100\n"
 "PO-Revision-Date: 2010-02-14 12:30+0100\n"
 "Last-Translator: Andrej Dundovic <adundovi@gmail.com>\n"
@@ -443,5 +443,5 @@
 
 #. +> trunk
-#: kremotecontrol/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop:17
+#: kremotecontrol/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop:18
 #, fuzzy
 msgctxt "Comment"
Index: kde-croatia/kde4/summit/hr/summit/messages/koffice/desktop_koffice.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/koffice/desktop_koffice.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/koffice/desktop_koffice.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: desktop_koffice 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-19 11:54+0100\n"
+"POT-Creation-Date: 2011-02-20 11:27+0100\n"
 "PO-Revision-Date: 2009-10-17 22:29+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -3245,5 +3245,5 @@
 #, fuzzy
 msgctxt "Name"
-msgid "PatchPainel24P"
+msgid "PatchPanel24P"
 msgstr "Zakrpljeno"
 
@@ -3392,5 +3392,5 @@
 #, fuzzy
 msgctxt "Name"
-msgid "VoicePainel20P"
+msgid "VoicePanel20P"
 msgstr "kruÅŸnica"
 
@@ -3399,5 +3399,5 @@
 #, fuzzy
 msgctxt "Name"
-msgid "VoicePainel50P"
+msgid "VoicePanel50P"
 msgstr "kruÅŸnica"
 
@@ -7762,5 +7762,5 @@
 #, fuzzy
 msgctxt "Name"
-msgid "diode zenner"
+msgid "diode zener"
 msgstr "&Centrirano"
 
@@ -7812,5 +7812,5 @@
 #, fuzzy
 msgctxt "Name"
-msgid "photo emiting part"
+msgid "photo emitting part"
 msgstr "Foto papir"
 
@@ -8966,7 +8966,8 @@
 #. +> trunk
 #: flow/stencils/Misc/expensible-node.desktop:2
-msgctxt "Name"
-msgid "expensible node"
-msgstr ""
+#, fuzzy
+msgctxt "Name"
+msgid "expansible node"
+msgstr "ProÅ¡ireno"
 
 #. +> trunk
@@ -9387,8 +9388,7 @@
 #. +> trunk
 #: flow/stencils/Optics/scope.desktop:2
-#, fuzzy
-msgctxt "Name"
-msgid "Scope"
-msgstr "Opseg"
+msgctxt "Name"
+msgid "Oscilloscope"
+msgstr ""
 
 #. +> trunk
@@ -9730,7 +9730,8 @@
 #: flow/stencils/RDP/t_transition.desktop:2
 #, fuzzy
-msgctxt "Name"
-msgid "transition temporisee"
-msgstr "Upravljanje prijevodnim memorijama"
+#| msgid "Slide Transition"
+msgctxt "Name"
+msgid "timed transition"
+msgstr "Prijelazno stanje slajda"
 
 #. +> trunk
@@ -10844,7 +10845,7 @@
 #: krita/krita.desktop:2 krita/plugins/formats/bmp/krita_bmp.desktop:2
 #: krita/plugins/formats/eps/krita_eps.desktop:6
-#: krita/plugins/formats/exr/krita_exr.desktop:52
+#: krita/plugins/formats/exr/krita_exr.desktop:51
 #: krita/plugins/formats/gif/krita_gif.desktop:6
-#: krita/plugins/formats/jp2/krita_jp2.desktop:52
+#: krita/plugins/formats/jp2/krita_jp2.desktop:51
 #: krita/plugins/formats/jpeg/krita_jpeg.desktop:6
 #: krita/plugins/formats/odg/krita_odg.desktop:2
@@ -10852,10 +10853,10 @@
 #: krita/plugins/formats/pdf/krita_pdf.desktop:6
 #: krita/plugins/formats/png/krita_png.desktop:2
-#: krita/plugins/formats/ppm/krita_ppm.desktop:8
-#: krita/plugins/formats/psd/krita_psd.desktop:8
+#: krita/plugins/formats/ppm/krita_ppm.desktop:7
+#: krita/plugins/formats/psd/krita_psd.desktop:6
 #: krita/plugins/formats/raw/krita_raw.desktop:2
 #: krita/plugins/formats/tiff/krita_tiff.desktop:6
 #: krita/plugins/formats/xcf/krita_xcf.desktop:6
-#: krita/sdk/templates/filefilter/krita_APPNAMELC.desktop:52
+#: krita/sdk/templates/filefilter/krita_APPNAMELC.desktop:51
 msgctxt "Name"
 msgid "Krita"
@@ -11520,7 +11521,7 @@
 
 #. +> trunk stable
-#: krita/plugins/formats/exr/krita_exr.desktop:5
-#: krita/plugins/formats/jp2/krita_jp2.desktop:5
-#: krita/sdk/templates/filefilter/krita_APPNAMELC.desktop:5
+#: krita/plugins/formats/exr/krita_exr.desktop:4
+#: krita/plugins/formats/jp2/krita_jp2.desktop:4
+#: krita/sdk/templates/filefilter/krita_APPNAMELC.desktop:4
 msgctxt "GenericName"
 msgid "Application for Drawing and Handling of Images"
@@ -12207,4 +12208,14 @@
 #, fuzzy
 #~ msgctxt "Name"
+#~ msgid "Scope"
+#~ msgstr "Opseg"
+
+#, fuzzy
+#~ msgctxt "Name"
+#~ msgid "transition temporisee"
+#~ msgstr "Upravljanje prijevodnim memorijama"
+
+#, fuzzy
+#~ msgctxt "Name"
 #~ msgid "Arrow-Down"
 #~ msgstr "Arrow"
Index: kde-croatia/kde4/summit/hr/summit/messages/koffice/krita.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/koffice/krita.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/koffice/krita.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: krita 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-14 09:19+0100\n"
+"POT-Creation-Date: 2011-02-20 11:28+0100\n"
 "PO-Revision-Date: 2004-04-20 13:27+CEST\n"
 "Last-Translator: auto\n"
@@ -3576,5 +3576,5 @@
 #. +> trunk stable
 #: plugins/extensions/extensionsmanager/ExtensionInformationWidget.ui:20
-#: ui/forms/wdgfilternodecreation.ui:16 ui/forms/wdgpaintopsettings.ui:19
+#: ui/forms/wdgfilternodecreation.ui:16 ui/forms/wdgpaintopsettings.ui:41
 #, fuzzy
 msgid "Name:"
@@ -6185,5 +6185,5 @@
 #: plugins/filters/blur/wdgblur.ui:91
 #: plugins/paintops/hatching/wdghatchingoptions.ui:85
-#: plugins/paintops/libpaintop/wdgautobrush.ui:252
+#: plugins/paintops/libpaintop/wdgautobrush.ui:207
 #, fuzzy
 msgid "Angle:"
@@ -8965,5 +8965,5 @@
 
 #. +> trunk stable
-#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:58
+#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:57
 #, fuzzy
 msgid "Autobrush"
@@ -8971,5 +8971,5 @@
 
 #. +> trunk stable
-#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:62
+#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:61
 #, fuzzy
 msgid "Predefined Brushes"
@@ -8977,6 +8977,6 @@
 
 #. +> trunk stable
-#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:64
-#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:66
+#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:63
+#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:65
 #, fuzzy
 msgid "Custom Brush"
@@ -8984,6 +8984,6 @@
 
 #. +> trunk stable
-#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:68
-#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:70
+#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:67
+#: plugins/paintops/libpaintop/kis_brush_selection_widget.cpp:69
 #, fuzzy
 msgid "Text Brush"
@@ -9056,5 +9056,5 @@
 #. +> trunk stable
 #: plugins/paintops/libpaintop/kis_dynamic_sensor.h:40
-#: plugins/paintops/libpaintop/wdgautobrush.ui:155
+#: plugins/paintops/libpaintop/wdgautobrush.ui:151
 #, fuzzy
 msgid "Fade"
@@ -9410,5 +9410,5 @@
 #. i18n: ectx: property (text), widget (QLabel, label_4)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:89
+#: plugins/paintops/libpaintop/wdgautobrush.ui:87
 #, fuzzy
 msgid "Diameter:"
@@ -9418,5 +9418,5 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:109
+#: plugins/paintops/libpaintop/wdgautobrush.ui:107
 #: plugins/tools/tool_curves/wdg_tool_example.ui:73
 #: plugins/tools/tool_star/kis_tool_star.cc:239
@@ -9427,5 +9427,5 @@
 #. i18n: ectx: property (text), widget (QLabel, label_6)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:166
+#: plugins/paintops/libpaintop/wdgautobrush.ui:162
 #, fuzzy
 msgid "Horizontal:"
@@ -9434,5 +9434,5 @@
 #. i18n: ectx: property (text), widget (QLabel, label_7)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:182
+#: plugins/paintops/libpaintop/wdgautobrush.ui:178
 #, fuzzy
 msgid "Vertical:"
@@ -9441,5 +9441,5 @@
 #. i18n: ectx: property (text), widget (QLabel, label)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:232
+#: plugins/paintops/libpaintop/wdgautobrush.ui:227
 #, fuzzy
 msgid "Spikes:"
@@ -9448,23 +9448,23 @@
 #. i18n: ectx: property (text), widget (QLabel, label_randomness)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:242
+#: plugins/paintops/libpaintop/wdgautobrush.ui:240
 #, fuzzy
 msgid "Randomness:"
 msgstr "SluÄajno"
 
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#. +> trunk stable
+#: plugins/paintops/libpaintop/wdgautobrush.ui:253
+#, fuzzy
+msgid "Density:"
+msgstr "GustoÄa"
+
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:262
+#: plugins/paintops/libpaintop/wdgautobrush.ui:266
 #: plugins/paintops/libpaintop/wdgtextbrush.ui:77
 #, fuzzy
 msgid "Spacing:"
 msgstr "Razmak:"
-
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#. +> trunk stable
-#: plugins/paintops/libpaintop/wdgautobrush.ui:272
-#, fuzzy
-msgid "Density:"
-msgstr "GustoÄa"
 
 #. i18n: ectx: property (text), widget (QLabel, spacingLbl)
@@ -12595,5 +12595,5 @@
 #. i18n: ectx: property (toolTip), widget (QLineEdit, txtPreset)
 #. +> trunk stable
-#: ui/forms/wdgpaintopsettings.ui:26
+#: ui/forms/wdgpaintopsettings.ui:48
 #, fuzzy
 msgid "Current brush definition"
@@ -12602,5 +12602,5 @@
 #. i18n: ectx: property (toolTip), widget (QPushButton, bnSave)
 #. +> trunk stable
-#: ui/forms/wdgpaintopsettings.ui:33
+#: ui/forms/wdgpaintopsettings.ui:55
 msgid "save the current brush definition under this name"
 msgstr ""
@@ -12608,5 +12608,5 @@
 #. i18n: ectx: property (text), widget (QPushButton, bnSave)
 #. +> trunk stable
-#: ui/forms/wdgpaintopsettings.ui:36
+#: ui/forms/wdgpaintopsettings.ui:58
 msgid "&Save to Presets"
 msgstr ""
@@ -12614,5 +12614,5 @@
 #. i18n: ectx: property (text), widget (QPushButton, bnDefaultPreset)
 #. +> trunk stable
-#: ui/forms/wdgpaintopsettings.ui:89
+#: ui/forms/wdgpaintopsettings.ui:118
 #, fuzzy
 msgid "Default preset"
@@ -13118,36 +13118,4 @@
 msgid "New configuration %1"
 msgstr "Uglovi:"
-
-#. +> trunk stable
-#: ui/kis_brushengine_selector.cpp:101
-#, fuzzy
-msgid "Brush Engines"
-msgstr "Kross podrÅ¡ka"
-
-#. +> trunk stable
-#: ui/kis_brushengine_selector.cpp:110
-#, fuzzy
-msgid "Brush Editor"
-msgstr "X Editor"
-
-#. +> trunk stable
-#: ui/kis_brushengine_selector.cpp:113
-#, fuzzy
-msgid "Presets"
-msgstr "SvojstvaÂ âŠ"
-
-#. +> trunk stable
-#: ui/kis_brushengine_selector.cpp:426
-#: ui/widgets/kis_paintop_presets_popup.cpp:227
-#, fuzzy
-msgid "Attach to Toolbar"
-msgstr "Dodaj na alatnu traku"
-
-#. +> trunk stable
-#: ui/kis_brushengine_selector.cpp:426
-#: ui/widgets/kis_paintop_presets_popup.cpp:227
-#, fuzzy
-msgid "Detach from Toolbar"
-msgstr "Traka pretraÅŸivanja"
 
 #. +> trunk
@@ -13518,15 +13486,15 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:99
+#: ui/kis_paintop_box.cc:98
 msgid "Painter's Toolchest"
 msgstr ""
 
-#. +> trunk stable
-#: ui/kis_paintop_box.cc:103
+#. +> stable
+#: ui/kis_paintop_box.cc:98
 msgid "Artist's materials"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:111
+#: ui/kis_paintop_box.cc:102
 #, fuzzy
 msgid "Edit brush settings"
@@ -13534,5 +13502,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:117
+#: ui/kis_paintop_box.cc:108
 #, fuzzy
 msgid "Choose brush preset"
@@ -13540,5 +13508,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:124
+#: ui/kis_paintop_box.cc:115
 #, fuzzy
 #| msgid "Search"
@@ -13547,5 +13515,5 @@
 
 #. +> trunk
-#: ui/kis_paintop_box.cc:134
+#: ui/kis_paintop_box.cc:125
 #, fuzzy
 #| msgid "Vertical alignment:"
@@ -13554,5 +13522,5 @@
 
 #. +> trunk
-#: ui/kis_paintop_box.cc:144
+#: ui/kis_paintop_box.cc:135
 #, fuzzy
 #| msgid "Search"
@@ -13561,5 +13529,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:155
+#: ui/kis_paintop_box.cc:146
 #, fuzzy
 msgid "Mode: "
@@ -13567,5 +13535,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:166
+#: ui/kis_paintop_box.cc:157
 #, fuzzy
 msgid "Save to Palette"
@@ -13573,5 +13541,5 @@
 
 #. +> trunk
-#: ui/kis_paintop_box.cc:174
+#: ui/kis_paintop_box.cc:165
 #, fuzzy
 msgid "Choose workspace"
@@ -13950,5 +13918,5 @@
 
 #. +> trunk
-#: ui/widgets/kis_paintop_presets_popup.cpp:184
+#: ui/widgets/kis_paintop_presets_popup.cpp:189
 #, fuzzy
 msgid "Overwrite Preset"
@@ -13956,8 +13924,20 @@
 
 #. +> trunk
-#: ui/widgets/kis_paintop_presets_popup.cpp:188
+#: ui/widgets/kis_paintop_presets_popup.cpp:193
 #, fuzzy
 msgid "Save to Presets"
 msgstr "Rezultati pretraÅŸivanjaÂ âŠ"
+
+#. +> trunk stable
+#: ui/widgets/kis_paintop_presets_popup.cpp:232
+#, fuzzy
+msgid "Attach to Toolbar"
+msgstr "Dodaj na alatnu traku"
+
+#. +> trunk stable
+#: ui/widgets/kis_paintop_presets_popup.cpp:232
+#, fuzzy
+msgid "Detach from Toolbar"
+msgstr "Traka pretraÅŸivanja"
 
 #. +> trunk stable
@@ -13991,4 +13971,22 @@
 msgstr "Radni prostor"
 
+#. +> stable
+#: ui/kis_brushengine_selector.cpp:101
+#, fuzzy
+msgid "Brush Engines"
+msgstr "Kross podrÅ¡ka"
+
+#. +> stable
+#: ui/kis_brushengine_selector.cpp:110
+#, fuzzy
+msgid "Brush Editor"
+msgstr "X Editor"
+
+#. +> stable
+#: ui/kis_brushengine_selector.cpp:113
+#, fuzzy
+msgid "Presets"
+msgstr "SvojstvaÂ âŠ"
+
 #, fuzzy
 #~ msgid "Form"
Index: kde-croatia/kde4/summit/hr/summit/messages/koffice/kword.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/koffice/kword.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/koffice/kword.po	(revision 816)
@@ -6,5 +6,5 @@
 "Project-Id-Version: kword 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-17 09:14+0100\n"
+"POT-Creation-Date: 2011-02-20 11:28+0100\n"
 "PO-Revision-Date: 2009-09-29 21:20+0200\n"
 "Last-Translator: Marko Dimjasevic <marko@dimjasevic.net>\n"
@@ -352,5 +352,5 @@
 #. i18n: ectx: property (text), widget (QRadioButton, reconnect)
 #. +> trunk
-#: part/dialogs/KWGeneralFrameProperties.ui:89
+#: part/dialogs/KWGeneralFrameProperties.ui:96
 #, fuzzy
 msgid "Reconnect shape to current flow"
@@ -366,5 +366,5 @@
 #. i18n: ectx: property (text), widget (QRadioButton, noFollowup)
 #. +> trunk
-#: part/dialogs/KWGeneralFrameProperties.ui:96
+#: part/dialogs/KWGeneralFrameProperties.ui:89
 #, fuzzy
 msgid "Do not create a followup shape"
@@ -384,4 +384,11 @@
 msgid "Copy this shape"
 msgstr "Kopiraj u ovu mapu"
+
+#. i18n: ectx: property (text), widget (QCheckBox, syncPos)
+#. +> trunk
+#: part/dialogs/KWGeneralFrameProperties.ui:137
+#, fuzzy
+msgid "Keep position in sync"
+msgstr "SmjeÅ¡taj"
 
 #. i18n: ectx: property (text), widget (QCheckBox, evenOdd)
@@ -405,5 +412,5 @@
 #. i18n: ectx: property (text), widget (QCheckBox, isCopyOfPrevious)
 #. +> trunk
-#: part/dialogs/KWGeneralFrameProperties.ui:129
+#: part/dialogs/KWGeneralFrameProperties.ui:199
 #, fuzzy
 #| msgid "Frame is a copy of the previous frame"
@@ -417,11 +424,9 @@
 msgstr "Promjene Äe biti primijenjene na sve okvire u skupu okvira"
 
-#. i18n: ectx: property (text), widget (QCheckBox, allFrames)
-#. +> trunk
-#: part/dialogs/KWGeneralFrameProperties.ui:136
-#, fuzzy
-#| msgid "Changes will be applied to all frames in frameset"
-msgid "Changes will be applied to all shapes in the linked list"
-msgstr "Promjene Äe biti primijenjene na sve okvire u skupu okvira"
+#. i18n: ectx: property (text), widget (QCheckBox, mirrorPos)
+#. +> trunk
+#: part/dialogs/KWGeneralFrameProperties.ui:165
+msgid "Mirror position on page"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QCheckBox, keepAspectRatio)
@@ -1446,5 +1451,5 @@
 
 #. +> trunk stable
-#: part/KWDocument.cpp:896
+#: part/KWDocument.cpp:898
 msgid "Can not find needed text component, KWord will quit now"
 msgstr ""
@@ -2321,4 +2326,9 @@
 
 #, fuzzy
+#~| msgid "Changes will be applied to all frames in frameset"
+#~ msgid "Changes will be applied to all shapes in the linked list"
+#~ msgstr "Promjene Äe biti primijenjene na sve okvire u skupu okvira"
+
+#, fuzzy
 #~ msgid "Current maintainer"
 #~ msgstr "Trenutni odrÅŸavatelj"
Index: kde-croatia/kde4/summit/hr/summit/messages/playground-base/desktop_playground-base.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/playground-base/desktop_playground-base.po	(revision 815)
+++ kde-croatia/kde4/summit/hr/summit/messages/playground-base/desktop_playground-base.po	(revision 816)
@@ -9,5 +9,5 @@
 "Project-Id-Version: desktop files\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-02-18 09:53+0100\n"
+"POT-Creation-Date: 2011-02-20 11:28+0100\n"
 "PO-Revision-Date: 2010-04-30 19:05+0200\n"
 "Last-Translator: Andrej Dundovic <adundovi@gmail.com>\n"
@@ -1293,5 +1293,5 @@
 
 #. +> trunk
-#: plasma/applets/cia.vc/plasma-applet-ciavc.desktop:23
+#: plasma/applets/cia.vc/plasma-applet-ciavc.desktop:24
 msgctxt "Comment"
 msgid "Shows the commit log for a project using CIA.vc"
@@ -1822,5 +1822,5 @@
 
 #. +> trunk
-#: plasma/applets/lionmail/qml/emailmessage/metadata.desktop:9
+#: plasma/applets/lionmail/qml/emailmessage/metadata.desktop:11
 #, fuzzy
 #| msgctxt "Name"
@@ -1864,5 +1864,5 @@
 
 #. +> trunk
-#: plasma/applets/mid_control/plasma-applet-mid_control.desktop:21
+#: plasma/applets/mid_control/plasma-applet-mid_control.desktop:22
 msgctxt "Comment"
 msgid "Applet to control the hardware of Mobile Internet Devices"
@@ -1991,5 +1991,5 @@
 
 #. +> trunk
-#: plasma/applets/presence/plasma-applet-presence.desktop:21
+#: plasma/applets/presence/plasma-applet-presence.desktop:22
 msgctxt "Comment"
 msgid "Shows your instant messaging status information"
@@ -2621,6 +2621,6 @@
 
 #. +> trunk
-#: plasma/declarative-applets/replacements/knowledgebase/package/metadata.desktop:9
-#: plasma/declarative-applets/replacements/knowledgebase/plasma-applet-knowledgebase-qml.desktop:9
+#: plasma/declarative-applets/replacements/knowledgebase/package/metadata.desktop:10
+#: plasma/declarative-applets/replacements/knowledgebase/plasma-applet-knowledgebase-qml.desktop:10
 #, fuzzy
 msgctxt "Comment"
@@ -2644,6 +2644,6 @@
 
 #. +> trunk
-#: plasma/declarative-applets/replacements/news/package/metadata.desktop:14
-#: plasma/declarative-applets/replacements/news/plasma-applet-news-qml.desktop:14
+#: plasma/declarative-applets/replacements/news/package/metadata.desktop:15
+#: plasma/declarative-applets/replacements/news/plasma-applet-news-qml.desktop:15
 msgctxt "Comment"
 msgid "A proof of concept RSS reader written in qml"
@@ -2659,6 +2659,6 @@
 
 #. +> trunk
-#: plasma/declarative-applets/replacements/org.kde.analogclock/package/metadata.desktop:13
-#: plasma/declarative-applets/replacements/org.kde.analogclock/plasma-applet-analog-clock.desktop:13
+#: plasma/declarative-applets/replacements/org.kde.analogclock/package/metadata.desktop:14
+#: plasma/declarative-applets/replacements/org.kde.analogclock/plasma-applet-analog-clock.desktop:14
 #, fuzzy
 msgctxt "Name"
