Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2013-08-09 12:12:05 +02:00
commit a42c89a110

View File

@ -113,7 +113,7 @@ en:
MENUTITLE: 'Edit Page'
AddPageRestriction: 'Note: Some page types are not allowed for this selection'
CMSMain_left_ss:
'APPLY_FILTER': 'Apply Filter'
APPLY_FILTER: 'Apply Filter'
RESET: Reset
CMSPageAddController:
ParentMode_child: 'Under another page'