Permalink
Browse files

Merge in changes from 3.0.1 final

  • Loading branch information...
Hamish Friedlander
Hamish Friedlander committed Jul 31, 2012
2 parents 6d5d3d1 + 7959642 commit 4c91a56277e66aea4abb7e2192e07115238e7bce
Showing with 2,129 additions and 1,566 deletions.
  1. +1 −0 code/controllers/CMSMain.php
  2. +36 −0 javascript/lang/mi_NZ.js
  3. +16 −14 lang/af.yml
  4. +16 −14 lang/ar.yml
  5. +16 −14 lang/ast.yml
  6. +16 −14 lang/az.yml
  7. +16 −14 lang/bg.yml
  8. +16 −14 lang/bs.yml
  9. +16 −14 lang/ca.yml
  10. +16 −14 lang/cs.yml
  11. +79 −77 lang/da.yml
  12. +18 −16 lang/de.yml
  13. +16 −14 lang/el.yml
  14. +12 −10 lang/en.yml
  15. +16 −14 lang/en_GB.yml
  16. +16 −14 lang/eo.yml
  17. +16 −14 lang/es.yml
  18. +16 −14 lang/es_AR.yml
  19. +16 −14 lang/es_MX.yml
  20. +41 −39 lang/et_EE.yml
  21. +16 −14 lang/fa_IR.yml
  22. +16 −14 lang/fi.yml
  23. +16 −14 lang/fo.yml
  24. +18 −16 lang/fr.yml
  25. +16 −14 lang/gl_ES.yml
  26. +16 −14 lang/he_IL.yml
  27. +16 −14 lang/hr.yml
  28. +16 −14 lang/hu.yml
  29. +16 −14 lang/hy_AM.yml
  30. +16 −14 lang/id.yml
  31. +16 −14 lang/is.yml
  32. +16 −14 lang/it.yml
  33. +174 −172 lang/ja_JP.yml
  34. +16 −14 lang/km.yml
  35. +16 −14 lang/ko.yml
  36. +16 −14 lang/lt.yml
  37. +16 −14 lang/lv.yml
  38. +347 −345 lang/mi_NZ.yml
  39. +16 −14 lang/ms.yml
  40. +410 −0 lang/my.yml
  41. +41 −39 lang/nb.yml
  42. +16 −14 lang/ne.yml
  43. +24 −22 lang/nl.yml
  44. +16 −14 lang/pa.yml
  45. +16 −14 lang/pl.yml
  46. +16 −14 lang/pt.yml
  47. +16 −14 lang/pt_BR.yml
  48. +51 −49 lang/ro.yml
  49. +16 −14 lang/ru.yml
  50. +16 −14 lang/si.yml
  51. +16 −14 lang/sk.yml
  52. +16 −14 lang/sl.yml
  53. +16 −14 lang/sr.yml
  54. +16 −14 lang/sv.yml
  55. +16 −14 lang/th.yml
  56. +16 −14 lang/tr.yml
  57. +16 −14 lang/uk.yml
  58. +16 −14 lang/uz.yml
  59. +16 −14 lang/vi_VN.yml
  60. +16 −14 lang/zh_CN.yml
  61. +125 −123 lang/zh_TW.yml
@@ -700,6 +700,7 @@ public function ListViewForm() {
$columns->setFieldCasting(array(
'Created' => 'Datetime->Ago',
'LastEdited' => 'Datetime->Ago',
+ 'getTreeTitle' => 'HTMLText'
));
$controller = $this;
View
@@ -0,0 +1,36 @@
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+ if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+ ss.i18n.addDictionary('mi_NZ', {
+ 'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "Me tiaki i te whārangi i mua i te tāpiri tamariki ki raro",
+ 'CMSMAIN.CANTADDCHILDREN' : "Kāore e taea te tāpiri tamariki ki te kōpuku kua tīpakotia",
+ 'CMSMAIN.ERRORADDINGPAGE' : 'Hapa tāpiri whārangi',
+ 'CMSMAIN.FILTEREDTREE' : 'Me whakaatu te rākau kua tātaritia i ngā whārangi kua hurihia anake',
+ 'CMSMAIN.ERRORFILTERPAGES' : 'Kāore i taea te tātari i te rākau kia whakaaturia ngā whārangi kua hurihia anake<br />%s',
+ 'CMSMAIN.ERRORUNFILTER' : 'Rākau tē tātaritia',
+ 'CMSMAIN.PUBLISHINGPAGES' : 'Whakaputa whārangi ana...',
+ 'CMSMAIN.SELECTONEPAGE' : "Kōwhiria kotahi whārangi i te iti rawa.",
+ 'CMSMAIN.ERRORPUBLISHING' : 'Kua hapa te whakaputa whārangi',
+ 'CMSMAIN.REALLYDELETEPAGES' : "Kei te tino hiahia muku i ngā whārangi kua tohua %s?",
+ 'CMSMAIN.DELETINGPAGES' : 'Muku whārangi ana...',
+ 'CMSMAIN.ERRORDELETINGPAGES': 'Kua hapa te muku whārangi',
+ 'CMSMAIN.PUBLISHING' : 'Whakaputa ana...',
+ 'CMSMAIN.RESTORING': 'Whakaora ana...',
+ 'CMSMAIN.ERRORREVERTING': 'Kua hapa te hoki ki ngā ihirangi hohe',
+ 'CMSMAIN.SAVING' : 'Tiaki ana...',
+ 'CMSMAIN.SELECTMOREPAGES' : "Kua kōwhiria e %s ngā whārangi.\n\nHe tika kia mahia tēnei mahi?",
+ 'CMSMAIN.ALERTCLASSNAME': 'Ka whakahōutia te momo whārangi i muri i te tiaki i te whārangi',
+ 'CMSMAIN.URLSEGMENTVALIDATION': 'Ka taea anake ngā pūāhua, ngā mati me ngā tohuhono i ngā PRO.',
+ 'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Kei te tino hiahia muku i ngā kōpaki %s?",
+ 'AssetTableField.REALLYDELETE': "Kei te tino hiahia muku i ngā kōnae kua tohua?",
+ 'AssetTableField.MOVING': 'Neke ana i te %s kōnae',
+ 'CMSMAIN.AddSearchCriteria': 'Tāpiri Paearu',
+ 'WidgetAreaEditor.TOOMANY': 'Aroha noa, kua taea te mōrahi o ngā taupānga iti i tēnei wāhi',
+ 'AssetAdmin.ConfirmDelete': 'Kei te tino hiahia muku i tēnei kōpaki me ngā kōnae i roto?',
+ 'Folder.Name': 'Ingoa kōpaki',
+ 'Tree.AddSubPage': 'Tāpiritia he whārangi hōu ki konei',
+ 'Tree.EditPage': 'Whakatika',
+ 'CMSMain.ConfirmRestoreFromLive': "Kei te tino hiahia tārua i te ihirangi kua whakaputaina ki te pae hukihuki?",
+ 'CMSMain.RollbackToVersion': "Kei te tino hiahia hoki ki te tauira #%s o tēnei whārangi?"
+ });
+}
View
@@ -47,6 +47,7 @@ af:
HasBrokenLink: 'has broken link'
HasBrokenLinkAndFile: 'has broken link and file'
HoverTitleEditPage: 'Edit page'
+ NOITEMSFOUND: 'No items found'
PageName: 'Page name'
ReasonDropdown: 'Problem to check'
ReasonDropdownBROKENFILE: 'Broken file'
@@ -69,6 +70,8 @@ af:
UNPUBLISHED_PAGES: 'Un-published %d pages'
UNPUBLISH_PAGES: Un-publish
CMSFileAddController:
+ CANACCESS: 'You can access the archived site at this link:'
+ HAVEASKED: 'U het gevra om die inhoud van ons werf te sien op'
MENUTITLE: Files
CMSMain:
ACCESS: 'Access to ''{title}'' section'
@@ -82,6 +85,8 @@ af:
DELETEFP: Delete
DESCREMOVED: 'and {count} descendants'
EMAIL: Epos
+ EditTree: 'Edit Tree'
+ ListFiltered: 'Filtered list.'
MENUTITLE: 'Edit Page'
NEW: Nuut
PAGENOTEXISTS: 'Hierdie bladsy bestaan nie'
@@ -106,6 +111,8 @@ af:
TabContent: Content
TabHistory: History
TabSettings: Settings
+ TreeFiltered: 'Filtered tree.'
+ TreeFilteredClear: 'Clear filter'
CMSPageAddController:
MENUTITLE: 'Add page'
ParentMode_child: 'Under another page'
@@ -143,9 +150,12 @@ af:
UNKNOWN: Unknown
WHEN: When
CMSSiteTreeFilter_ChangedPages:
+ DISPLAYING: Displaying
ENABLEDRAGGING: 'Drag''n''drop'
GO: Go
MULTISELECT: Multi-selection
+ OF: of
+ TO: to
Title: 'Changed pages'
VIEWFIRST: 'Wys eerste'
VIEWLAST: 'Wys laaste'
@@ -155,6 +165,8 @@ af:
Title: 'All pages, including deleted'
CMSSiteTreeFilter_Search:
Title: 'All pages'
+ CaseStudy:
+ DESCRIPTION: 'Case study page to fature work examples'
ContentControl:
NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
ContentController:
@@ -216,6 +228,7 @@ af:
UploadFilesButton: Upload
GridFieldTestPage:
DESCRIPTION: 'Generic content page'
+ FILTER: Filter
LeftAndMain:
DELETED: Deleted.
PreviewButton: Preview
@@ -225,23 +238,11 @@ af:
VersionUnknown: Unknown
LegacyTableFieldsTestPage:
DESCRIPTION: 'Generic content page'
- MyNonRootPage:
- CANACCESS: 'You can access the archived site at this link:'
- DESCRIPTION: 'Generic content page'
- HAVEASKED: 'U het gevra om die inhoud van ons werf te sien op'
- MyOtherPage:
- DESCRIPTION: 'Generic content page'
- MyPage:
- DESCRIPTION: 'Generic content page'
- MyRandomPage:
- DESCRIPTION: 'Generic content page'
- PackageManagerPage:
- DESCRIPTION: 'Generic content page'
- RESET: Reset
Page:
DESCRIPTION: 'Generic content page'
Permission:
CMS_ACCESS_CATEGORY: 'IBS Toegang'
+ RESET: Reset
Permissions:
CONTENT_CATEGORY: 'Inhoud permissies'
PERMISSIONS_CATEGORY: 'Rolle en toegang permissies'
@@ -323,6 +324,7 @@ af:
DELETEDPAGEHELP: 'Page is no longer published'
DELETEDPAGESHORT: Deleted
DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
+ DESCRIPTION: 'Generic content page'
DependtPageColumnLinkType: 'Link type'
DependtPageColumnURL: URL
EDITANYONE: 'Enige iemand wat in die IBS kan inteken'
@@ -344,6 +346,7 @@ af:
METATITLE: 'Meta Title'
MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
MODIFIEDONDRAFTSHORT: Modified
+ MetadataToggle: Metadata
PAGELOCATION: 'Page location'
PAGETITLE: 'Page name'
PAGETYPE: 'Blaai soort'
@@ -388,7 +391,6 @@ af:
EXPORTTO: 'Export to that folder'
NAME: 'Static exporter'
TableListField:
- FILTER: Filter
SELECT: 'Select:'
TestFileUploadPage:
DESCRIPTION: 'Generic content page'
View
@@ -47,6 +47,7 @@ ar:
HasBrokenLink: 'يحتوى مرابط مكسور'
HasBrokenLinkAndFile: 'يحتوى ملف ورابط مكسور'
HoverTitleEditPage: 'تعديل صفحة'
+ NOITEMSFOUND: 'No items found'
PageName: 'اسم الصفحة'
ReasonDropdown: 'مشكلة للتأكد'
ReasonDropdownBROKENFILE: 'ملف مكسور'
@@ -69,6 +70,8 @@ ar:
UNPUBLISHED_PAGES: '%d من الصفحات غير المنشورة'
UNPUBLISH_PAGES: 'غير منشور'
CMSFileAddController:
+ CANACCESS: 'يمكنك الدخول إلى أرشيف الموقع عن طريق الرابط التالي :'
+ HAVEASKED: 'تم طلب مشاهدة محتوى الموقع في'
MENUTITLE: Files
CMSMain:
ACCESS: 'Access to ''{title}'' section'
@@ -82,6 +85,8 @@ ar:
DELETEFP: 'حذف من الموقع المنشور'
DESCREMOVED: 'and {count} descendants'
EMAIL: 'البريد الإلكتروني'
+ EditTree: 'Edit Tree'
+ ListFiltered: 'Filtered list.'
MENUTITLE: 'Edit Page'
NEW: جديد
PAGENOTEXISTS: 'هذه الصفحة غير موجودة'
@@ -106,6 +111,8 @@ ar:
TabContent: Content
TabHistory: History
TabSettings: Settings
+ TreeFiltered: 'Filtered tree.'
+ TreeFilteredClear: 'Clear filter'
CMSPageAddController:
MENUTITLE: 'Add page'
ParentMode_child: 'Under another page'
@@ -143,9 +150,12 @@ ar:
UNKNOWN: Unknown
WHEN: When
CMSSiteTreeFilter_ChangedPages:
+ DISPLAYING: Displaying
ENABLEDRAGGING: 'Drag''n''drop'
GO: اذهب
MULTISELECT: Multi-selection
+ OF: of
+ TO: to
Title: 'Changed pages'
VIEWFIRST: 'عرض الأول'
VIEWLAST: 'عرض الأخير'
@@ -155,6 +165,8 @@ ar:
Title: 'All pages, including deleted'
CMSSiteTreeFilter_Search:
Title: 'All pages'
+ CaseStudy:
+ DESCRIPTION: 'Case study page to fature work examples'
ContentControl:
NOTEWONTBESHOWN: 'تنبيه: هذه الرسالة لن يتم عرضها لزوار موقعك'
ContentController:
@@ -216,6 +228,7 @@ ar:
UploadFilesButton: Upload
GridFieldTestPage:
DESCRIPTION: 'Generic content page'
+ FILTER: Filter
LeftAndMain:
DELETED: Deleted.
PreviewButton: Preview
@@ -225,23 +238,11 @@ ar:
VersionUnknown: Unknown
LegacyTableFieldsTestPage:
DESCRIPTION: 'Generic content page'
- MyNonRootPage:
- CANACCESS: 'يمكنك الدخول إلى أرشيف الموقع عن طريق الرابط التالي :'
- DESCRIPTION: 'Generic content page'
- HAVEASKED: 'تم طلب مشاهدة محتوى الموقع في'
- MyOtherPage:
- DESCRIPTION: 'Generic content page'
- MyPage:
- DESCRIPTION: 'Generic content page'
- MyRandomPage:
- DESCRIPTION: 'Generic content page'
- PackageManagerPage:
- DESCRIPTION: 'Generic content page'
- RESET: Reset
Page:
DESCRIPTION: 'Generic content page'
Permission:
CMS_ACCESS_CATEGORY: 'الوصل لنظام إدارة المحتوى'
+ RESET: Reset
Permissions:
CONTENT_CATEGORY: 'تصاريح المحتوى'
PERMISSIONS_CATEGORY: 'تصريح الدخول والقواعد'
@@ -323,6 +324,7 @@ ar:
DELETEDPAGEHELP: 'Page is no longer published'
DELETEDPAGESHORT: Deleted
DEPENDENT_NOTE: 'الصفحات التالية تعتمد على هذه الصفحة. وهذا يشمل صفحات الظاهري، وصفحات معيد التوجيه، والصفحات التي تحتوي على روابط المحتوى.'
+ DESCRIPTION: 'Generic content page'
DependtPageColumnLinkType: 'نوع الرابط'
DependtPageColumnURL: رابط
EDITANYONE: 'أي شخص '
@@ -344,6 +346,7 @@ ar:
METATITLE: العنوان
MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
MODIFIEDONDRAFTSHORT: Modified
+ MetadataToggle: Metadata
PAGELOCATION: 'موقع الضفحة'
PAGETITLE: 'اسم الصفحة'
PAGETYPE: 'نوع الصفحة'
@@ -388,7 +391,6 @@ ar:
EXPORTTO: 'تصدير إلى مجلد'
NAME: 'المصدر الثابت Exporter'
TableListField:
- FILTER: Filter
SELECT: اختيار
TestFileUploadPage:
DESCRIPTION: 'Generic content page'
View
@@ -47,6 +47,7 @@ ast:
HasBrokenLink: 'has broken link'
HasBrokenLinkAndFile: 'has broken link and file'
HoverTitleEditPage: 'Edit page'
+ NOITEMSFOUND: 'No items found'
PageName: 'Page name'
ReasonDropdown: 'Problem to check'
ReasonDropdownBROKENFILE: 'Broken file'
@@ -69,6 +70,8 @@ ast:
UNPUBLISHED_PAGES: 'Un-published %d pages'
UNPUBLISH_PAGES: Un-publish
CMSFileAddController:
+ CANACCESS: 'You can access the archived site at this link:'
+ HAVEASKED: 'You have asked to view the content of our site on'
MENUTITLE: Files
CMSMain:
ACCESS: 'Access to ''{title}'' section'
@@ -82,6 +85,8 @@ ast:
DELETEFP: Delete
DESCREMOVED: 'and {count} descendants'
EMAIL: Email
+ EditTree: 'Edit Tree'
+ ListFiltered: 'Filtered list.'
MENUTITLE: 'Edit Page'
NEW: 'New '
PAGENOTEXISTS: 'This page doesn''t exist'
@@ -106,6 +111,8 @@ ast:
TabContent: Content
TabHistory: History
TabSettings: Settings
+ TreeFiltered: 'Filtered tree.'
+ TreeFilteredClear: 'Clear filter'
CMSPageAddController:
MENUTITLE: 'Add page'
ParentMode_child: 'Under another page'
@@ -143,9 +150,12 @@ ast:
UNKNOWN: Unknown
WHEN: When
CMSSiteTreeFilter_ChangedPages:
+ DISPLAYING: Displaying
ENABLEDRAGGING: 'Drag''n''drop'
GO: Go
MULTISELECT: Multi-selection
+ OF: of
+ TO: to
Title: 'Changed pages'
VIEWFIRST: 'View first'
VIEWLAST: 'View last'
@@ -155,6 +165,8 @@ ast:
Title: 'All pages, including deleted'
CMSSiteTreeFilter_Search:
Title: 'All pages'
+ CaseStudy:
+ DESCRIPTION: 'Case study page to fature work examples'
ContentControl:
NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors'
ContentController:
@@ -216,6 +228,7 @@ ast:
UploadFilesButton: Upload
GridFieldTestPage:
DESCRIPTION: 'Generic content page'
+ FILTER: Filter
LeftAndMain:
DELETED: Deleted.
PreviewButton: Previsualización
@@ -225,23 +238,11 @@ ast:
VersionUnknown: Desconocío
LegacyTableFieldsTestPage:
DESCRIPTION: 'Generic content page'
- MyNonRootPage:
- CANACCESS: 'You can access the archived site at this link:'
- DESCRIPTION: 'Generic content page'
- HAVEASKED: 'You have asked to view the content of our site on'
- MyOtherPage:
- DESCRIPTION: 'Generic content page'
- MyPage:
- DESCRIPTION: 'Generic content page'
- MyRandomPage:
- DESCRIPTION: 'Generic content page'
- PackageManagerPage:
- DESCRIPTION: 'Generic content page'
- RESET: Reset
Page:
DESCRIPTION: 'Generic content page'
Permission:
CMS_ACCESS_CATEGORY: 'CMS Access'
+ RESET: Reset
Permissions:
CONTENT_CATEGORY: 'Content permissions'
PERMISSIONS_CATEGORY: 'Roles and access permissions'
@@ -323,6 +324,7 @@ ast:
DELETEDPAGEHELP: 'Page is no longer published'
DELETEDPAGESHORT: Deleted
DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.'
+ DESCRIPTION: 'Generic content page'
DependtPageColumnLinkType: 'Link type'
DependtPageColumnURL: URL
EDITANYONE: 'Anyone who can log-in to the CMS'
@@ -344,6 +346,7 @@ ast:
METATITLE: 'Meta Title'
MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
MODIFIEDONDRAFTSHORT: Modified
+ MetadataToggle: Metadata
PAGELOCATION: 'Page location'
PAGETITLE: 'Page name'
PAGETYPE: 'Triba de páxina'
@@ -388,7 +391,6 @@ ast:
EXPORTTO: 'Export to that folder'
NAME: 'Static exporter'
TableListField:
- FILTER: Filter
SELECT: 'Select:'
TestFileUploadPage:
DESCRIPTION: 'Generic content page'
Oops, something went wrong.

0 comments on commit 4c91a56

Please sign in to comment.