diff --git a/branches/NoDemoClient/conlite/locale/conlite.pot b/branches/NoDemoClient/conlite/locale/conlite.pot
index 07179ac..7d44ea8 100644
--- a/branches/NoDemoClient/conlite/locale/conlite.pot
+++ b/branches/NoDemoClient/conlite/locale/conlite.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-01 20:24+0200\n"
+"POT-Creation-Date: 2017-06-09 17:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -122,7 +122,7 @@ msgid "Update check period must be at least 60 minutes."
 msgstr ""
 
 #: includes/include.system_configuration.php:133
-#: includes/include.lang_edit.php:140 includes/include.client_edit.php:172
+#: includes/include.lang_edit.php:140 includes/include.client_edit.php:160
 #: includes/grouprights.inc.php:335
 #: includes/include.grouprights_overview.php:65
 #: includes/include.rights_overview.php:141
@@ -156,10 +156,10 @@ msgstr ""
 #: includes/include.tplcfg_edit_form.php:144
 #: includes/include.con_art_overview.php:1013
 #: includes/grouprights_tpl.inc.php:53 includes/rights_con.inc.php:56
-#: includes/include.client_edit.php:48 includes/include.mod_history.php:52
+#: includes/include.client_edit.php:46 includes/include.mod_history.php:52
 #: includes/include.js_history.php:55 includes/include.lay_history.php:46
 #: includes/include.grouprights_overview.php:42
-#: includes/include.lay_edit_form.php:43 includes/include.lay_edit_form.php:52
+#: includes/include.lay_edit_form.php:41 includes/include.lay_edit_form.php:48
 #: includes/include.rights_overview.php:49
 #: includes/grouprights_area.inc.php:65 includes/grouprights_mod.inc.php:54
 #: includes/grouprights_members.inc.php:41
@@ -246,7 +246,7 @@ msgstr ""
 #: includes/include.mod_history.php:132 includes/include.js_history.php:156
 #: includes/include.lay_history.php:121 includes/include.upl_edit.php:95
 #: includes/include.grouprights_overview.php:118
-#: includes/include.lay_edit_form.php:205 includes/grouprights_mod.inc.php:74
+#: includes/include.lay_edit_form.php:183 includes/grouprights_mod.inc.php:74
 #: includes/include.html_tpl_edit_form.php:214
 #: includes/include.style_history.php:161
 #: includes/include.style_edit_form.php:198 includes/include.mod_new.php:109
@@ -258,191 +258,191 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: includes/functions.upl.php:791
+#: includes/functions.upl.php:723
 msgid "OpenOffice.org Presentation"
 msgstr ""
 
-#: includes/functions.upl.php:792
+#: includes/functions.upl.php:724
 msgid "OpenOffice.org Presentation Template"
 msgstr ""
 
-#: includes/functions.upl.php:793
+#: includes/functions.upl.php:725
 msgid "Microsoft PowerPoint Screen Presentation"
 msgstr ""
 
-#: includes/functions.upl.php:794 includes/functions.upl.php:796
+#: includes/functions.upl.php:726 includes/functions.upl.php:728
 msgid "Microsoft PowerPoint Presentation Template"
 msgstr ""
 
-#: includes/functions.upl.php:795
+#: includes/functions.upl.php:727
 msgid "KDE KPresenter Document"
 msgstr ""
 
-#: includes/functions.upl.php:799
+#: includes/functions.upl.php:731
 msgid "Microsoft Word Document or regular text file"
 msgstr ""
 
-#: includes/functions.upl.php:800
+#: includes/functions.upl.php:732
 msgid "Microsoft Word Template"
 msgstr ""
 
-#: includes/functions.upl.php:801
+#: includes/functions.upl.php:733
 msgid "OpenOffice.org Text Document"
 msgstr ""
 
-#: includes/functions.upl.php:802
+#: includes/functions.upl.php:734
 msgid "OpenOffice.org Text Document Template"
 msgstr ""
 
-#: includes/functions.upl.php:803
+#: includes/functions.upl.php:735
 msgid "StarOffice 5.0 Text Document"
 msgstr ""
 
-#: includes/functions.upl.php:804
+#: includes/functions.upl.php:736
 msgid "KDE KWord Document"
 msgstr ""
 
-#: includes/functions.upl.php:807
+#: includes/functions.upl.php:739
 msgid "Microsoft Excel Worksheet"
 msgstr ""
 
-#: includes/functions.upl.php:808
+#: includes/functions.upl.php:740
 msgid "OpenOffice.org Table"
 msgstr ""
 
-#: includes/functions.upl.php:809
+#: includes/functions.upl.php:741
 msgid "OpenOffice.org Table Template"
 msgstr ""
 
-#: includes/functions.upl.php:810
+#: includes/functions.upl.php:742
 msgid "Microsoft Excel File"
 msgstr ""
 
-#: includes/functions.upl.php:811
+#: includes/functions.upl.php:743
 msgid "Microsoft Excel Template"
 msgstr ""
 
-#: includes/functions.upl.php:812
+#: includes/functions.upl.php:744
 msgid "Comma Seperated Value File"
 msgstr ""
 
-#: includes/functions.upl.php:813
+#: includes/functions.upl.php:745
 msgid "KDE KSpread Document"
 msgstr ""
 
-#: includes/functions.upl.php:814
+#: includes/functions.upl.php:746
 msgid "StarOffice 5.0 Table"
 msgstr ""
 
-#: includes/functions.upl.php:817
+#: includes/functions.upl.php:749
 msgid "Plain Text"
 msgstr ""
 
-#: includes/functions.upl.php:818
+#: includes/functions.upl.php:750
 msgid "Rich Text Format"
 msgstr ""
 
-#: includes/functions.upl.php:821
+#: includes/functions.upl.php:753
 msgid "GIF Image"
 msgstr ""
 
-#: includes/functions.upl.php:822
+#: includes/functions.upl.php:754
 msgid "PNG Image"
 msgstr ""
 
-#: includes/functions.upl.php:823 includes/functions.upl.php:824
+#: includes/functions.upl.php:755 includes/functions.upl.php:756
 msgid "JPEG Image"
 msgstr ""
 
-#: includes/functions.upl.php:825
+#: includes/functions.upl.php:757
 msgid "TIFF Image"
 msgstr ""
 
-#: includes/functions.upl.php:826
+#: includes/functions.upl.php:758
 msgid "Adobe Photoshop Image"
 msgstr ""
 
-#: includes/functions.upl.php:829 includes/functions.upl.php:830
+#: includes/functions.upl.php:761 includes/functions.upl.php:762
 msgid "Hypertext Markup Language Document"
 msgstr ""
 
-#: includes/functions.upl.php:831
+#: includes/functions.upl.php:763
 msgid "Cascading Style Sheets"
 msgstr ""
 
-#: includes/functions.upl.php:834
+#: includes/functions.upl.php:766
 msgid "LHA Archive"
 msgstr ""
 
-#: includes/functions.upl.php:835
+#: includes/functions.upl.php:767
 msgid "RAR Archive"
 msgstr ""
 
-#: includes/functions.upl.php:836
+#: includes/functions.upl.php:768
 msgid "ARJ Archive"
 msgstr ""
 
-#: includes/functions.upl.php:837
+#: includes/functions.upl.php:769
 msgid "bz2-compressed File"
 msgstr ""
 
-#: includes/functions.upl.php:838
+#: includes/functions.upl.php:770
 msgid "bzip-compressed File"
 msgstr ""
 
-#: includes/functions.upl.php:839
+#: includes/functions.upl.php:771
 msgid "ZIP Archive"
 msgstr ""
 
-#: includes/functions.upl.php:840
+#: includes/functions.upl.php:772
 msgid "TAR Archive"
 msgstr ""
 
-#: includes/functions.upl.php:841
+#: includes/functions.upl.php:773
 msgid "GZ Compressed File"
 msgstr ""
 
-#: includes/functions.upl.php:844
+#: includes/functions.upl.php:776
 msgid "C Program Code"
 msgstr ""
 
-#: includes/functions.upl.php:847
+#: includes/functions.upl.php:779
 msgid "C++ Program Code"
 msgstr ""
 
-#: includes/functions.upl.php:849
+#: includes/functions.upl.php:781
 msgid "C or C++ Program Header"
 msgstr ""
 
-#: includes/functions.upl.php:852
+#: includes/functions.upl.php:784
 msgid "PHP Program Code"
 msgstr ""
 
-#: includes/functions.upl.php:853
+#: includes/functions.upl.php:785
 msgid "PHP Source File"
 msgstr ""
 
-#: includes/functions.upl.php:855
+#: includes/functions.upl.php:787
 msgid "Adobe Acrobat Portable Document"
 msgstr ""
 
-#: includes/functions.upl.php:858
+#: includes/functions.upl.php:790
 msgid "QuickTime Movie"
 msgstr ""
 
-#: includes/functions.upl.php:859
+#: includes/functions.upl.php:791
 msgid "avi Movie"
 msgstr ""
 
-#: includes/functions.upl.php:861
+#: includes/functions.upl.php:793
 msgid "MPEG Movie"
 msgstr ""
 
-#: includes/functions.upl.php:862
+#: includes/functions.upl.php:794
 msgid "Windows Media Video"
 msgstr ""
 
-#: includes/functions.upl.php:864
+#: includes/functions.upl.php:796
 msgid "-File"
 msgstr ""
 
@@ -507,7 +507,7 @@ msgstr ""
 #: includes/include.tplcfg_edit_form.php:301
 #: includes/include.con_left_top.php:374
 #: includes/include.rights_overview.php:455
-#: includes/include.str_overview.php:188 includes/include.str_overview.php:656
+#: includes/include.str_overview.php:181 includes/include.str_overview.php:671
 msgid "none"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgstr ""
 
 #: includes/include.style_files_overview.php:131
 #: includes/include.js_files_overview.php:131
-#: includes/include.system_db_backup.php:294
+#: includes/include.system_db_backup.php:293
 #: includes/include.html_tpl_files_overview.php:132
 msgid "Delete File"
 msgstr ""
@@ -756,7 +756,7 @@ msgstr ""
 #: includes/functions.stat.php:644 includes/functions.stat.php:645
 #: includes/grouprights_str.inc.php:215
 #: includes/include.upl_dirs_overview.php:56 includes/rights_con.inc.php:227
-#: includes/include.str_overview.php:169 includes/grouprights_con.inc.php:241
+#: includes/include.str_overview.php:162 includes/grouprights_con.inc.php:241
 #: includes/rights_str.inc.php:221
 msgid "Open category"
 msgstr ""
@@ -964,7 +964,7 @@ msgstr ""
 #: includes/include.mod_package.php:253 includes/include.mod_package.php:422
 #: includes/include.clientsettings.php:98
 #: includes/include.clientsettings.php:189
-#: includes/include.lay_history.php:120 includes/include.lay_edit_form.php:204
+#: includes/include.lay_history.php:120 includes/include.lay_edit_form.php:182
 #: includes/include.rights_overview.php:209
 #: includes/include.html_tpl_edit_form.php:213
 #: includes/include.style_history.php:160
@@ -1002,8 +1002,8 @@ msgstr ""
 #: includes/include.js_edit_form.php:177
 #: includes/include.html_tpl_history.php:165
 #: includes/include.js_history.php:157 includes/include.lay_history.php:122
-#: includes/include.lay_edit_form.php:206
-#: includes/include.lay_edit_form.php:217
+#: includes/include.lay_edit_form.php:184
+#: includes/include.lay_edit_form.php:195
 #: includes/include.html_tpl_edit_form.php:215
 #: includes/include.style_history.php:162
 #: includes/include.style_edit_form.php:199
@@ -1021,10 +1021,10 @@ msgstr ""
 #: includes/include.CMS_LINK.php:215 includes/include.CMS_LINK.php:244
 #: includes/include.CMS_LINK.php:273 includes/include.CMS_LINK.php:288
 #: includes/include.CMS_LINK.php:304 includes/functions.general.php:1136
-#: includes/functions.general.php:1176 includes/include.str_overview.php:90
-#: classes/class.cms_teaser.php:353 classes/class.cms_teaser.php:382
-#: classes/class.cms_teaser.php:419 classes/class.cms_teaser.php:447
-#: classes/class.cms_teaser.php:476 classes/class.cms_teaser.php:539
+#: includes/functions.general.php:1176 includes/include.str_overview.php:89
+#: classes/class.cms_teaser.php:353 classes/class.cms_teaser.php:381
+#: classes/class.cms_teaser.php:418 classes/class.cms_teaser.php:446
+#: classes/class.cms_teaser.php:475 classes/class.cms_teaser.php:538
 msgid "Please choose"
 msgstr ""
 
@@ -1272,7 +1272,7 @@ msgid "Group couldn't created"
 msgstr ""
 
 #: includes/include.grouprights_create.php:94
-#: includes/include.CMS_EASYIMG.php:158 includes/include.client_edit.php:227
+#: includes/include.CMS_EASYIMG.php:158 includes/include.client_edit.php:215
 #: includes/include.grouprights_overview.php:102
 #: includes/include.rights_overview.php:192
 #: includes/include.rights_create.php:142
@@ -1282,7 +1282,7 @@ msgid "Save changes"
 msgstr ""
 
 #: includes/include.grouprights_create.php:96
-#: includes/include.client_edit.php:236
+#: includes/include.client_edit.php:223
 #: includes/include.grouprights_overview.php:106
 #: includes/include.grouprights_overview.php:209
 #: includes/include.rights_overview.php:197
@@ -1294,7 +1294,7 @@ msgstr ""
 #: includes/include.grouprights_create.php:99
 #: includes/include.systemsettings.php:62
 #: includes/include.systemsettings.php:178
-#: includes/include.client_edit.php:239 includes/include.clientsettings.php:98
+#: includes/include.client_edit.php:226 includes/include.clientsettings.php:98
 #: includes/include.clientsettings.php:193
 #: includes/include.grouprights_overview.php:109
 #: includes/include.grouprights_overview.php:210
@@ -1507,12 +1507,12 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: includes/functions.general.php:1977
+#: includes/functions.general.php:1986
 #, php-format
 msgid "MySQL Database not reachable for installation %s"
 msgstr ""
 
-#: includes/functions.general.php:1980
+#: includes/functions.general.php:1989
 #, php-format
 msgid ""
 "The MySQL Database for the installation %s is not reachable. Please check if "
@@ -1531,7 +1531,7 @@ msgstr ""
 #: includes/include.client_artspec.php:80
 #: includes/include.mycontenido.tasks.php:397
 #: includes/include.mycontenido_settings.php:127
-#: includes/include.lay_edit_form.php:207
+#: includes/include.lay_edit_form.php:185
 msgid "Options"
 msgstr ""
 
@@ -1705,7 +1705,7 @@ msgid "Title"
 msgstr ""
 
 #: includes/include.con_edit_form.php:211
-#: includes/include.str_overview.php:509
+#: includes/include.str_overview.php:502
 #: templates/standard/template.str_overview.html:133
 #: templates/standard/template.str_overview.html:227
 msgid "Alias"
@@ -1809,7 +1809,7 @@ msgstr ""
 #: templates/standard/template.str_overview.html:224
 #: templates/standard/template.mycontenido_lastarticles.html:63
 #: templates/standard/template.log_main.html:52
-#: classes/class.cms_teaser.php:595 classes/class.ajax.php:153
+#: classes/class.cms_teaser.php:594 classes/class.ajax.php:153
 msgid "Category"
 msgstr ""
 
@@ -1833,7 +1833,7 @@ msgstr ""
 msgid "Upload image"
 msgstr ""
 
-#: includes/include.CMS_EASYIMG.php:157 includes/include.client_edit.php:228
+#: includes/include.CMS_EASYIMG.php:157 includes/include.client_edit.php:216
 #: includes/include.grouprights_overview.php:103
 #: includes/include.rights_overview.php:193
 msgid "Discard changes"
@@ -1853,7 +1853,7 @@ msgstr ""
 
 #: includes/grouprights_str.inc.php:215
 #: includes/include.upl_dirs_overview.php:60 includes/rights_con.inc.php:227
-#: includes/include.str_overview.php:174 includes/grouprights_con.inc.php:241
+#: includes/include.str_overview.php:167 includes/grouprights_con.inc.php:241
 #: includes/rights_str.inc.php:221
 msgid "Close category"
 msgstr ""
@@ -1957,7 +1957,7 @@ msgid "Save and close editor"
 msgstr ""
 
 #: includes/functions.tpl.php:436 includes/functions.con.php:1837
-#: includes/functions.str.php:1387
+#: includes/functions.str.php:1386
 #, php-format
 msgid "%s (Copy)"
 msgstr ""
@@ -2056,8 +2056,8 @@ msgstr ""
 
 #: includes/include.con_left_top.php:428
 #: includes/include.con_str_overview.php:612
-#: includes/include.str_overview.php:486 includes/include.str_overview.php:487
-#: includes/include.str_overview.php:488
+#: includes/include.str_overview.php:480 includes/include.str_overview.php:481
+#: includes/include.str_overview.php:482
 #: templates/standard/template.stat_overview.html:135
 msgid "Close all categories"
 msgstr ""
@@ -2068,8 +2068,8 @@ msgstr ""
 
 #: includes/include.con_left_top.php:429
 #: includes/include.con_str_overview.php:613
-#: includes/include.str_overview.php:493 includes/include.str_overview.php:494
-#: includes/include.str_overview.php:495
+#: includes/include.str_overview.php:486 includes/include.str_overview.php:487
+#: includes/include.str_overview.php:488
 #: templates/standard/template.stat_overview.html:137
 msgid "Open all categories"
 msgstr ""
@@ -2092,7 +2092,7 @@ msgstr ""
 #: templates/standard/template.symbolhelp.html:38
 #: templates/standard/template.symbolhelp.html:283
 #: templates/standard/template.log_main.html:53
-#: classes/class.cms_teaser.php:596 classes/class.ajax.php:170
+#: classes/class.cms_teaser.php:595 classes/class.ajax.php:170
 msgid "Article"
 msgstr ""
 
@@ -2107,7 +2107,7 @@ msgstr ""
 #: includes/include.con_art_overview.php:81
 #: includes/include.rights_left_top.php:155
 #: includes/include.frontend.left_top.php:257 includes/include.mod_new.php:161
-#: backend_search.php:495 classes/class.cms_teaser.php:588
+#: backend_search.php:495 classes/class.cms_teaser.php:587
 #: classes/class.cms_filelist.php:738
 msgid "Sort order"
 msgstr ""
@@ -2254,14 +2254,14 @@ msgstr ""
 #: includes/include.frontend.user_menu.php:112
 #: includes/include.rights_left_top.php:118
 #: includes/include.frontend.left_top.php:118 includes/include.mod_new.php:88
-#: classes/class.cms_teaser.php:423 classes/class.cms_filelist.php:465
+#: classes/class.cms_teaser.php:422 classes/class.cms_filelist.php:465
 msgid "Ascending"
 msgstr ""
 
 #: includes/include.frontend.user_menu.php:112
 #: includes/include.rights_left_top.php:119
 #: includes/include.frontend.left_top.php:118 includes/include.mod_new.php:88
-#: classes/class.cms_teaser.php:426 classes/class.cms_filelist.php:468
+#: classes/class.cms_teaser.php:425 classes/class.cms_filelist.php:468
 msgid "Descending"
 msgstr ""
 
@@ -2310,95 +2310,95 @@ msgstr ""
 msgid "Searched for:"
 msgstr ""
 
-#: includes/include.client_edit.php:52
+#: includes/include.client_edit.php:49
 msgid "No client ID passed"
 msgstr ""
 
-#: includes/include.client_edit.php:65
+#: includes/include.client_edit.php:59
 msgid ""
 "Notice: In order to use this client, you must create a new language for it."
 msgstr ""
 
-#: includes/include.client_edit.php:69
+#: includes/include.client_edit.php:63
 #, php-format
 msgid "Please click %shere%s to create a new language."
 msgstr ""
 
-#: includes/include.client_edit.php:110
+#: includes/include.client_edit.php:102
 msgid "Couldn't write the file config.php."
 msgstr ""
 
-#: includes/include.client_edit.php:118
+#: includes/include.client_edit.php:110
 #, php-format
 msgid "Succesfully copied client-template to %s."
 msgstr ""
 
-#: includes/include.client_edit.php:121
+#: includes/include.client_edit.php:113
 #, php-format
 msgid ""
 "Cannot create directory %s . The client was created, but you have to copy "
 "the frontend-template yourself"
 msgstr ""
 
-#: includes/include.client_edit.php:125
+#: includes/include.client_edit.php:117
 #, php-format
 msgid ""
 "The directory %s already exists. The client was created, but you have to "
 "copy the frontend-template yourself"
 msgstr ""
 
-#: includes/include.client_edit.php:129
+#: includes/include.client_edit.php:121
 #, php-format
 msgid "Client '%s' created."
 msgstr ""
 
-#: includes/include.client_edit.php:147
+#: includes/include.client_edit.php:136
 msgid ""
 "You changed the client path. You might need to copy the frontend to the new "
 "location"
 msgstr ""
 
-#: includes/include.client_edit.php:245
+#: includes/include.client_edit.php:232
 msgid "Client name"
 msgstr ""
 
-#: includes/include.client_edit.php:261
+#: includes/include.client_edit.php:247
 msgid "Server path"
 msgstr ""
 
-#: includes/include.client_edit.php:277
+#: includes/include.client_edit.php:262
 msgid "Web address"
 msgstr ""
 
-#: includes/include.client_edit.php:286
+#: includes/include.client_edit.php:271
 msgid "Error page category"
 msgstr ""
 
-#: includes/include.client_edit.php:295
+#: includes/include.client_edit.php:280
 msgid "Error page article"
 msgstr ""
 
-#: includes/include.client_edit.php:306
+#: includes/include.client_edit.php:291
 msgid "Client logo"
 msgstr ""
 
-#: includes/include.client_edit.php:315
+#: includes/include.client_edit.php:300
 msgid "HTML"
 msgstr ""
 
-#: includes/include.client_edit.php:315
+#: includes/include.client_edit.php:300
 msgid "XHTML"
 msgstr ""
 
-#: includes/include.client_edit.php:315
+#: includes/include.client_edit.php:300
 msgid "HTML5"
 msgstr ""
 
-#: includes/include.client_edit.php:330
+#: includes/include.client_edit.php:316
 msgid "Generate"
 msgstr ""
 
-#: includes/include.client_edit.php:341
+#: includes/include.client_edit.php:326
 msgid "Copy frontend template"
 msgstr ""
 
@@ -2472,7 +2472,7 @@ msgid "Common date formattings"
 msgstr ""
 
 #: includes/include.mod_edit_form.php:54 includes/include.lay_overview.php:78
-#: includes/include.mod_overview.php:209 includes/include.str_overview.php:741
+#: includes/include.mod_overview.php:209 includes/include.str_overview.php:754
 msgid "No permission"
 msgstr ""
 
@@ -2781,53 +2781,53 @@ msgstr ""
 msgid "Range"
 msgstr ""
 
-#: includes/include.system_db_backup.php:35
+#: includes/include.system_db_backup.php:34
 msgid "Backupfolder missing or not writable!"
 msgstr ""
 
-#: includes/include.system_db_backup.php:54
+#: includes/include.system_db_backup.php:53
 msgid "Start your Backup!"
 msgstr ""
 
-#: includes/include.system_db_backup.php:88
+#: includes/include.system_db_backup.php:87
 msgid "Permission denied!"
 msgstr ""
 
-#: includes/include.system_db_backup.php:99
+#: includes/include.system_db_backup.php:98
 msgid "Starting Backup."
 msgstr ""
 
-#: includes/include.system_db_backup.php:216
+#: includes/include.system_db_backup.php:215
 msgid "Backup in Progress!"
 msgstr ""
 
-#: includes/include.system_db_backup.php:223
-#: includes/include.system_db_backup.php:248
+#: includes/include.system_db_backup.php:222
+#: includes/include.system_db_backup.php:247
 msgid "Tables saved: "
 msgstr ""
 
-#: includes/include.system_db_backup.php:223
+#: includes/include.system_db_backup.php:222
 msgid "Last processed: "
 msgstr ""
 
-#: includes/include.system_db_backup.php:224
-#: includes/include.system_db_backup.php:248
+#: includes/include.system_db_backup.php:223
+#: includes/include.system_db_backup.php:247
 msgid "Pageviews: "
 msgstr ""
 
-#: includes/include.system_db_backup.php:247
+#: includes/include.system_db_backup.php:246
 msgid "Backup done!"
 msgstr ""
 
-#: includes/include.system_db_backup.php:252
+#: includes/include.system_db_backup.php:251
 msgid "Go Back to Overview"
 msgstr ""
 
-#: includes/include.system_db_backup.php:286
+#: includes/include.system_db_backup.php:285
 msgid "File successfully deleted."
 msgstr ""
 
-#: includes/include.system_db_backup.php:301
+#: includes/include.system_db_backup.php:300
 msgid "Download File"
 msgstr ""
 
@@ -2901,7 +2901,7 @@ msgstr ""
 msgid "Default title"
 msgstr ""
 
-#: includes/include.lay_history.php:87 includes/include.lay_edit_form.php:186
+#: includes/include.lay_history.php:87 includes/include.lay_edit_form.php:164
 msgid "Edit Layout"
 msgstr ""
 
@@ -3035,38 +3035,38 @@ msgstr ""
 msgid "Upload files"
 msgstr ""
 
-#: includes/include.lay_edit_form.php:46
+#: includes/include.lay_edit_form.php:44
 msgid "-- New Layout --"
 msgstr ""
 
-#: includes/include.lay_edit_form.php:56
+#: includes/include.lay_edit_form.php:52
 msgid "Layout deleted"
 msgstr ""
 
-#: includes/include.lay_edit_form.php:128
+#: includes/include.lay_edit_form.php:116
 #, php-format
 msgid "Container %s was defined %s times"
 msgstr ""
 
-#: includes/include.lay_edit_form.php:141
+#: includes/include.lay_edit_form.php:127
 msgid ""
 "The body tag does not exist in the layout. This is a requirement for the in-"
 "site editing."
 msgstr ""
 
-#: includes/include.lay_edit_form.php:147
+#: includes/include.lay_edit_form.php:132
 msgid ""
 "The head tag does not exist in the layout. This is a requirement for the in-"
 "site editing."
 msgstr ""
 
-#: includes/include.lay_edit_form.php:173
+#: includes/include.lay_edit_form.php:154
 #: includes/include.html_tpl_edit_form.php:185
 #, php-format
 msgid "Tag '%s' %s has no end tag (start tag is on line %s char %s)"
 msgstr ""
 
-#: includes/include.lay_edit_form.php:202
+#: includes/include.lay_edit_form.php:180
 msgid "On save, apply default modules to new containers"
 msgstr ""
 
@@ -3810,7 +3810,7 @@ msgstr ""
 msgid "Could not delete language"
 msgstr ""
 
-#: includes/include.str_overview.php:511
+#: includes/include.str_overview.php:504
 #, php-format
 msgid ""
 "Do you really want to duplicate the following category:<br><br><b>%s</"
@@ -3818,12 +3818,12 @@ msgid ""
 "depending on how many subitems and articles you've got."
 msgstr ""
 
-#: includes/include.str_overview.php:513
+#: includes/include.str_overview.php:506
 #, php-format
 msgid "Do you really want to delete the following category:<br><br><b>%s</b>"
 msgstr ""
 
-#: includes/include.str_overview.php:920
+#: includes/include.str_overview.php:921
 msgid "Create new category"
 msgstr ""
 
@@ -4597,147 +4597,147 @@ msgstr ""
 msgid "Please insert file name."
 msgstr ""
 
-#: classes/class.cms_teaser.php:386
+#: classes/class.cms_teaser.php:385
 msgid "Block Style"
 msgstr ""
 
-#: classes/class.cms_teaser.php:389
+#: classes/class.cms_teaser.php:388
 msgid "Blog Style"
 msgstr ""
 
-#: classes/class.cms_teaser.php:451
+#: classes/class.cms_teaser.php:450
 msgid "Scaled"
 msgstr ""
 
-#: classes/class.cms_teaser.php:454
+#: classes/class.cms_teaser.php:453
 msgid "Cropped"
 msgstr ""
 
-#: classes/class.cms_teaser.php:480
+#: classes/class.cms_teaser.php:479
 msgid "Sort Sequence"
 msgstr ""
 
-#: classes/class.cms_teaser.php:483
+#: classes/class.cms_teaser.php:482
 msgid "Creationdate"
 msgstr ""
 
-#: classes/class.cms_teaser.php:486
+#: classes/class.cms_teaser.php:485
 msgid "Publisheddate"
 msgstr ""
 
-#: classes/class.cms_teaser.php:489
+#: classes/class.cms_teaser.php:488
 msgid "Modificationdate"
 msgstr ""
 
-#: classes/class.cms_teaser.php:578
+#: classes/class.cms_teaser.php:577
 msgid "Teasersettings"
 msgstr ""
 
-#: classes/class.cms_teaser.php:579
+#: classes/class.cms_teaser.php:578
 msgid "Teasertitle"
 msgstr ""
 
-#: classes/class.cms_teaser.php:580
+#: classes/class.cms_teaser.php:579
 msgid "Teaser Startarticle"
 msgstr ""
 
-#: classes/class.cms_teaser.php:581
+#: classes/class.cms_teaser.php:580
 msgid "Sourcecategory"
 msgstr ""
 
-#: classes/class.cms_teaser.php:582
+#: classes/class.cms_teaser.php:581
 msgid "Number of Articles"
 msgstr ""
 
-#: classes/class.cms_teaser.php:583 classes/class.cms_filelist.php:724
+#: classes/class.cms_teaser.php:582 classes/class.cms_filelist.php:724
 msgid "General Settings"
 msgstr ""
 
-#: classes/class.cms_teaser.php:584
+#: classes/class.cms_teaser.php:583
 msgid "Teaser Style"
 msgstr ""
 
-#: classes/class.cms_teaser.php:585
+#: classes/class.cms_teaser.php:584
 msgid "Advanced Teaser Settings"
 msgstr ""
 
-#: classes/class.cms_teaser.php:586
+#: classes/class.cms_teaser.php:585
 msgid "Teaser Filter"
 msgstr ""
 
-#: classes/class.cms_teaser.php:587
+#: classes/class.cms_teaser.php:586
 msgid "Teaser Sort"
 msgstr ""
 
-#: classes/class.cms_teaser.php:589
+#: classes/class.cms_teaser.php:588
 msgid "Source Headline"
 msgstr ""
 
-#: classes/class.cms_teaser.php:590
+#: classes/class.cms_teaser.php:589
 msgid "Source Settings"
 msgstr ""
 
-#: classes/class.cms_teaser.php:591
+#: classes/class.cms_teaser.php:590
 msgid "Source Text"
 msgstr ""
 
-#: classes/class.cms_teaser.php:592
+#: classes/class.cms_teaser.php:591
 msgid "Source Image"
 msgstr ""
 
-#: classes/class.cms_teaser.php:593
+#: classes/class.cms_teaser.php:592
 msgid "Source Date"
 msgstr ""
 
-#: classes/class.cms_teaser.php:598 classes/class.cms_filelist.php:720
+#: classes/class.cms_teaser.php:597 classes/class.cms_filelist.php:720
 msgid "General"
 msgstr ""
 
-#: classes/class.cms_teaser.php:599
+#: classes/class.cms_teaser.php:598
 msgid "Advanced"
 msgstr ""
 
-#: classes/class.cms_teaser.php:600 classes/class.cms_filelist.php:721
+#: classes/class.cms_teaser.php:599 classes/class.cms_filelist.php:721
 msgid "Manual"
 msgstr ""
 
-#: classes/class.cms_teaser.php:601
+#: classes/class.cms_teaser.php:600
 msgid "Included Articles"
 msgstr ""
 
-#: classes/class.cms_teaser.php:602
+#: classes/class.cms_teaser.php:601
 msgid "Add Article"
 msgstr ""
 
-#: classes/class.cms_teaser.php:603
+#: classes/class.cms_teaser.php:602
 msgid "Manual Teaser Settings"
 msgstr ""
 
-#: classes/class.cms_teaser.php:604
+#: classes/class.cms_teaser.php:603
 msgid "Manual Teaser"
 msgstr ""
 
-#: classes/class.cms_teaser.php:607
+#: classes/class.cms_teaser.php:606
 msgid "Size Settings"
 msgstr ""
 
-#: classes/class.cms_teaser.php:608
+#: classes/class.cms_teaser.php:607
 msgid "Characterlength"
 msgstr ""
 
-#: classes/class.cms_teaser.php:609
+#: classes/class.cms_teaser.php:608
 msgid "Imagewidth"
 msgstr ""
 
-#: classes/class.cms_teaser.php:610
+#: classes/class.cms_teaser.php:609
 msgid "Imageheight"
 msgstr ""
 
-#: classes/class.cms_teaser.php:611
+#: classes/class.cms_teaser.php:610
 msgid "Image Scale"
 msgstr ""
 
-#: classes/class.cms_teaser.php:648
+#: classes/class.cms_teaser.php:647
 msgid "Add"
 msgstr ""
 
@@ -4921,31 +4921,31 @@ msgstr ""
 msgid "RSS notification is disabled"
 msgstr ""
 
-#: classes/class.update.notifier.php:718
+#: classes/class.update.notifier.php:716
 msgid "read more"
 msgstr ""
 
-#: classes/class.update.notifier.php:728 classes/class.update.notifier.php:737
+#: classes/class.update.notifier.php:726 classes/class.update.notifier.php:735
 msgid "No RSS content available"
 msgstr ""
 
-#: classes/class.update.notifier.php:735 classes/class.update.notifier.php:753
+#: classes/class.update.notifier.php:733 classes/class.update.notifier.php:751
 msgid ""
 "Your webserver does not have write permissions for the directory /contenido/"
 "cache/!"
 msgstr ""
 
-#: classes/class.update.notifier.php:756
+#: classes/class.update.notifier.php:754
 msgid ""
 "Update notification is disabled! For actual update information, please "
 "activate."
 msgstr ""
 
-#: classes/class.update.notifier.php:761
+#: classes/class.update.notifier.php:759
 msgid "You have an unknown or unsupported version of ConLite!"
 msgstr ""
 
-#: classes/class.update.notifier.php:764
+#: classes/class.update.notifier.php:762
 #, php-format
 msgid ""
 "Your version of ConLite is deprecated and not longer supported for any "
@@ -4953,21 +4953,21 @@ msgid ""
 "\"blue\" target=\"_blank\">Download now!</a>"
 msgstr ""
 
-#: classes/class.update.notifier.php:768
+#: classes/class.update.notifier.php:766
 #, php-format
 msgid ""
 "A new version of ConLite is available! <br /> <a href=\"%s\" class=\"blue\" "
 "target=\"_blank\">Download %s now!</a>"
 msgstr ""
 
-#: classes/class.update.notifier.php:771
+#: classes/class.update.notifier.php:769
 #, php-format
 msgid ""
 "It seems to be that your version string was manipulated. ConLite %s does not "
 "exist!"
 msgstr ""
 
-#: classes/class.update.notifier.php:774
+#: classes/class.update.notifier.php:772
 msgid "Your version of ConLite is up to date!"
 msgstr ""
 
@@ -4975,12 +4975,12 @@ msgstr ""
 msgid "\""
 msgstr ""
 
-#: classes/contenido/class.layout.php:179
+#: classes/contenido/class.layout.php:173
 msgid ""
 "Layout uses LayFromFile. Editing and Saving may not be possible in backend."
 msgstr ""
 
-#: classes/contenido/class.client.php:97 classes/class.client.php:131
+#: classes/contenido/class.client.php:85 classes/class.client.php:131
 msgid "No client"
 msgstr ""
 
diff --git a/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.mo b/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.mo
index 3a27ab3..60282bf 100644
Binary files a/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.mo and b/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.mo differ
diff --git a/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.po b/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.po
index 21f6324..a89fde3 100644
--- a/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.po
+++ b/branches/NoDemoClient/conlite/locale/de_DE/LC_MESSAGES/conlite.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ConLite 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-01 20:24+0200\n"
-"PO-Revision-Date: 2016-06-01 20:37+0100\n"
-"Last-Translator: Ortwin Pinke <translation@dceonline.de>\n"
+"POT-Creation-Date: 2017-06-09 17:11+0200\n"
+"PO-Revision-Date: 2017-06-09 17:17+0100\n"
+"Last-Translator: Ortwin Pinke <o.pinke@php-backoffice.de>\n"
 "Language-Team: CL-Dev <locale@conlite.org>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgid "Update check period must be at least 60 minutes."
 msgstr "Die Aktualisierungsperiode muss mindestens 60 Minuten betragen."
 
 #: includes/include.system_configuration.php:133
-#: includes/include.lang_edit.php:140 includes/include.client_edit.php:172
+#: includes/include.lang_edit.php:140 includes/include.client_edit.php:160
 #: includes/grouprights.inc.php:335
 #: includes/include.grouprights_overview.php:65
 #: includes/include.rights_overview.php:141
@@ -155,10 +155,10 @@ msgstr "Neue Sprache"
 #: includes/include.tplcfg_edit_form.php:144
 #: includes/include.con_art_overview.php:1013
 #: includes/grouprights_tpl.inc.php:53 includes/rights_con.inc.php:56
-#: includes/include.client_edit.php:48 includes/include.mod_history.php:52
+#: includes/include.client_edit.php:46 includes/include.mod_history.php:52
 #: includes/include.js_history.php:55 includes/include.lay_history.php:46
 #: includes/include.grouprights_overview.php:42
-#: includes/include.lay_edit_form.php:43 includes/include.lay_edit_form.php:52
+#: includes/include.lay_edit_form.php:41 includes/include.lay_edit_form.php:48
 #: includes/include.rights_overview.php:49
 #: includes/grouprights_area.inc.php:65 includes/grouprights_mod.inc.php:54
 #: includes/grouprights_members.inc.php:41
@@ -245,7 +245,7 @@ msgstr "Link"
 #: includes/include.mod_history.php:132 includes/include.js_history.php:156
 #: includes/include.lay_history.php:121 includes/include.upl_edit.php:95
 #: includes/include.grouprights_overview.php:118
-#: includes/include.lay_edit_form.php:205 includes/grouprights_mod.inc.php:74
+#: includes/include.lay_edit_form.php:183 includes/grouprights_mod.inc.php:74
 #: includes/include.html_tpl_edit_form.php:214
 #: includes/include.style_history.php:161
 #: includes/include.style_edit_form.php:198 includes/include.mod_new.php:109
@@ -257,191 +257,191 @@ msgstr "Link"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: includes/functions.upl.php:791
+#: includes/functions.upl.php:723
 msgid "OpenOffice.org Presentation"
 msgstr "OpenOffice.org Pr&auml;sentation"
 
-#: includes/functions.upl.php:792
+#: includes/functions.upl.php:724
 msgid "OpenOffice.org Presentation Template"
 msgstr "OpenOffice.org Pr&auml;sentationsvorlage"
 
-#: includes/functions.upl.php:793
+#: includes/functions.upl.php:725
 msgid "Microsoft PowerPoint Screen Presentation"
 msgstr "Microsoft PowerPoint Bildschirmpr&auml;sentation"
 
-#: includes/functions.upl.php:794 includes/functions.upl.php:796
+#: includes/functions.upl.php:726 includes/functions.upl.php:728
 msgid "Microsoft PowerPoint Presentation Template"
 msgstr "Microsoft PowerPoint Pr&auml;sentationsvorlage"
 
-#: includes/functions.upl.php:795
+#: includes/functions.upl.php:727
 msgid "KDE KPresenter Document"
 msgstr "KDE KPresenter-Dokument"
 
-#: includes/functions.upl.php:799
+#: includes/functions.upl.php:731
 msgid "Microsoft Word Document or regular text file"
 msgstr "Microsoft Word-Dokument oder regul&auml;re Textdatei"
 
-#: includes/functions.upl.php:800
+#: includes/functions.upl.php:732
 msgid "Microsoft Word Template"
 msgstr "Microsoft Word Vorlage"
 
-#: includes/functions.upl.php:801
+#: includes/functions.upl.php:733
 msgid "OpenOffice.org Text Document"
 msgstr "OpenOffice.org Textdokument"
 
-#: includes/functions.upl.php:802
+#: includes/functions.upl.php:734
 msgid "OpenOffice.org Text Document Template"
 msgstr "OpenOffice.org Dokumentenvorlage"
 
-#: includes/functions.upl.php:803
+#: includes/functions.upl.php:735
 msgid "StarOffice 5.0 Text Document"
 msgstr "StarOffice 5.0 Textdokument"
 
-#: includes/functions.upl.php:804
+#: includes/functions.upl.php:736
 msgid "KDE KWord Document"
 msgstr "KDE KWord Dokument"
 
-#: includes/functions.upl.php:807
+#: includes/functions.upl.php:739
 msgid "Microsoft Excel Worksheet"
 msgstr "Microsoft Excel Arbeitsblatt"
 
-#: includes/functions.upl.php:808
+#: includes/functions.upl.php:740
 msgid "OpenOffice.org Table"
 msgstr "OpenOffice.org Tabelle"
 
-#: includes/functions.upl.php:809
+#: includes/functions.upl.php:741
 msgid "OpenOffice.org Table Template"
 msgstr "OpenOffice.org Tabellenvorlage"
 
-#: includes/functions.upl.php:810
+#: includes/functions.upl.php:742
 msgid "Microsoft Excel File"
 msgstr "Microsoft Excel Datei"
 
-#: includes/functions.upl.php:811
+#: includes/functions.upl.php:743
 msgid "Microsoft Excel Template"
 msgstr "Microsoft Excel Vorlage"
 
-#: includes/functions.upl.php:812
+#: includes/functions.upl.php:744
 msgid "Comma Seperated Value File"
 msgstr "Komma-separierte Datei"
 
-#: includes/functions.upl.php:813
+#: includes/functions.upl.php:745
 msgid "KDE KSpread Document"
 msgstr "KDE KSpread-Dokument"
 
-#: includes/functions.upl.php:814
+#: includes/functions.upl.php:746
 msgid "StarOffice 5.0 Table"
 msgstr "StarOffice 5.0 Tabelle"
 
-#: includes/functions.upl.php:817
+#: includes/functions.upl.php:749
 msgid "Plain Text"
 msgstr "einfache Textdatei"
 
-#: includes/functions.upl.php:818
+#: includes/functions.upl.php:750
 msgid "Rich Text Format"
 msgstr "Rich Text Format - Datei"
 
-#: includes/functions.upl.php:821
+#: includes/functions.upl.php:753
 msgid "GIF Image"
 msgstr "GIF-Bild"
 
-#: includes/functions.upl.php:822
+#: includes/functions.upl.php:754
 msgid "PNG Image"
 msgstr "PNG-Bild"
 
-#: includes/functions.upl.php:823 includes/functions.upl.php:824
+#: includes/functions.upl.php:755 includes/functions.upl.php:756
 msgid "JPEG Image"
 msgstr "JPEG-Bild"
 
-#: includes/functions.upl.php:825
+#: includes/functions.upl.php:757
 msgid "TIFF Image"
 msgstr "TIFF-Bild"
 
-#: includes/functions.upl.php:826
+#: includes/functions.upl.php:758
 msgid "Adobe Photoshop Image"
 msgstr "Adobe Photoshop Bild"
 
-#: includes/functions.upl.php:829 includes/functions.upl.php:830
+#: includes/functions.upl.php:761 includes/functions.upl.php:762
 msgid "Hypertext Markup Language Document"
 msgstr "Hypertext Markup Language Dokument"
 
-#: includes/functions.upl.php:831
+#: includes/functions.upl.php:763
 msgid "Cascading Style Sheets"
 msgstr "Cascading Style Sheets"
 
-#: includes/functions.upl.php:834
+#: includes/functions.upl.php:766
 msgid "LHA Archive"
 msgstr "LHA-Archiv"
 
-#: includes/functions.upl.php:835
+#: includes/functions.upl.php:767
 msgid "RAR Archive"
 msgstr "RAR-Archiv"
 
-#: includes/functions.upl.php:836
+#: includes/functions.upl.php:768
 msgid "ARJ Archive"
 msgstr "ARJ-Archiv"
 
-#: includes/functions.upl.php:837
+#: includes/functions.upl.php:769
 msgid "bz2-compressed File"
 msgstr "bz2-komprimierte Datei"
 
-#: includes/functions.upl.php:838
+#: includes/functions.upl.php:770
 msgid "bzip-compressed File"
 msgstr "bzip-komprimierte Datei"
 
-#: includes/functions.upl.php:839
+#: includes/functions.upl.php:771
 msgid "ZIP Archive"
 msgstr "ZIP-Archiv"
 
-#: includes/functions.upl.php:840
+#: includes/functions.upl.php:772
 msgid "TAR Archive"
 msgstr "TAR-Archiv"
 
-#: includes/functions.upl.php:841
+#: includes/functions.upl.php:773
 msgid "GZ Compressed File"
 msgstr "GZ-komprimierte Datei"
 
-#: includes/functions.upl.php:844
+#: includes/functions.upl.php:776
 msgid "C Program Code"
 msgstr "C Programmcode"
 
-#: includes/functions.upl.php:847
+#: includes/functions.upl.php:779
 msgid "C++ Program Code"
 msgstr "C++ Programmcode"
 
-#: includes/functions.upl.php:849
+#: includes/functions.upl.php:781
 msgid "C or C++ Program Header"
 msgstr "C oder C++ Programmheader"
 
-#: includes/functions.upl.php:852
+#: includes/functions.upl.php:784
 msgid "PHP Program Code"
 msgstr "PHP Programmcode"
 
-#: includes/functions.upl.php:853
+#: includes/functions.upl.php:785
 msgid "PHP Source File"
 msgstr "PHP Quellcode"
 
-#: includes/functions.upl.php:855
+#: includes/functions.upl.php:787
 msgid "Adobe Acrobat Portable Document"
 msgstr "Adobe Acrobat Portable Document"
 
-#: includes/functions.upl.php:858
+#: includes/functions.upl.php:790
 msgid "QuickTime Movie"
 msgstr "QuickTime-Movie"
 
-#: includes/functions.upl.php:859
+#: includes/functions.upl.php:791
 msgid "avi Movie"
 msgstr "avi-Movie"
 
-#: includes/functions.upl.php:861
+#: includes/functions.upl.php:793
 msgid "MPEG Movie"
 msgstr "MPEG-Movie"
 
-#: includes/functions.upl.php:862
+#: includes/functions.upl.php:794
 msgid "Windows Media Video"
 msgstr "Windows Media-Video"
 
-#: includes/functions.upl.php:864
+#: includes/functions.upl.php:796
 msgid "-File"
 msgstr "-Datei"
 
@@ -511,7 +511,7 @@ msgstr ""
 #: includes/include.tplcfg_edit_form.php:301
 #: includes/include.con_left_top.php:374
 #: includes/include.rights_overview.php:455
-#: includes/include.str_overview.php:188 includes/include.str_overview.php:656
+#: includes/include.str_overview.php:181 includes/include.str_overview.php:671
 msgid "none"
 msgstr "kein"
 
@@ -702,7 +702,7 @@ msgstr "Datei ist nicht lesbar"
 
 #: includes/include.style_files_overview.php:131
 #: includes/include.js_files_overview.php:131
-#: includes/include.system_db_backup.php:294
+#: includes/include.system_db_backup.php:293
 #: includes/include.html_tpl_files_overview.php:132
 msgid "Delete File"
 msgstr "Datei löschen"
@@ -773,7 +773,7 @@ msgstr "Kategorie ist offline"
 #: includes/functions.stat.php:644 includes/functions.stat.php:645
 #: includes/grouprights_str.inc.php:215
 #: includes/include.upl_dirs_overview.php:56 includes/rights_con.inc.php:227
-#: includes/include.str_overview.php:169 includes/grouprights_con.inc.php:241
+#: includes/include.str_overview.php:162 includes/grouprights_con.inc.php:241
 #: includes/rights_str.inc.php:221
 msgid "Open category"
 msgstr "Kategorie &ouml;ffnen"
@@ -987,7 +987,7 @@ msgstr "Template bearbeiten"
 #: includes/include.mod_package.php:253 includes/include.mod_package.php:422
 #: includes/include.clientsettings.php:98
 #: includes/include.clientsettings.php:189
-#: includes/include.lay_history.php:120 includes/include.lay_edit_form.php:204
+#: includes/include.lay_history.php:120 includes/include.lay_edit_form.php:182
 #: includes/include.rights_overview.php:209
 #: includes/include.html_tpl_edit_form.php:213
 #: includes/include.style_history.php:160
@@ -1025,8 +1025,8 @@ msgstr "Datei bearbeiten"
 #: includes/include.js_edit_form.php:177
 #: includes/include.html_tpl_history.php:165
 #: includes/include.js_history.php:157 includes/include.lay_history.php:122
-#: includes/include.lay_edit_form.php:206
-#: includes/include.lay_edit_form.php:217
+#: includes/include.lay_edit_form.php:184
+#: includes/include.lay_edit_form.php:195
 #: includes/include.html_tpl_edit_form.php:215
 #: includes/include.style_history.php:162
 #: includes/include.style_edit_form.php:199
@@ -1044,10 +1044,10 @@ msgstr "Interner Link"
 #: includes/include.CMS_LINK.php:215 includes/include.CMS_LINK.php:244
 #: includes/include.CMS_LINK.php:273 includes/include.CMS_LINK.php:288
 #: includes/include.CMS_LINK.php:304 includes/functions.general.php:1136
-#: includes/functions.general.php:1176 includes/include.str_overview.php:90
-#: classes/class.cms_teaser.php:353 classes/class.cms_teaser.php:382
-#: classes/class.cms_teaser.php:419 classes/class.cms_teaser.php:447
-#: classes/class.cms_teaser.php:476 classes/class.cms_teaser.php:539
+#: includes/functions.general.php:1176 includes/include.str_overview.php:89
+#: classes/class.cms_teaser.php:353 classes/class.cms_teaser.php:381
+#: classes/class.cms_teaser.php:418 classes/class.cms_teaser.php:446
+#: classes/class.cms_teaser.php:475 classes/class.cms_teaser.php:538
 msgid "Please choose"
 msgstr "Bitte w&auml;hlen"
 
@@ -1299,7 +1299,7 @@ msgid "Group couldn't created"
 msgstr "Gruppe konnte nicht erstellt werden"
 
 #: includes/include.grouprights_create.php:94
-#: includes/include.CMS_EASYIMG.php:158 includes/include.client_edit.php:227
+#: includes/include.CMS_EASYIMG.php:158 includes/include.client_edit.php:215
 #: includes/include.grouprights_overview.php:102
 #: includes/include.rights_overview.php:192
 #: includes/include.rights_create.php:142
@@ -1309,7 +1309,7 @@ msgid "Save changes"
 msgstr "&Auml;nderungen speichern"
 
 #: includes/include.grouprights_create.php:96
-#: includes/include.client_edit.php:236
+#: includes/include.client_edit.php:223
 #: includes/include.grouprights_overview.php:106
 #: includes/include.grouprights_overview.php:209
 #: includes/include.rights_overview.php:197
@@ -1321,7 +1321,7 @@ msgstr "Eigenschaft"
 #: includes/include.grouprights_create.php:99
 #: includes/include.systemsettings.php:62
 #: includes/include.systemsettings.php:178
-#: includes/include.client_edit.php:239 includes/include.clientsettings.php:98
+#: includes/include.client_edit.php:226 includes/include.clientsettings.php:98
 #: includes/include.clientsettings.php:193
 #: includes/include.grouprights_overview.php:109
 #: includes/include.grouprights_overview.php:210
@@ -1534,12 +1534,12 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: includes/functions.general.php:1977
+#: includes/functions.general.php:1986
 #, php-format
 msgid "MySQL Database not reachable for installation %s"
 msgstr "MySQL-Datenbank f&uuml;r die Installation %s ist nicht erreichbar "
 
-#: includes/functions.general.php:1980
+#: includes/functions.general.php:1989
 #, php-format
 msgid ""
 "The MySQL Database for the installation %s is not reachable. Please check if "
@@ -1561,7 +1561,7 @@ msgstr "Artikelspezifikation"
 #: includes/include.client_artspec.php:80
 #: includes/include.mycontenido.tasks.php:397
 #: includes/include.mycontenido_settings.php:127
-#: includes/include.lay_edit_form.php:207
+#: includes/include.lay_edit_form.php:185
 msgid "Options"
 msgstr "Optionen"
 
@@ -1735,7 +1735,7 @@ msgid "Title"
 msgstr "Titel"
 
 #: includes/include.con_edit_form.php:211
-#: includes/include.str_overview.php:509
+#: includes/include.str_overview.php:502
 #: templates/standard/template.str_overview.html:133
 #: templates/standard/template.str_overview.html:227
 msgid "Alias"
@@ -1844,7 +1844,7 @@ msgstr ""
 #: templates/standard/template.str_overview.html:224
 #: templates/standard/template.mycontenido_lastarticles.html:63
 #: templates/standard/template.log_main.html:52
-#: classes/class.cms_teaser.php:595 classes/class.ajax.php:153
+#: classes/class.cms_teaser.php:594 classes/class.ajax.php:153
 msgid "Category"
 msgstr "Kategorie"
 
@@ -1868,7 +1868,7 @@ msgstr "Zusammenfassung"
 msgid "Upload image"
 msgstr "Bild hochladen"
 
-#: includes/include.CMS_EASYIMG.php:157 includes/include.client_edit.php:228
+#: includes/include.CMS_EASYIMG.php:157 includes/include.client_edit.php:216
 #: includes/include.grouprights_overview.php:103
 #: includes/include.rights_overview.php:193
 msgid "Discard changes"
@@ -1891,7 +1891,7 @@ msgstr ""
 
 #: includes/grouprights_str.inc.php:215
 #: includes/include.upl_dirs_overview.php:60 includes/rights_con.inc.php:227
-#: includes/include.str_overview.php:174 includes/grouprights_con.inc.php:241
+#: includes/include.str_overview.php:167 includes/grouprights_con.inc.php:241
 #: includes/rights_str.inc.php:221
 msgid "Close category"
 msgstr "Kategorie schliessen"
@@ -2005,7 +2005,7 @@ msgid "Save and close editor"
 msgstr "Speichern und Editor schlie&szlig;en"
 
 #: includes/functions.tpl.php:436 includes/functions.con.php:1837
-#: includes/functions.str.php:1387
+#: includes/functions.str.php:1386
 #, php-format
 msgid "%s (Copy)"
 msgstr "%s (Kopie)"
@@ -2104,8 +2104,8 @@ msgstr "alle schlie&szlig;en"
 
 #: includes/include.con_left_top.php:428
 #: includes/include.con_str_overview.php:612
-#: includes/include.str_overview.php:486 includes/include.str_overview.php:487
-#: includes/include.str_overview.php:488
+#: includes/include.str_overview.php:480 includes/include.str_overview.php:481
+#: includes/include.str_overview.php:482
 #: templates/standard/template.stat_overview.html:135
 msgid "Close all categories"
 msgstr "Alle Kategorien schlie&szlig;en"
@@ -2116,8 +2116,8 @@ msgstr "alle &ouml;ffnen"
 
 #: includes/include.con_left_top.php:429
 #: includes/include.con_str_overview.php:613
-#: includes/include.str_overview.php:493 includes/include.str_overview.php:494
-#: includes/include.str_overview.php:495
+#: includes/include.str_overview.php:486 includes/include.str_overview.php:487
+#: includes/include.str_overview.php:488
 #: templates/standard/template.stat_overview.html:137
 msgid "Open all categories"
 msgstr "Alle Kategorien &ouml;ffnen"
@@ -2140,7 +2140,7 @@ msgstr "Unterkategorien mit kopieren"
 #: templates/standard/template.symbolhelp.html:38
 #: templates/standard/template.symbolhelp.html:283
 #: templates/standard/template.log_main.html:53
-#: classes/class.cms_teaser.php:596 classes/class.ajax.php:170
+#: classes/class.cms_teaser.php:595 classes/class.ajax.php:170
 msgid "Article"
 msgstr "Artikel"
 
@@ -2155,7 +2155,7 @@ msgstr "Ver&ouml;ffentlicht"
 #: includes/include.con_art_overview.php:81
 #: includes/include.rights_left_top.php:155
 #: includes/include.frontend.left_top.php:257 includes/include.mod_new.php:161
-#: backend_search.php:495 classes/class.cms_teaser.php:588
+#: backend_search.php:495 classes/class.cms_teaser.php:587
 #: classes/class.cms_filelist.php:738
 msgid "Sort order"
 msgstr "Sortierreihenfolge"
@@ -2306,14 +2306,14 @@ msgstr "Benutzername"
 #: includes/include.frontend.user_menu.php:112
 #: includes/include.rights_left_top.php:118
 #: includes/include.frontend.left_top.php:118 includes/include.mod_new.php:88
-#: classes/class.cms_teaser.php:423 classes/class.cms_filelist.php:465
+#: classes/class.cms_teaser.php:422 classes/class.cms_filelist.php:465
 msgid "Ascending"
 msgstr "Aufsteigend"
 
 #: includes/include.frontend.user_menu.php:112
 #: includes/include.rights_left_top.php:119
 #: includes/include.frontend.left_top.php:118 includes/include.mod_new.php:88
-#: classes/class.cms_teaser.php:426 classes/class.cms_filelist.php:468
+#: classes/class.cms_teaser.php:425 classes/class.cms_filelist.php:468
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -2362,32 +2362,32 @@ msgstr "Relevanz"
 msgid "Searched for:"
 msgstr "Suchbegriff:"
 
-#: includes/include.client_edit.php:52
+#: includes/include.client_edit.php:49
 msgid "No client ID passed"
 msgstr "Keine ClientID &uuml;bergeben"
 
-#: includes/include.client_edit.php:65
+#: includes/include.client_edit.php:59
 msgid ""
 "Notice: In order to use this client, you must create a new language for it."
 msgstr ""
 "Hinweis: Um den neuen Mandanten zu nutzen, m&uuml;ssen Sie eine neue Sprache "
 "daf&uuml;r anlegen."
 
-#: includes/include.client_edit.php:69
+#: includes/include.client_edit.php:63
 #, php-format
 msgid "Please click %shere%s to create a new language."
 msgstr "Bitte klicken Sie %shier%s, um dies zu tun."
 
-#: includes/include.client_edit.php:110
+#: includes/include.client_edit.php:102
 msgid "Couldn't write the file config.php."
 msgstr "Konnte die Datei config.php nicht schreiben"
 
-#: includes/include.client_edit.php:118
+#: includes/include.client_edit.php:110
 #, php-format
 msgid "Succesfully copied client-template to %s."
 msgstr "Mandantentemplate erfolgreich nach %s kopiert."
 
-#: includes/include.client_edit.php:121
+#: includes/include.client_edit.php:113
 #, php-format
 msgid ""
 "Cannot create directory %s . The client was created, but you have to copy "
@@ -2396,7 +2396,7 @@ msgstr ""
 "Kann Verzeichnis %s nicht erstellen. Der Mandant wurde erstellt, das "
 "Frontend-Template mu&szlig; jedoch noch dorthin kopiert werden"
 
-#: includes/include.client_edit.php:125
+#: includes/include.client_edit.php:117
 #, php-format
 msgid ""
 "The directory %s already exists. The client was created, but you have to "
@@ -2405,12 +2405,12 @@ msgstr ""
 "Das Verzeichnis %s existiert bereits. Der Mandant wurde erstellt, das "
 "Frontend-Template mu&szlig; jedoch noch dorthin kopiert werden"
 
-#: includes/include.client_edit.php:129
+#: includes/include.client_edit.php:121
 #, php-format
 msgid "Client '%s' created."
 msgstr "Mandant '%s erstellt."
 
-#: includes/include.client_edit.php:147
+#: includes/include.client_edit.php:136
 msgid ""
 "You changed the client path. You might need to copy the frontend to the new "
 "location"
@@ -2418,47 +2418,47 @@ msgstr ""
 "Der Mandanten-Pfad wurde ge&auml;ndert. Das Frontend muss eventuell an die "
 "neue Position kopiert werden."
 
-#: includes/include.client_edit.php:245
+#: includes/include.client_edit.php:232
 msgid "Client name"
 msgstr "Name des Mandanten"
 
-#: includes/include.client_edit.php:261
+#: includes/include.client_edit.php:247
 msgid "Server path"
 msgstr "Server-Pfad"
 
-#: includes/include.client_edit.php:277
+#: includes/include.client_edit.php:262
 msgid "Web address"
 msgstr "Web-Adresse"
 
-#: includes/include.client_edit.php:286
+#: includes/include.client_edit.php:271
 msgid "Error page category"
 msgstr "Fehlerseiten-Kategorie"
 
-#: includes/include.client_edit.php:295
+#: includes/include.client_edit.php:280
 msgid "Error page article"
 msgstr "Fehlerseiten-Artikel"
 
-#: includes/include.client_edit.php:306
+#: includes/include.client_edit.php:291
 msgid "Client logo"
 msgstr "Mandantenlogo"
 
-#: includes/include.client_edit.php:315
+#: includes/include.client_edit.php:300
 msgid "HTML"
 msgstr "HTML"
 
-#: includes/include.client_edit.php:315
+#: includes/include.client_edit.php:300
 msgid "XHTML"
 msgstr "XHTML"
 
-#: includes/include.client_edit.php:315
+#: includes/include.client_edit.php:300
 msgid "HTML5"
 msgstr "HTML5"
 
-#: includes/include.client_edit.php:330
+#: includes/include.client_edit.php:316
 msgid "Generate"
 msgstr "Erstelle"
 
-#: includes/include.client_edit.php:341
+#: includes/include.client_edit.php:326
 msgid "Copy frontend template"
 msgstr "Frontend-Template kopieren"
 
@@ -2532,7 +2532,7 @@ msgid "Common date formattings"
 msgstr "Gebr&auml;uchliche Datumsformatierungen"
 
 #: includes/include.mod_edit_form.php:54 includes/include.lay_overview.php:78
-#: includes/include.mod_overview.php:209 includes/include.str_overview.php:741
+#: includes/include.mod_overview.php:209 includes/include.str_overview.php:754
 msgid "No permission"
 msgstr "Kein Zugriff"
 
@@ -2851,54 +2851,54 @@ msgstr "Sprachunabh&auml;ngig"
 msgid "Range"
 msgstr "Bereich"
 
-#: includes/include.system_db_backup.php:35
+#: includes/include.system_db_backup.php:34
 msgid "Backupfolder missing or not writable!"
 msgstr "Sicherungsverzeichnis fehlt oder nicht beschreibbar!"
 
-#: includes/include.system_db_backup.php:54
+#: includes/include.system_db_backup.php:53
 msgid "Start your Backup!"
 msgstr "Starte das Backup!"
 
-#: includes/include.system_db_backup.php:88
+#: includes/include.system_db_backup.php:87
 #, fuzzy
 msgid "Permission denied!"
 msgstr "Zugriff verweigert"
 
-#: includes/include.system_db_backup.php:99
+#: includes/include.system_db_backup.php:98
 msgid "Starting Backup."
 msgstr "Backup startet."
 
-#: includes/include.system_db_backup.php:216
+#: includes/include.system_db_backup.php:215
 msgid "Backup in Progress!"
 msgstr "Backup in Bearbeitung"
 
-#: includes/include.system_db_backup.php:223
-#: includes/include.system_db_backup.php:248
+#: includes/include.system_db_backup.php:222
+#: includes/include.system_db_backup.php:247
 msgid "Tables saved: "
 msgstr "Tabellen gespeichert:"
 
-#: includes/include.system_db_backup.php:223
+#: includes/include.system_db_backup.php:222
 msgid "Last processed: "
 msgstr "Zuletzt bearbeitet:"
 
-#: includes/include.system_db_backup.php:224
-#: includes/include.system_db_backup.php:248
+#: includes/include.system_db_backup.php:223
+#: includes/include.system_db_backup.php:247
 msgid "Pageviews: "
 msgstr "Seitenaufrufe:"
 
-#: includes/include.system_db_backup.php:247
+#: includes/include.system_db_backup.php:246
 msgid "Backup done!"
 msgstr "Backup fertig!"
 
-#: includes/include.system_db_backup.php:252
+#: includes/include.system_db_backup.php:251
 msgid "Go Back to Overview"
 msgstr "Zurück zur Übersicht"
 
-#: includes/include.system_db_backup.php:286
+#: includes/include.system_db_backup.php:285
 msgid "File successfully deleted."
 msgstr "Datei erfolgreich gel&ouml;scht!"
 
-#: includes/include.system_db_backup.php:301
+#: includes/include.system_db_backup.php:300
 msgid "Download File"
 msgstr "Datei herunterladen"
 
@@ -2946,11 +2946,11 @@ msgstr "Editor schlie&szlig;en"
 
 #: includes/include.con_editcontent.php:216
 msgid "Close editor and save changes"
-msgstr "Editor schlie&szlig;en und Änderungen speichern"
+msgstr "Editor schlie&szlig;en und &Auml;nderungen speichern"
 
 #: includes/include.con_editcontent.php:217
 msgid "Do you want to save changes?"
-msgstr "M&ouml;chten Sie die Änderungen speichern?"
+msgstr "M&ouml;chten Sie die &Auml;nderungen speichern?"
 
 #: includes/include.con_editcontent.php:375
 msgid "No template assigned to the category<br>and/or the article"
@@ -2973,7 +2973,7 @@ msgstr "Mandant"
 msgid "Default title"
 msgstr "Standardtitel"
 
-#: includes/include.lay_history.php:87 includes/include.lay_edit_form.php:186
+#: includes/include.lay_history.php:87 includes/include.lay_edit_form.php:164
 msgid "Edit Layout"
 msgstr "Layout bearbeiten"
 
@@ -3107,20 +3107,20 @@ msgstr "Hochladen"
 msgid "Upload files"
 msgstr "Dateien hochladen"
 
-#: includes/include.lay_edit_form.php:46
+#: includes/include.lay_edit_form.php:44
 msgid "-- New Layout --"
 msgstr "-- Neues Layout --"
 
-#: includes/include.lay_edit_form.php:56
+#: includes/include.lay_edit_form.php:52
 msgid "Layout deleted"
 msgstr "Layout gel&ouml;scht"
 
-#: includes/include.lay_edit_form.php:128
+#: includes/include.lay_edit_form.php:116
 #, php-format
 msgid "Container %s was defined %s times"
 msgstr "Container %s wurde %sx definiert"
 
-#: includes/include.lay_edit_form.php:141
+#: includes/include.lay_edit_form.php:127
 msgid ""
 "The body tag does not exist in the layout. This is a requirement for the in-"
 "site editing."
@@ -3128,7 +3128,7 @@ msgstr ""
 "Der body-Tag existiert nicht in diesem Layout. Dies ist eine Voraussetzung "
 "f&uuml;r das In-Site-Editing."
 
-#: includes/include.lay_edit_form.php:147
+#: includes/include.lay_edit_form.php:132
 msgid ""
 "The head tag does not exist in the layout. This is a requirement for the in-"
 "site editing."
@@ -3136,7 +3136,7 @@ msgstr ""
 "Der head-Tag existiert nicht in diesem Layout. Dies ist eine Voraussetzung "
 "f&uuml;r das In-Site-Editing."
 
-#: includes/include.lay_edit_form.php:173
+#: includes/include.lay_edit_form.php:154
 #: includes/include.html_tpl_edit_form.php:185
 #, php-format
 msgid "Tag '%s' %s has no end tag (start tag is on line %s char %s)"
@@ -3144,7 +3144,7 @@ msgstr ""
 "Tag '%s' %s hat keinen End-Tag (Start-Tag befindet sich auf Zeile %s Zeichen "
 "%s)"
 
-#: includes/include.lay_edit_form.php:202
+#: includes/include.lay_edit_form.php:180
 msgid "On save, apply default modules to new containers"
 msgstr "Beim Speichern alle Default-Module in neue Container zuweisen"
 
@@ -3899,7 +3899,7 @@ msgstr ""
 msgid "Could not delete language"
 msgstr "Konnte Sprache nicht l&ouml;schen"
 
-#: includes/include.str_overview.php:511
+#: includes/include.str_overview.php:504
 #, php-format
 msgid ""
 "Do you really want to duplicate the following category:<br><br><b>%s</"
@@ -3910,14 +3910,14 @@ msgstr ""
 "b><br><br>Hinweis: Der Duplizierungsprozess kann mehrere Minuten dauern, "
 "abh&auml;ngig von der Anzahl der Artikel und Unterkategorien."
 
-#: includes/include.str_overview.php:513
+#: includes/include.str_overview.php:506
 #, php-format
 msgid "Do you really want to delete the following category:<br><br><b>%s</b>"
 msgstr ""
 "M&ouml;chten Sie die folgende Kategorie wirklich l&ouml;schen:<br><br><b>%s</"
 "b>"
 
-#: includes/include.str_overview.php:920
+#: includes/include.str_overview.php:921
 msgid "Create new category"
 msgstr "Neue Kategorie erstellen"
 
@@ -4722,147 +4722,147 @@ msgstr "Falscher Dateiname."
 msgid "Please insert file name."
 msgstr "Bitte Dateinamen angeben."
 
-#: classes/class.cms_teaser.php:386
+#: classes/class.cms_teaser.php:385
 msgid "Block Style"
 msgstr "Blockdarstellung"
 
-#: classes/class.cms_teaser.php:389
+#: classes/class.cms_teaser.php:388
 msgid "Blog Style"
 msgstr "Listendarstellung"
 
-#: classes/class.cms_teaser.php:451
+#: classes/class.cms_teaser.php:450
 msgid "Scaled"
 msgstr "Skaliert"
 
-#: classes/class.cms_teaser.php:454
+#: classes/class.cms_teaser.php:453
 msgid "Cropped"
 msgstr "Zugeschnitten"
 
-#: classes/class.cms_teaser.php:480
+#: classes/class.cms_teaser.php:479
 msgid "Sort Sequence"
 msgstr "Sortierreihenfolge"
 
-#: classes/class.cms_teaser.php:483
+#: classes/class.cms_teaser.php:482
 msgid "Creationdate"
 msgstr "Erstellungsdatum"
 
-#: classes/class.cms_teaser.php:486
+#: classes/class.cms_teaser.php:485
 msgid "Publisheddate"
 msgstr "Ver&ouml;ffentlichungsdatum"
 
-#: classes/class.cms_teaser.php:489
+#: classes/class.cms_teaser.php:488
 msgid "Modificationdate"
 msgstr "&Auml;nderungsdatum"
 
-#: classes/class.cms_teaser.php:578
+#: classes/class.cms_teaser.php:577
 msgid "Teasersettings"
 msgstr "Teasereinstellungen"
 
-#: classes/class.cms_teaser.php:579
+#: classes/class.cms_teaser.php:578
 msgid "Teasertitle"
 msgstr "Teaser&uuml;berschrift"
 
-#: classes/class.cms_teaser.php:580
+#: classes/class.cms_teaser.php:579
 msgid "Teaser Startarticle"
 msgstr "Teaser Startartikel"
 
-#: classes/class.cms_teaser.php:581
+#: classes/class.cms_teaser.php:580
 msgid "Sourcecategory"
 msgstr "Quellkategorie"
 
-#: classes/class.cms_teaser.php:582
+#: classes/class.cms_teaser.php:581
 msgid "Number of Articles"
 msgstr "Anzahl der Artikel"
 
-#: classes/class.cms_teaser.php:583 classes/class.cms_filelist.php:724
+#: classes/class.cms_teaser.php:582 classes/class.cms_filelist.php:724
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: classes/class.cms_teaser.php:584
+#: classes/class.cms_teaser.php:583
 msgid "Teaser Style"
 msgstr "Teaser Darstellung"
 
-#: classes/class.cms_teaser.php:585
+#: classes/class.cms_teaser.php:584
 msgid "Advanced Teaser Settings"
 msgstr "Erweiterte Teaser Einstellungen"
 
-#: classes/class.cms_teaser.php:586
+#: classes/class.cms_teaser.php:585
 msgid "Teaser Filter"
 msgstr "Teaser Filter"
 
-#: classes/class.cms_teaser.php:587
+#: classes/class.cms_teaser.php:586
 msgid "Teaser Sort"
 msgstr "Teaser Sortierung"
 
-#: classes/class.cms_teaser.php:589
+#: classes/class.cms_teaser.php:588
 msgid "Source Headline"
 msgstr "Quelle &Uuml;berschrift"
 
-#: classes/class.cms_teaser.php:590
+#: classes/class.cms_teaser.php:589
 msgid "Source Settings"
 msgstr "Quelleinstellungen"
 
-#: classes/class.cms_teaser.php:591
+#: classes/class.cms_teaser.php:590
 msgid "Source Text"
 msgstr "Quelle Text"
 
-#: classes/class.cms_teaser.php:592
+#: classes/class.cms_teaser.php:591
 msgid "Source Image"
 msgstr "Quelle Bild"
 
-#: classes/class.cms_teaser.php:593
+#: classes/class.cms_teaser.php:592
 msgid "Source Date"
 msgstr "Quelle Datum"
 
-#: classes/class.cms_teaser.php:598 classes/class.cms_filelist.php:720
+#: classes/class.cms_teaser.php:597 classes/class.cms_filelist.php:720
 msgid "General"
 msgstr "Allgemein"
 
-#: classes/class.cms_teaser.php:599
+#: classes/class.cms_teaser.php:598
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: classes/class.cms_teaser.php:600 classes/class.cms_filelist.php:721
+#: classes/class.cms_teaser.php:599 classes/class.cms_filelist.php:721
 msgid "Manual"
 msgstr "Manuell"
 
-#: classes/class.cms_teaser.php:601
+#: classes/class.cms_teaser.php:600
 msgid "Included Articles"
 msgstr "Eingebundene Artikel"
 
-#: classes/class.cms_teaser.php:602
+#: classes/class.cms_teaser.php:601
 msgid "Add Article"
 msgstr "Artikel hinzuf&uuml;gen"
 
-#: classes/class.cms_teaser.php:603
+#: classes/class.cms_teaser.php:602
 msgid "Manual Teaser Settings"
 msgstr "Manuelle Teaser Einstellungen"
 
-#: classes/class.cms_teaser.php:604
+#: classes/class.cms_teaser.php:603
 msgid "Manual Teaser"
 msgstr "Manueller Teaser"
 
-#: classes/class.cms_teaser.php:607
+#: classes/class.cms_teaser.php:606
 msgid "Size Settings"
 msgstr "Gr&ouml;&szlig;eneinstellungen"
 
-#: classes/class.cms_teaser.php:608
+#: classes/class.cms_teaser.php:607
 msgid "Characterlength"
 msgstr "Zeichenanzahl"
 
-#: classes/class.cms_teaser.php:609
+#: classes/class.cms_teaser.php:608
 msgid "Imagewidth"
 msgstr "Bildbreite"
 
-#: classes/class.cms_teaser.php:610
+#: classes/class.cms_teaser.php:609
 msgid "Imageheight"
 msgstr "Bildh&ouml;he"
 
-#: classes/class.cms_teaser.php:611
+#: classes/class.cms_teaser.php:610
 msgid "Image Scale"
 msgstr "Bildskalierung"
 
-#: classes/class.cms_teaser.php:648
+#: classes/class.cms_teaser.php:647
 msgid "Add"
 msgstr "Hinzuf&uuml;gen"
 
@@ -5052,15 +5052,15 @@ msgstr "RSS-Nachrichten aktivieren (empfohlen)"
 msgid "RSS notification is disabled"
 msgstr "RSS-Nachrichten sind deaktiviert"
 
-#: classes/class.update.notifier.php:718
+#: classes/class.update.notifier.php:716
 msgid "read more"
 msgstr "mehr lesen"
 
-#: classes/class.update.notifier.php:728 classes/class.update.notifier.php:737
+#: classes/class.update.notifier.php:726 classes/class.update.notifier.php:735
 msgid "No RSS content available"
 msgstr "Keine RSS-Inhalte verf&uuml;gbar"
 
-#: classes/class.update.notifier.php:735 classes/class.update.notifier.php:753
+#: classes/class.update.notifier.php:733 classes/class.update.notifier.php:751
 msgid ""
 "Your webserver does not have write permissions for the directory /contenido/"
 "cache/!"
@@ -5068,7 +5068,7 @@ msgstr ""
 "Ihr Webserver hat keine Schreibberechtigungen f&uuml;r das Verzeichnis /"
 "contenido/cache/!"
 
-#: classes/class.update.notifier.php:756
+#: classes/class.update.notifier.php:754
 msgid ""
 "Update notification is disabled! For actual update information, please "
 "activate."
@@ -5076,13 +5076,13 @@ msgstr ""
 "Die Update-Benachrichtigung ist deaktiviert! F&uuml;r aktuelle Update-"
 "Nachrichten, bitte aktivieren."
 
-#: classes/class.update.notifier.php:761
+#: classes/class.update.notifier.php:759
 #, fuzzy
 msgid "You have an unknown or unsupported version of ConLite!"
 msgstr ""
 "Sie haben eine unbekannte oder nicht unterst&uuml;tzte Version von ConLite!"
 
-#: classes/class.update.notifier.php:764
+#: classes/class.update.notifier.php:762
 #, fuzzy, php-format
 msgid ""
 "Your version of ConLite is deprecated and not longer supported for any "
@@ -5093,7 +5093,7 @@ msgstr ""
 "aktualisieren Sie auf eine h&ouml;here Version! <br /> <a href=\"%s\" class="
 "\"blue\" target=\"_blank\">Jetzt herunterladen!</a>"
 
-#: classes/class.update.notifier.php:768
+#: classes/class.update.notifier.php:766
 #, fuzzy, php-format
 msgid ""
 "A new version of ConLite is available! <br /> <a href=\"%s\" class=\"blue\" "
@@ -5102,7 +5102,7 @@ msgstr ""
 "Eine neue Version von ConLite ist verf&uuml;gbar! <br /> <a href=\"%s\" "
 "class=\"blue\" target=\"_blank\">%s jetzt herunterladen!</a>"
 
-#: classes/class.update.notifier.php:771
+#: classes/class.update.notifier.php:769
 #, fuzzy, php-format
 msgid ""
 "It seems to be that your version string was manipulated. ConLite %s does not "
@@ -5111,7 +5111,7 @@ msgstr ""
 "Es scheint so als wenn der ConLite Versionsstring manipuliert wurde. ConLite "
 "%s gibt es nicht!"
 
-#: classes/class.update.notifier.php:774
+#: classes/class.update.notifier.php:772
 #, fuzzy
 msgid "Your version of ConLite is up to date!"
 msgstr "Ihre Version von ConLite ist aktuell!"
@@ -5120,14 +5120,14 @@ msgstr "Ihre Version von ConLite ist aktuell!"
 msgid "\""
 msgstr ""
 
-#: classes/contenido/class.layout.php:179
+#: classes/contenido/class.layout.php:173
 msgid ""
 "Layout uses LayFromFile. Editing and Saving may not be possible in backend."
 msgstr ""
 "Das Layout liegt im Dateisystem. Das Bearbeiten und Speichern ist im Backend "
 "nicht möglich."
 
-#: classes/contenido/class.client.php:97 classes/class.client.php:131
+#: classes/contenido/class.client.php:85 classes/class.client.php:131
 msgid "No client"
 msgstr "Kein Mandant"
 
diff --git a/branches/NoDemoClient/conlite/locale/potfiles.txt b/branches/NoDemoClient/conlite/locale/potfiles.txt
index aa6c315..a20fb14 100644
--- a/branches/NoDemoClient/conlite/locale/potfiles.txt
+++ b/branches/NoDemoClient/conlite/locale/potfiles.txt
@@ -454,12 +454,14 @@
 ./classes/datatypes/class.datatype.php
 ./classes/class.version.php
 ./classes/class.conuser.php
+./classes/cApi/class.nav.main.php
 ./classes/cApi/class.upload.meta.php
 ./classes/cApi/class.action.php
 ./classes/cApi/class.system_property.php
 ./classes/cApi/class.upload.php
 ./classes/cApi/class.stat_archive.php
 ./classes/cApi/class.stat.php
+./classes/cApi/class.nav.sub.php
 ./classes/class.structure.php
 ./classes/class.search.php
 ./classes/class.input.helper.php
@@ -494,6 +496,8 @@
 ./classes/template/class.template.php
 ./classes/template/class.clIfFunctionParser.php
 ./classes/class.communications.php
+./classes/genericdb/class.item.cache.php
+./classes/genericdb/class.item.base.abstract.php
 ./classes/class.group.php
 ./classes/contenido/class.clientslang.php
 ./classes/contenido/class.file.php
diff --git a/branches/NoDemoClient/conlite/plugins/content_allocation/classes/class.content_allocation_treeview.php b/branches/NoDemoClient/conlite/plugins/content_allocation/classes/class.content_allocation_treeview.php
index 2ebc4ab..a43d396 100644
--- a/branches/NoDemoClient/conlite/plugins/content_allocation/classes/class.content_allocation_treeview.php
+++ b/branches/NoDemoClient/conlite/plugins/content_allocation/classes/class.content_allocation_treeview.php
@@ -56,7 +56,7 @@ class pApiContentAllocationTreeView extends pApiTree {
     public function __construct($uuid) {
         global $cfg;
 
-        parent::pApiTree($uuid);
+        parent::__construct($uuid);
         $this->tpl = new Template;
         $this->template = $cfg['pica']['treetemplate'];
     }
diff --git a/branches/NoDemoClient/data/config/production/config.autoloader.php b/branches/NoDemoClient/data/config/production/config.autoloader.php
index 6629a23..c9d6373 100644
--- a/branches/NoDemoClient/data/config/production/config.autoloader.php
+++ b/branches/NoDemoClient/data/config/production/config.autoloader.php
@@ -31,7 +31,7 @@
  * @since      file available since Contenido release >= 4.8.15
  *
  * {@internal
- *     created  2017-03-09
+ *     created  2017-06-09
  * }}
  */
 
diff --git a/branches/NoDemoClient/setup/data/client/client1.sql b/branches/NoDemoClient/setup/data/client/client1.sql
index 720cf7f..2fc78ff 100644
--- a/branches/NoDemoClient/setup/data/client/client1.sql
+++ b/branches/NoDemoClient/setup/data/client/client1.sql
@@ -1,4 +1,4 @@
-INSERT INTO !PREFIX!_clients VALUES (1, 'ConLite Demo', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '<!--{contenido_root}-->/cms/', '<!--{contenido_web}-->/cms/', 0, 0);
+INSERT INTO !PREFIX!_clients VALUES (1, 'ConLite Demo', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '<!--{conlite_root}-->/cms/', '<!--{conlite_web}-->/cms/', 0, 0);
 INSERT INTO !PREFIX!_clients_lang VALUES (1, 1, 1);
 INSERT INTO !PREFIX!_clients_lang VALUES (2, 1, 2);
 INSERT INTO !PREFIX!_lang VALUES (1, 'deutsch', 1, '48a365b4ce1e322a55ae9017f3daf0c0', '2015-06-01 12:00:00', '2015-06-01 12:00:00', 'utf-8', 'ltr');
diff --git a/branches/NoDemoClient/setup/data/client/client1_nocontent.sql b/branches/NoDemoClient/setup/data/client/client1_nocontent.sql
index 6824986..05c4be2 100644
--- a/branches/NoDemoClient/setup/data/client/client1_nocontent.sql
+++ b/branches/NoDemoClient/setup/data/client/client1_nocontent.sql
@@ -1,4 +1,4 @@
-INSERT INTO !PREFIX!_clients VALUES (1, 'Contenido Demo', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '<!--{contenido_root}-->/cms/', '<!--{contenido_web}-->/cms/', 0, 0);
+INSERT INTO !PREFIX!_clients VALUES (1, 'Contenido Demo', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '<!--{conlite_root}-->/cms/', '<!--{conlite_web}-->/cms/', 0, 0);
 INSERT INTO !PREFIX!_clients_lang VALUES (1, 1, 1);
 INSERT INTO !PREFIX!_lang VALUES (1, 'deutsch', 1, '48a365b4ce1e322a55ae9017f3daf0c0', '2008-04-14 15:46:39', '2008-04-14 15:46:50', 'iso-8859-1', 'ltr');
 INSERT INTO !PREFIX!_phplib_auth_user_md5 VALUES ('21232f297a57a5a743894a0e4a801fc3', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin[1]', 'Administrator Contenido Demo', 'admin_kunde@IhreSite.de', '', '', '', '', '', 1, '0000-00-00', '0000-00-00', '0000-00-00 00:00:00', '', '0');