Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r11870 -r11885
--- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11870)
+++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11885)
@@ -1321,5 +1321,32 @@
ALTER TABLE Language ADD IconDisabledURL VARCHAR(255) NULL DEFAULT NULL AFTER IconURL;
+UPDATE Phrase
+SET Translation = REPLACE(Translation, 'category', 'section')
+WHERE (Phrase IN (
+ 'la_confirm_maintenance', 'la_error_move_subcategory', 'la_error_RootCategoriesDelete',
+ 'la_error_unknown_category', 'la_fld_IsBaseCategory', 'la_nextcategory', 'la_prevcategory',
+ 'la_prompt_max_import_category_levels', 'la_prompt_root_name', 'la_SeparatedCategoryPath',
+ 'la_title_category_select'
+) OR Phrase LIKE 'la_Description_%') AND (PhraseType = 1);
+
+UPDATE Phrase SET Translation = REPLACE(Translation, 'Category', 'Section') WHERE PhraseType = 1;
+
+UPDATE Phrase
+SET Translation = REPLACE(Translation, 'categories', 'sections')
+WHERE (Phrase IN (
+ 'la_category_perpage_prompt', 'la_category_showpick_prompt', 'la_category_sortfield_prompt',
+ 'la_Description_in-portal:advanced_view', 'la_Description_in-portal:browse', 'la_Description_in-portal:site',
+ 'la_error_copy_subcategory', 'la_Msg_PropagateCategoryStatus', 'la_Text_DataType_1'
+)) AND (PhraseType = 1);
+
+UPDATE Phrase SET Translation = REPLACE(Translation, 'Categories', 'Sections') WHERE PhraseType = 1;
+
+UPDATE Phrase
+SET Translation = REPLACE(Translation, 'Page', 'Section')
+WHERE (Phrase IN ('la_col_PageTitle', 'la_col_System', 'la_fld_IsIndex', 'la_fld_PageTitle', 'la_section_Page')) AND (PhraseType = 1);
+
+DELETE FROM Phrase WHERE Phrase IN ('la_title_Adding_Page', 'la_title_Editing_Page', 'la_title_New_Page', 'la_fld_PageId');
+
DELETE FROM Modules WHERE Name = 'Proj-Base';
UPDATE Modules SET Version = '5.0.0', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/core/units/categories/categories_config.php
===================================================================
diff -u -r11760 -r11885
--- branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11760)
+++ branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11885)
@@ -80,8 +80,9 @@
'TitlePresets' => Array (
'default' => Array (
- 'new_status_labels' => Array ('c' => '!la_title_Adding_Page!'), // la_title_Adding_Category
- 'edit_status_labels' => Array ('c' => '!la_title_Editing_Page!'), // la_title_Editing_Category
+ 'new_status_labels' => Array ('c' => '!la_title_Adding_Category!'),
+ 'edit_status_labels' => Array ('c' => '!la_title_Editing_Category!'),
+ 'new_titlefield' => Array ('c' => '!la_title_New_Category!'),
),
'category_list' => Array ('prefixes' => Array ('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -r11870 -r11885
--- branches/RC/core/install/english.lang (.../english.lang) (revision 11870)
+++ branches/RC/core/install/english.lang (.../english.lang) (revision 11885)
@@ -9,7 +9,7 @@
QWRkIFRv
QWRtaW5pc3RyYXRpdmUgQ29uc29sZQ==
QWZmZWN0ZWQgUm93cw==
- QWxsb3cgZGVsZXRpbmcgTW9kdWxlIFJvb3QgQ2F0ZWdvcnk=
+ QWxsb3cgZGVsZXRpbmcgTW9kdWxlIFJvb3QgU2VjdGlvbg==
VmlldyBpbiBCcm93c2UgTW9kZQ==
R28gSW5zaWRl
QWx3YXlz
@@ -44,21 +44,21 @@
Ynl0ZXM=
QnkgdGhlbWU=
Q2FuY2Vs
- Q2F0ZWdvcnk=
- Q2F0ZWdvcnkgSW5kZXg=
+ U2VjdGlvbg==
+ U2VjdGlvbiBJbmRleA==
RGF0ZQ==
TnVtYmVyIG9mIGRheXMgZm9yIGEgY2F0LiB0byBiZSBORVc=
- Q2F0ZWdvcnkgRGVzY3JpcHRpb24=
+ U2VjdGlvbiBEZXNjcmlwdGlvbg==
RGVmYXVsdCBNRVRBIGRlc2NyaXB0aW9u
RGVmYXVsdCBNRVRBIEtleXdvcmRz
- Q2F0ZWdvcnkgTmFtZQ==
- TnVtYmVyIG9mIGNhdGVnb3JpZXMgcGVyIHBhZ2U=
- Q2F0ZWdvcmllcyBQZXIgUGFnZSAoU2hvcnRsaXN0KQ==
+ U2VjdGlvbiBOYW1l
+ TnVtYmVyIG9mIHNlY3Rpb25zIHBlciBwYWdl
+ U2VjdGlvbnMgUGVyIFBhZ2UgKFNob3J0bGlzdCk=
UGljaw==
UG9wdWxhcml0eQ==
- RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBjYXRlZ29yaWVz
+ RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBzZWN0aW9ucw==
QW5kIHRoZW4gYnk=
- T3JkZXIgY2F0ZWdvcmllcyBieQ==
+ T3JkZXIgc2VjdGlvbnMgYnk=
Q2xvc2U=
QWx0IFZhbHVl
Q2Vuc29yZWQgV29yZA==
@@ -96,8 +96,8 @@
QWRtaW4gUHJpbWFyeQ==
QWZmZWN0ZWQgSXRlbXM=
QmFzZWQgT24=
- Q2F0ZWdvcnk=
- Q2F0ZWdvcnkgTmFtZQ==
+ U2VjdGlvbg==
+ U2VjdGlvbiBOYW1l
Q2hhbmdlcw==
Q291bnRyeQ==
Q3JlYXRlZCBPbg==
@@ -161,7 +161,7 @@
T2NjdXJlZCBPbg==
UGFjayBOYW1l
SUQ=
- UGFnZSBUaXRsZQ==
+ U2VjdGlvbiBUaXRsZQ==
UGF0aA==
QWRk
RGVsZXRl
@@ -198,7 +198,7 @@
U3RvcCBXb3Jk
U3ViamVjdA==
U3VnZ2VzdGVkIENvcnJlY3Rpb24=
- UGFnZSBUeXBl
+ U2VjdGlvbiBUeXBl
SXRlbQ==
SXRlbSBUeXBl
VGVtcGxhdGUgVHlwZQ==
@@ -250,8 +250,8 @@
R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk=
UGF0aCB0byBXZWJzaXRl
UmV2aWV3cyBwZXIgcGFnZQ==
- UXVpY2sgQ2F0ZWdvcnkgUGVybWlzc2lvbiBSZWJ1aWxk
- IlJlY3ljbGUgQmluIiBDYXRlZ29yeUlk
+ UXVpY2sgU2VjdGlvbiBQZXJtaXNzaW9uIFJlYnVpbGQ=
+ IlJlY3ljbGUgQmluIiBTZWN0aW9uSWQ=
UmVnaXN0cmF0aW9uIE51bWJlcg==
UmVtZW1iZXIgTGFzdCBBZG1pbiBUZW1wbGF0ZQ==
UmVxdWlyZSBTU0wgZm9yIEFkbWluaXN0cmF0aXZlIENvbnNvbGU=
@@ -284,7 +284,7 @@
V2ViIGFkZHJlc3M=
WWFob28gQXBwbGljYXRpb25JZA==
QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRlbGV0ZSBzZWxlY3RlZCBFeHBvcnQgUHJlc2V0Pw==
- VGhlIGNhdGVnb3J5IHRyZWUgbXVzdCBiZSB1cGRhdGVkIHRvIHJlZmxlY3QgdGhlIGxhdGVzdCBjaGFuZ2Vz
+ VGhlIHNlY3Rpb24gdHJlZSBtdXN0IGJlIHVwZGF0ZWQgdG8gcmVmbGVjdCB0aGUgbGF0ZXN0IGNoYW5nZXM=
Q29udGFpbmVy
Q29udGludWU=
QXJ1YmE=
@@ -555,13 +555,13 @@
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbmV3eiBkZWZhdWx0IHNlYXJjaCBjb25maWd1cmF0aW9u
SW4tTmV3eiBnZW5lcmFsIGNvbmZpZ3VyYXRpb24gb3B0aW9ucw==
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBpbnN0YWxsIG5ldyBtb2R1bGVz
- VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIGNhdGVnb3JpZXMgYW5kIGl0ZW1zIGFjcm9zcyBhbGwgY2F0ZWdvcmllcw==
+ VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIHNlY3Rpb25zIGFuZCBpdGVtcyBhY3Jvc3MgYWxsIHNlY3Rpb25z
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBwZXJmb3JtIHN5c3RlbSBiYWNrdXBz
- VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gYnJvd3NlIHRoZSBjYXRhbG9nIGFuZCBtYW5hZ2UgY2F0ZWdvcmllcyBhbmQgaXRlbXM=
- VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIGNhdGVnb3J5IGN1c3RvbSBmaWVsZHM=
+ VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gYnJvd3NlIHRoZSBjYXRhbG9nIGFuZCBtYW5hZ2Ugc2VjdGlvbnMgYW5kIGl0ZW1z
+ VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIHNlY3Rpb24gY3VzdG9tIGZpZWxkcw==
Q29uZmlndXJlIENhdGVnb3J5IEVtYWlsIEV2ZW50cw==
Q29uZmlndXJlIENhdGVnb3J5IHNlYXJjaCBvcHRpb25z
- VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIGdlbmVyYWwgY2F0ZWdvcnkgc2V0dGluZ3M=
+ VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIGdlbmVyYWwgc2VjdGlvbiBzZXR0aW5ncw==
VGhpcyBpcyBhIGdlbmVyYWwgY29uZmd1cmF0aW9uIHNlY3Rpb24=
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgcmVnaW9uYWwgc2V0dGluZ3MsIG1hbmFnZSBhbmQgZWRpdCBsYW5ndWFnZXM=
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgQ1NTIHN0eWxlc2hlZXRzIGZvciB0aGVtZXMu
@@ -581,7 +581,7 @@
VGhpcyBzZWN0aW9uIHNob3dzIHRoZSBzZWFyY2ggbG9nIGFuZCBhbGxvd3MgdG8gbWFuYWdlIGl0
VGhpcyBzZWN0aW9uIGFsbG93cyB0byB2aWV3IFBIUCBjb25maWd1cmF0aW9u
VGhpcyBzZWN0aW9uIHNob3dzIGFsbCBhY3RpdmUgc2Vzc2lvbnMgYW5kIGFsbG93cyB0byBtYW5hZ2UgdGhlbQ==
- TWFuYWdlIHRoZSBzdHJ1Y3R1cmUgb2YgeW91ciBzaXRlLCBpbmNsdWRpbmcgY2F0ZWdvcmllcywgaXRlbXMgYW5kIGNhdGVnb3J5IHNldHRpbmdzLg==
+ TWFuYWdlIHRoZSBzdHJ1Y3R1cmUgb2YgeW91ciBzaXRlLCBpbmNsdWRpbmcgc2VjdGlvbnMsIGl0ZW1zIGFuZCBzZWN0aW9uIHNldHRpbmdzLg==
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBwZXJmb3JtIGRpcmVjdCBTUUwgcXVlcmllcyBvbiBJbi1wb3J0YWwgZGF0YWJhc2U=
TWFuYWdlIHN5c3RlbS13aWRlIHNldHRpbmdzLCBlZGl0IHRoZW1lcyBhbmQgbGFuZ3VhZ2Vz
VGhpcyBzZWN0aW9uIHNob3dzIGF2YWlsYWJsZSB0YWdzIGZvciB1c2luZyBpbiB0ZW1wbGF0ZXM=
@@ -605,20 +605,20 @@
RmlsZSBpcyBlbXB0eQ==
RW5hYmxlZA==
Q2FuJ3Qgc2F2ZSBhIGZpbGU=
- RXJyb3IgY29weWluZyBzdWJjYXRlZ29yaWVz
+ RXJyb3IgY29weWluZyBzdWJzZWN0aW9ucw==
Q3VzdG9tIGZpZWxkIHdpdGggaWRlbnRpY2FsIG5hbWUgYWxyZWFkeSBleGlzdHM=
VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu
RmlsZSBpcyB0b28gbGFyZ2U=
SW52YWxpZCBGaWxlIEZvcm1hdA==
aW52YWxpZCBvcHRpb24=
- RXJyb3IgbW92aW5nIHN1YmNhdGVnb3J5
+ RXJyb3IgbW92aW5nIHN1YnNlY3Rpb24=
UGFzc3dvcmRzIGRvIG5vdCBtYXRjaCE=
UmVxdWlyZWQgZmllbGQoLXMpIG5vdCBmaWxsZWQ=
cmVxdWlyZWQgY29sdW1ucyBtaXNzaW5n
- Um9vdCBjYXRlZ29yeSBvZiB0aGUgbW9kdWxlKHMpIGNhbiBub3QgYmUgZGVsZXRlZCE=
+ Um9vdCBzZWN0aW9uIG9mIHRoZSBtb2R1bGUocykgY2FuIG5vdCBiZSBkZWxldGVkIQ==
UmVjb3JkIGlzIG5vdCB1bmlxdWU=
- Q2F0ZWdvcnkgZmllbGQgbm90IHVuaXF1ZQ==
- VW5rbm93biBjYXRlZ29yeQ==
+ U2VjdGlvbiBmaWVsZCBub3QgdW5pcXVl
+ VW5rbm93biBzZWN0aW9u
dXNlciBub3QgZm91bmQ=
SW5jb3JyZWN0IGRhdGUgZm9ybWF0LCBwbGVhc2UgdXNlICglcykgZXguICglcyk=
SW5jb3JyZWN0IGRhdGEgZm9ybWF0LCBwbGVhc2UgdXNlICVz
@@ -637,12 +637,12 @@
UGVuZGluZyBBcnRpY2xlIFJldmlldyBBZGRlZA==
QXBwcm92ZSBBcnRpY2xlIFJldmlldw==
RGVjbGluZSBBcnRpY2xlIFJldmlldw==
- QWRkIENhdGVnb3J5
- QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=
- QXBwcm92ZSBDYXRlZ29yeQ==
- RGVueSBDYXRlZ29yeQ==
- TW9kaWZ5IENhdGVnb3J5
- RGVsZXRlIENhdGVnb3J5
+ QWRkIFNlY3Rpb24=
+ QWRkIFBlbmRpbmcgU2VjdGlvbg==
+ QXBwcm92ZSBTZWN0aW9u
+ RGVueSBTZWN0aW9u
+ TW9kaWZ5IFNlY3Rpb24=
+ RGVsZXRlIFNlY3Rpb24=
Q29tbW9uIEZvb3RlciBUZW1wbGF0ZQ==
VGhpcyBlLW1haWwgaXMgc2VudCB0byBhIHVzZXIgYWZ0ZXIgZmlsbGluZyBpbiB0aGUgQ29udGFjdCBVcyBmb3Jt
RW1haWwgZXZlbnRzIGltcG9ydCBwcm9ncmVzcw==
@@ -718,13 +718,13 @@
Qm9yZGVyIFJpZ2h0
Qm9yZGVycw==
Qm9yZGVyIFRvcA==
- Q2F0ZWdvcnk=
+ U2VjdGlvbg==
QXV0b21hdGljIERpcmVjdG9yeSBOYW1l
RGlyZWN0b3J5IE5hbWU=
- Q2F0ZWdvcnkgRm9ybWF0
- Q2F0ZWdvcnkgSUQ=
- Q2F0ZWdvcnkgc2VwYXJhdG9y
- Q2F0ZWdvcnkgVGVtcGxhdGU=
+ U2VjdGlvbiBGb3JtYXQ=
+ U2VjdGlvbiBJRA==
+ U2VjdGlvbiBzZXBhcmF0b3I=
+ U2VjdGlvbiBUZW1wbGF0ZQ==
Q2hhbmdlcw==
Q2hhcnNldA==
Q2hlY2sgRHVwbGljYXRlcyBieQ==
@@ -798,17 +798,17 @@
SWNvbiBVUkw=
SUQ=
SW1hZ2UgSUQ=
- SW1wb3J0IENhdGVnb3J5
+ SW1wb3J0IFNlY3Rpb24=
SW1wb3J0IEZpbGVuYW1l
SW5jbHVkZSBmaWVsZCB0aXRsZXM=
SW5kZXggVG9vbHMgQ29kZQ==
SW5wdXQgRGF0ZSBGb3JtYXQ=
SW5wdXQgVGltZSBGb3JtYXQ=
SW5zdGFsbCBNb2R1bGVz
SW5zdGFsbCBQaHJhc2UgVHlwZXM=
- VXNlIGN1cnJlbnQgY2F0ZWdvcnkgYXMgcm9vdCBmb3IgdGhlIGV4cG9ydA==
+ VXNlIGN1cnJlbnQgc2VjdGlvbiBhcyByb290IGZvciB0aGUgZXhwb3J0
VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=
- SXMgSW5kZXggUGFnZQ==
+ SXMgSW5kZXggU2VjdGlvbg==
UHJpbWFyeQ==
UmVxdWlyZWQ=
SXMgU3lzdGVt
@@ -838,7 +838,7 @@
TWFyZ2luIFRvcA==
TWFzdGVyIElE
TWFzdGVyIFByZWZpeA==
- TWF4aW11bSBudW1iZXIgb2YgQ2F0ZWdvcmllcyBvbiBJdGVtIGNhbiBiZSBhZGRlZCB0bw==
+ TWF4aW11bSBudW1iZXIgb2YgU2VjdGlvbnMgb24gSXRlbSBjYW4gYmUgYWRkZWQgdG8=
Q3VzdG9tIE1lbnUgSWNvbiAoaWUuIGltZy9tZW51X3Byb2R1Y3RzLmdpZik=
TWVudSBTdGF0dXM=
TWVzc2FnZSBCb2R5
@@ -864,9 +864,8 @@
UGFkZGluZyBUb3A=
VGl0bGUgKE9uIFBhZ2Up
VGl0bGUgKEhUTUwgJmx0O3RpdGxlJmd0Oyk=
- UGFnZSBJRA==
VGl0bGUgKE1lbnUgSXRlbSk=
- UGFnZSBUaXRsZQ==
+ U2VjdGlvbiBUaXRsZQ==
UGFyZW50IFNlY3Rpb24=
UGFzc3dvcmQ=
UGVyY2VudHMgQ29tcGxldGVk
@@ -878,7 +877,7 @@
UG9zaXRpb24=
UHJlZml4
UHJpbWFyeQ==
- UHJpbWFyeSBDYXRlZ29yeQ==
+ UHJpbWFyeSBTZWN0aW9u
UHJpbWFyeQ==
UHJpbWFyeSBUcmFuc2xhdGlvbg==
UHJpb3JpdHk=
@@ -914,7 +913,7 @@
U3ViamVjdA==
U3VibWl0dGVkIE9u
U3VnZ2VzdGVkIENvcnJlY3Rpb24=
- UG9pbnRzIHRvIENhdGVnb3J5
+ UG9pbnRzIHRvIFNlY3Rpb24=
SXRlbQ==
VGVtcGxhdGUgKGRlc2lnbik=
VGVtcGxhdGUgRmlsZQ==
@@ -970,7 +969,7 @@
TWlzc2luZyBvciBpbnZhbGlkIEluLVBvcnRhbCBMaWNlbnNl
SW5jb3JyZWN0IFVzZXJuYW1lIG9yIFBhc3N3b3Jk
SW52YWxpZCBzdGF0ZQ==
- Q2F0ZWdvcmllcw==
+ U2VjdGlvbnM=
TGlua3M=
QXJ0aWNsZXM=
VG9waWNz
@@ -1020,10 +1019,10 @@
TWFpbiBNZW51
TWV0cmlj
TWlzc2luZyBJbiBUaGVtZQ==
- Q2F0ZWdvcnkgcGF0aCBpbiBvbmUgZmllbGQ=
+ U2VjdGlvbiBwYXRoIGluIG9uZSBmaWVsZA==
TW9kdWxlIG5vdCBsaWNlbnNlZA==
TW9uZGF5
- QXBwbHkgdG8gYWxsIFN1Yi1jYXRlZ29yaWVzPw==
+ QXBwbHkgdG8gYWxsIFN1Yi1zZWN0aW9ucz8=
TmV2ZXI=
TmV2ZXIgRXhwaXJlcw==
TmV3
@@ -1036,7 +1035,7 @@
T3JkZXIgYXJ0aWNsZXMgYnk=
QW5kIHRoZW4gYnk=
U29ydCByZXZpZXdzIGJ5
- TmV4dCBjYXRlZ29yeQ==
+ TmV4dCBzZWN0aW9u
TmV4dCBncm91cA==
TmV4dCBVc2Vy
Tm8=
@@ -1114,7 +1113,7 @@
UGVyZm9ybWluZyBSZXN0b3Jl
QWxsb3dzIGFjY2VzcyB0byB0aGUgQWRtaW5pc3RyYXRpb24gdXRpbGl0eQ==
UmVhZC1Pbmx5IEFjY2VzcyBUbyBEYXRhYmFzZQ==
- Q2F0ZWdvcmllcw==
+ U2VjdGlvbnM=
TGlua3M=
QXJ0aWNsZXM=
VG9waWNz
@@ -1139,12 +1138,12 @@
UGhyYXNl
U2Vzc2lvbiBMb2c=
VmlzaXQ=
- UHJldmlvdXMgY2F0ZWdvcnk=
+ UHJldmlvdXMgc2VjdGlvbg==
UHJldmlvdXMgZ3JvdXA=
UHJldmlvdXMgVXNlcg==
UHJpbWFyeQ==
QWN0aXZlIEFydGljbGVz
- QWN0aXZlIENhdGVnb3JpZXM=
+ QWN0aXZlIFNlY3Rpb25z
QWN0aXZlIExpbmtz
QWN0aXZlIFRvcGljcw==
QWN0aXZlIFVzZXJz
@@ -1183,11 +1182,11 @@
QmFubmVkIFVzZXJz
RGF0ZSBvZiBCaXJ0aA==
Q2FjaGUgVGltZW91dCAoc2Vjb25kcyk=
- RWRpdG9yJ3MgUGljayBDYXRlZ29yaWVz
- Q2F0ZWdvcnkgSUQ=
- Q2F0ZWdvcnkgTGVhZCBTdG9yeSBBcnRpY2xlcw==
- Q2F0ZWdvcnkgUGVybWlzc2lvbnM=
- Q2F0ZWdvcnkgTGVhZCBTdG9yeQ==
+ RWRpdG9yJ3MgUGljayBTZWN0aW9ucw==
+ U2VjdGlvbiBJRA==
+ U2VjdGlvbiBMZWFkIFN0b3J5IEFydGljbGVz
+ U2VjdGlvbiBQZXJtaXNzaW9ucw==
+ U2VjdGlvbiBMZWFkIFN0b3J5
Q2Vuc29yc2hpcCBJZA==
Q2Vuc29yc2hpcCBXb3Jk
Q2hhcnNldA==
@@ -1217,7 +1216,7 @@
RGVzY3JpcHRpb24=
RGlyZWN0b3J5IE5hbWU=
RGlzYWJsZWQgQXJ0aWNsZXM=
- RGlzYWJsZWQgQ2F0ZWdvcmllcw==
+ RGlzYWJsZWQgU2VjdGlvbnM=
RGlzYWJsZWQgTGlua3M=
RGlzcGxheSBpbiBHcmlk
RGlzcGxheSBPcmRlcg==
@@ -1277,7 +1276,7 @@
TGluayBJbWFnZSBOYW1l
VGFibGUgTmFtZSBQcmVmaXg=
SW1wb3J0IFNvdXJjZQ==
- SW5pdGlhbCBJbXBvcnQgQ2F0ZWdvcnk=
+ SW5pdGlhbCBJbXBvcnQgU2VjdGlvbg==
SW4tTGluayBEYXRhYmFzZSBOYW1l
SW4tTGluayBEYXRhYmFzZSBQYXNzd29yZA==
SW4tTGluayBEYXRhYmFzZSBVc2VybmFtZQ==
@@ -1301,7 +1300,7 @@
RGF0ZSBGb3JtYXQ=
VGltZSBGb3JtYXQ=
TGFzdCBVcGRhdGVkIEFydGljbGU=
- TGFzdCBDYXRlZ29yeSBVcGRhdGU=
+ TGFzdCBTZWN0aW9uIFVwZGF0ZQ==
TGFzdCBVcGRhdGVkIExpbms=
TGFzdCBOYW1l
TGFzdCBVcGRhdGVkIFBvc3QgRGF0ZQ==
@@ -1310,7 +1309,7 @@
TGFzdCBVcGRhdGVkIFRvcGljIFRpbWU=
TGFzdCBOYW1l
U2l0ZSBMZWFkIFN0b3J5
- Q2F0ZWdvcnkgbGVhZCBhcnRpY2xl
+ U2VjdGlvbiBsZWFkIGFydGljbGU=
TGVhZCBTdG9yeSBBcnRpY2xlcw==
TGluayBJZA==
VG90YWwgTGluayBSZXZpZXdz
@@ -1329,7 +1328,7 @@
VG9waWMgTWF4aW11bSBIaXRz
VG9waWMgTWF4aW11bSBWb3Rlcw==
TWF4aW11bSBWb3RlcyBvZiBhbiBBcnRpY2xl
- TWF4aW1hbCBpbXBvcnRlZCBjYXRlZ29yeSBsZXZlbA==
+ TWF4aW1hbCBpbXBvcnRlZCBzZWN0aW9uIGxldmVs
TWVtYmVyc2hpcCBFeHBpcmVz
TGVmdCBNZW51IChUcmVlKSBXaWR0aA==
Rm9ybWF0
@@ -1345,9 +1344,9 @@
TmFtZQ==
TmV3
TmV3IEFydGljbGVz
- TmV3IENhdGVnb3JpZXM=
+ TmV3IFNlY3Rpb25z
TmV3ZXN0IEFydGljbGUgRGF0ZQ==
- TmV3ZXN0IENhdGVnb3J5IERhdGU=
+ TmV3ZXN0IFNlY3Rpb24gRGF0ZQ==
TmV3ZXN0IExpbmsgRGF0ZQ==
TmV3ZXN0IFBvc3QgRGF0ZQ==
TmV3ZXN0IFBvc3QgVGltZQ==
@@ -1367,7 +1366,7 @@
UGFzc3dvcmQ=
UmVwZWF0IFBhc3N3b3Jk
UGVuZGluZw==
- UGVuZGluZyBDYXRlZ29yaWVz
+ UGVuZGluZyBTZWN0aW9ucw==
UGVuZGluZyBJdGVtcw==
UGVuZGluZyBMaW5rcw==
UGVyZm9ybSB0aGlzIG9wZXJhdGlvbiBub3c/
@@ -1411,8 +1410,8 @@
UmV2aWV3ZWQgQnk=
UmV2aWV3IElE
UmV2aWV3IFRleHQ=
- U2VsZWN0IE1vZHVsZSBSb290IENhdGVnb3J5Og==
- Um9vdCBjYXRlZ29yeSBuYW1lIChsYW5ndWFnZSB2YXJpYWJsZSk=
+ U2VsZWN0IE1vZHVsZSBSb290IFNlY3Rpb246
+ Um9vdCBzZWN0aW9uIG5hbWUgKGxhbmd1YWdlIHZhcmlhYmxlKQ==
Um9vdCBQYXNzd29yZA==
UGxlYXNlIGVudGVyIHRoZSBSb290IHBhc3N3b3Jk
VmVyaWZ5IFJvb3QgUGFzc3dvcmQ=
@@ -1471,7 +1470,7 @@
UGVuZGluZyBUb3BpY3M=
VG90YWwgVG9waWNz
VG90YWwgVXNlcnMgd2l0aCBUb3BpY3M=
- VG90YWwgQ2F0ZWdvcmllcw==
+ VG90YWwgU2VjdGlvbnM=
VG90YWwgTGlua3M=
VG90YWwgVXNlciBHcm91cHM=
VHlwZQ==
@@ -1526,16 +1525,16 @@
U2F2ZSBVc2VybmFtZSBvbiBUaGlzIENvbXB1dGVy
U2VhcmNo
U2VhcmNo
- U2VhcmNoIENhdGVnb3JpZXM=
+ U2VhcmNoIFNlY3Rpb25z
U2VhcmNoIExpbmtz
U2VhcmNoIEFydGljbGVz
U2VhcmNoIFRvcGljcw==
- Q2F0ZWdvcmllczE=
+ U2VjdGlvbnMx
Q2xlYXIgU2VhcmNo
TmV3IFNlYXJjaA==
TUVUQSBJbmZvcm1hdGlvbg==
QmxvY2sgUHJvcGVydGllcw==
- Q2F0ZWdvcnk=
+ U2VjdGlvbg==
Q29uZmlnIEZpbGVz
Q291bnRlcnM=
Q3VzdG9tIEZpZWxkcw==
@@ -1547,7 +1546,7 @@
VXNlciBJdGVtcw==
TWVzc2FnZQ==
U2VjdGlvbiBPdmVydmlldw==
- UGFnZSBQcm9wZXJ0aWVz
+ U2VjdGlvbiBQcm9wZXJ0aWVz
UHJvcGVydGllcw==
UXVpY2sgTGlua3M=
UmVsYXRpb24=
@@ -1564,10 +1563,10 @@
U2VhcmNoIFVzZXJz
VmFsdWVz
U2VsZWN0IENvbHVtbnM=
- U2VsZWN0aW5nIENhdGVnb3JpZXM=
+ U2VsZWN0aW5nIFNlY3Rpb25z
RW1wdHkgc2VsZWN0aW9u
U2VtaWNvbG9u
- T25lIGZpZWxkIGZvciBlYWNoIGNhdGVnb3J5IGxldmVs
+ T25lIGZpZWxkIGZvciBlYWNoIHNlY3Rpb24gbGV2ZWw=
UmVzZXQgQ29uZmlncyBDYWNoZQ==
UmUtYnVpbGQgVGhlbWVzIEZpbGVz
UmVzZXQgU01TIE1lbnUgQ2FjaGU=
@@ -1679,9 +1678,9 @@
QmxvY2sgU3R5bGVz
Q2F0YWxvZw==
QnJvd3NlIFdlYnNpdGU=
- Q2F0ZWdvcmllcw==
+ U2VjdGlvbnM=
U2VsZWN0IEl0ZW0=
- Q2F0ZWdvcnkgU2VsZWN0
+ U2VjdGlvbiBTZWxlY3Q=
Q2Vuc29yc2hpcA==
Q2hhbmdlcyBMb2c=
Rm9ybXM=
@@ -1813,8 +1812,8 @@
QnVpbHQgSW4=
Ynl0ZXM=
Q2F0YWxvZw==
- Q2F0ZWdvcmllcw==
- Q2F0ZWdvcnk=
+ U2VjdGlvbnM=
+ U2VjdGlvbg==
Q2Vuc29yc2hpcA==
Q2l0eQ==
WW91IGFyZSBhYm91dCB0byBjbGVhciBjbGlwYm9hcmQgY29udGVudCENClByZXNzIE9LIHRvIGNvbnRpbnVlIG9yIENhbmNlbCB0byByZXR1cm4gdG8gcHJldmlvdXMgc2NyZWVuLg==
@@ -1828,7 +1827,7 @@
Q3VzdG9tIEZpZWxk
Q3VzdG9tIEZpZWxkcw==
RGF0YWJhc2UgU2V0dGluZ3MgLSBJbnRlY2huaWMgSW4tTGluayAyLng=
- Y2F0ZWdvcmllcw==
+ c2VjdGlvbnM=
RGF0YSBUeXBlIDI=
cG9zdA==
bGlua3M=
@@ -1916,7 +1915,7 @@
TmV3IENlbnNvciBXb3Jk
TmV3IEZpZWxk
TmV3IFRoZW1l
- Tm8gQ2F0ZWdvcmllcw==
+ Tm8gU2VjdGlvbnM=
Tm9uZQ==
Tm8gUGVybWlzc2lvbg==
Tm8gcGVybWlzc2lvbnM=
@@ -1951,7 +1950,7 @@
UmV2aWV3
UmV2aWV3cw==
Um9vdA==
- TW9kdWxlIFJvb3QgQ2F0ZWdvcnk=
+ TW9kdWxlIFJvb3QgU2VjdGlvbg==
cm93KHMp
UnVsZQ==
U2FtZQ==
@@ -2014,14 +2013,13 @@
QWRkaW5nIFRoZXNhdXJ1cw==
QWRkaW5nIEJhc2UgU3R5bGU=
QWRkaW5nIEJsb2NrIFN0eWxl
- QWRkaW5nIENhdGVnb3J5
+ QWRkaW5nIFNlY3Rpb24=
QWRkaW5nIENNUyBCbG9jaw==
QWRkaW5nIEZvcm0=
QWRkaW5nIEZvcm0gRmllbGQ=
QWRkaW5nIEdyb3Vw
QWRkaW5nIEltYWdl
QWRkaW5nIExhbmd1YWdl
- QWRkaW5nIFBhZ2U=
QWRkaW5nIFBocmFzZQ==
QWRkaW5nIEtleXdvcmQ=
QWRkaW5nIFJlbGF0aW9uc2hpcA==
@@ -2039,9 +2037,9 @@
QmFzZSBTdHlsZXM=
QmxvY2sgU3R5bGVz
Q2F0YWxvZw==
- Q2F0ZWdvcmllcw==
+ U2VjdGlvbnM=
U2VsZWN0IHJlbGF0aW9u
- U2VsZWN0IGNhdGVnb3J5
+ U2VsZWN0IHNlY3Rpb24=
Q2Vuc29yc2hpcA==
Q29sdW1uIFBpY2tlcg==
Q29tbXVuaXR5
@@ -2067,7 +2065,7 @@
RWRpdGluZyBUcmFuc2xhdGlvbg==
RWRpdGluZyBCYXNlIFN0eWxl
RWRpdGluZyBCbG9jayBTdHlsZQ==
- RWRpdGluZyBDYXRlZ29yeQ==
+ RWRpdGluZyBTZWN0aW9u
RWRpdGluZyBDTVMgQmxvY2s=
RWRpdGluZyBDdXN0b20gRmllbGQ=
RWRpdGluZyBFLW1haWw=
@@ -2076,7 +2074,6 @@
RWRpdGluZyBHcm91cA==
RWRpdGluZyBJbWFnZQ==
RWRpdGluZyBMYW5ndWFnZQ==
- RWRpdGluZyBQYWdl
RWRpdGluZyBQaHJhc2U=
RWRpdGluZyBLZXl3b3Jk
S2V5d29yZA==
@@ -2086,7 +2083,7 @@
RWRpdGluZyBUaGVtZQ==
RWRpdGluZyBVc2Vy
U2l0ZSBTdHJ1Y3R1cmU=
- RWRpdCBDYXRlZ29yeQ==
+ RWRpdCBTZWN0aW9u
RWRpdCBHcm91cA==
U2l0ZSBTdHJ1Y3R1cmU=
U2l0ZSBTdHJ1Y3R1cmU=
@@ -2130,13 +2127,12 @@
TmV3IFRoZW1l
TmV3IEJhc2UgU3R5bGU=
TmV3IEJsb2NrIFN0eWxl
- TmV3IENhdGVnb3J5
+ TmV3IFNlY3Rpb24=
TmV3IEZvcm0=
TmV3IEZvcm0gRmllbGQ=
TmV3IEdyb3Vw
TmV3IEltYWdl
TmV3IExhbmd1YWdl
- TmV3IFBhZ2U=
TmV3IFBocmFzZQ==
TmV3IFJlbGF0aW9uc2hpcA==
TmV3IFJldmlldw==
@@ -2184,7 +2180,7 @@
VGhlbWVz
VGhlc2F1cnVz
VG9vbHM=
- VXBkYXRpbmcgQ2F0ZWdvcmllcw==
+ VXBkYXRpbmcgU2VjdGlvbnM=
VXNlcnM=
U2VsZWN0IHVzZXI=
VXNlcnMgTWFuYWdlbWVudA==
@@ -2194,13 +2190,13 @@
V2Vic2l0ZQ==
V2Vic2l0ZSBTZXR0aW5ncw==
dG8=
- Q3Vyci4gQ2F0ZWdvcnk=
+ Q3Vyci4gU2VjdGlvbg==
RG93bg==
VXA=
QWRk
QWRkIFVzZXIgdG8gR3JvdXA=
QWRkIFVzZXIgVG8gR3JvdXA=
- QWRkIENhdGVnb3J5
+ QWRkIFNlY3Rpb24=
QWRkIFByb2R1Y3Q=
QXBwbHkgUnVsZXM=
QXBwcm92ZQ==
@@ -2221,7 +2217,7 @@
RGVueQ==
RGlzYWJsZQ==
RWRpdA==
- RWRpdCBDdXJyZW50IENhdGVnb3J5
+ RWRpdCBDdXJyZW50IFNlY3Rpb24=
RGlzYWJsZQ==
RW5hYmxl
RnJvbnQgT25seQ==
@@ -2250,7 +2246,7 @@
TmV3IFRoZW1l
TmV3IFVzZXI=
U3RhcnQgTmV3IFZhbGlkYXRpb24=
- TmV3IENhdGVnb3J5
+ TmV3IFNlY3Rpb24=
TmV3IENlbnNvciBXb3Jk
TmV3IENvdXBvbg==
TmV3IEN1c3RvbSBGaWVsZA==
@@ -2281,7 +2277,7 @@
U2V0IFByaW1hcnkgR3JvdXA=
UHJpbnQ=
UHJvY2VzcyBRdWV1ZQ==
- UmVidWlsZCBDYXRlZ29yeSBDYWNoZQ==
+ UmVidWlsZCBTZWN0aW9uIENhY2hl
UmVjYWxjdWxhdGUgUHJpb3JpdGllcw==
UmVmcmVzaA==
RGVsZXRlIFVzZXIgRnJvbSBHcm91cA==
@@ -2300,13 +2296,13 @@
U2VuZCBFLW1haWw=
U2VuZCBFLW1haWw=
U2V0IFByaW1hcnk=
- U2V0IFByaW1hcnkgQ2F0ZWdvcnk=
+ U2V0IFByaW1hcnkgU2VjdGlvbg==
U2V0IFByaW1hcnkgTGFuZ3VhZ2U=
U2hvdyBNZW51
Q2FuY2Vs
U3luY2hyb25pemUgTGFuZ3VhZ2Vz
VG9vbHM=
- VXAgYSBDYXRlZ29yeQ==
+ VXAgYSBTZWN0aW9u
VmFsaWRhdGU=
Vmlldw==
Vmlldw==
Index: branches/RC/core/units/structure/structure_config.php
===================================================================
diff -u -r11705 -r11885
--- branches/RC/core/units/structure/structure_config.php (.../structure_config.php) (revision 11705)
+++ branches/RC/core/units/structure/structure_config.php (.../structure_config.php) (revision 11885)
@@ -38,9 +38,9 @@
'TableName' => TABLE_PREFIX.'Category',
'TitlePresets' => Array(
- 'default' => Array( 'new_status_labels' => Array('st'=>'!la_title_Adding_Page!'),
- 'edit_status_labels' => Array('st'=>'!la_title_Editing_Page!'),
- 'new_titlefield' => Array('st'=>''),
+ 'default' => Array( 'new_status_labels' => Array('st'=>'!la_title_Adding_Category!'),
+ 'edit_status_labels' => Array('st'=>'!la_title_Editing_Category!'),
+ 'new_titlefield' => Array('st'=>'!la_title_New_Category!'),
),
'structure_list' => Array(
'prefixes' => Array('st_List', 'st.current'),