From 9ce2492ade82430bb0b0693b91ea5c4007bb2b7b Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sun, 24 Sep 2017 01:17:37 +0200 Subject: [PATCH 1/3] Bug fixes on dashboard --- bl-kernel/admin/views/dashboard.php | 2 +- bl-kernel/admin/views/pages.php | 2 +- bl-kernel/admin/views/settings-advanced.php | 4 ++-- bl-kernel/dbpages.class.php | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php index 0bfb0673..92ea58b5 100644 --- a/bl-kernel/admin/views/dashboard.php +++ b/bl-kernel/admin/views/dashboard.php @@ -146,7 +146,7 @@ echo '
  • '.$Language->g('There are no draft pages').'
    • '; } else { - $keys = array_keys($scheduledPages); + $keys = array_keys($draftPages); foreach($keys as $key) { $page = buildPage($key); echo '
  • '.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'
    • '; diff --git a/bl-kernel/admin/views/pages.php b/bl-kernel/admin/views/pages.php index 8d6b41c1..04df7378 100644 --- a/bl-kernel/admin/views/pages.php +++ b/bl-kernel/admin/views/pages.php @@ -40,7 +40,7 @@ function table($status, $icon='arrow-circle-o-down') { if (!empty($list)) { echo ' - '.$status.' + '.$Language->g($status).' '; diff --git a/bl-kernel/admin/views/settings-advanced.php b/bl-kernel/admin/views/settings-advanced.php index 110f7ce6..5da7a3da 100644 --- a/bl-kernel/admin/views/settings-advanced.php +++ b/bl-kernel/admin/views/settings-advanced.php @@ -32,7 +32,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); HTML::formSelect(array( 'name'=>'homepage', - 'label'=>$L->g('Home page'), + 'label'=>$L->g('Homepage'), 'options'=>$homepageOptions, 'selected'=>$Site->homepage(), 'class'=>'uk-width-1-3 uk-form-medium', @@ -55,7 +55,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); HTML::formSelect(array( 'name'=>'orderBy', 'label'=>$L->g('Order content By'), - 'options'=>array('date'=>'Date','position'=>'Position'), + 'options'=>array('date'=>$L->g('Date'),'position'=>$L->g('Position')), 'selected'=>$Site->orderBy(), 'class'=>'uk-width-1-3 uk-form-medium', 'tip'=>$L->g('Order the content by position to build a Website') diff --git a/bl-kernel/dbpages.class.php b/bl-kernel/dbpages.class.php index 4d859918..b8413a87 100644 --- a/bl-kernel/dbpages.class.php +++ b/bl-kernel/dbpages.class.php @@ -285,11 +285,12 @@ class dbPages extends dbJSON public function getStaticDB() { $tmp = $this->db; - foreach($tmp as $key=>$fields) { - if($fields['status']!='static') { + foreach ($tmp as $key=>$fields) { + if ($fields['status']!='static') { unset($tmp[$key]); } } + uasort($tmp, array($this, 'sortByPositionLowToHigh')); return $tmp; } From 165b7307849fe932e016475ea11bdd0d15dce5a6 Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sun, 24 Sep 2017 01:23:12 +0200 Subject: [PATCH 2/3] New words added to dictionaries --- bl-languages/GR.json | 9 ++++++++- bl-languages/ar_MA.json | 9 ++++++++- bl-languages/bg_BG.json | 9 ++++++++- bl-languages/de_CH.json | 9 ++++++++- bl-languages/de_DE.json | 9 ++++++++- bl-languages/es.json | 9 ++++++++- bl-languages/fa_IR.JSON | 9 ++++++++- bl-languages/fi_FI.json | 9 ++++++++- bl-languages/fr_FR.json | 9 ++++++++- bl-languages/he_IL.json | 9 ++++++++- bl-languages/hu_HU.json | 9 ++++++++- bl-languages/it_IT.json | 9 ++++++++- bl-languages/ja_JP.json | 9 ++++++++- bl-languages/ms_MY.json | 9 ++++++++- bl-languages/nl_NL.json | 9 ++++++++- bl-languages/pl_PL.json | 9 ++++++++- bl-languages/pt_BR.json | 9 ++++++++- bl-languages/pt_PT.json | 9 ++++++++- bl-languages/ro_RO.json | 9 ++++++++- bl-languages/ru_RU.json | 9 ++++++++- bl-languages/tr_TR.json | 9 ++++++++- bl-languages/uk_UA.json | 9 ++++++++- bl-languages/vi_VN.json | 9 ++++++++- bl-languages/zh_CN.json | 9 ++++++++- bl-languages/zh_TW.json | 9 ++++++++- 25 files changed, 200 insertions(+), 25 deletions(-) diff --git a/bl-languages/GR.json b/bl-languages/GR.json index d6cacfce..9f6f092f 100644 --- a/bl-languages/GR.json +++ b/bl-languages/GR.json @@ -213,5 +213,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/ar_MA.json b/bl-languages/ar_MA.json index 283ecb4d..5c0dfb82 100644 --- a/bl-languages/ar_MA.json +++ b/bl-languages/ar_MA.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/bg_BG.json b/bl-languages/bg_BG.json index e013c5e0..f18f0f97 100644 --- a/bl-languages/bg_BG.json +++ b/bl-languages/bg_BG.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/de_CH.json b/bl-languages/de_CH.json index dde0028f..9829bca6 100644 --- a/bl-languages/de_CH.json +++ b/bl-languages/de_CH.json @@ -213,5 +213,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/de_DE.json b/bl-languages/de_DE.json index bee571c3..407b5a5d 100644 --- a/bl-languages/de_DE.json +++ b/bl-languages/de_DE.json @@ -213,5 +213,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/es.json b/bl-languages/es.json index 3e108d4f..dc327667 100644 --- a/bl-languages/es.json +++ b/bl-languages/es.json @@ -213,5 +213,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/fa_IR.JSON b/bl-languages/fa_IR.JSON index b58358e3..6e3625af 100644 --- a/bl-languages/fa_IR.JSON +++ b/bl-languages/fa_IR.JSON @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/fi_FI.json b/bl-languages/fi_FI.json index 45c9e486..7c9b4a06 100644 --- a/bl-languages/fi_FI.json +++ b/bl-languages/fi_FI.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/fr_FR.json b/bl-languages/fr_FR.json index a06d9e66..37479da1 100644 --- a/bl-languages/fr_FR.json +++ b/bl-languages/fr_FR.json @@ -213,5 +213,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/he_IL.json b/bl-languages/he_IL.json index 1a7fd27a..b7240281 100644 --- a/bl-languages/he_IL.json +++ b/bl-languages/he_IL.json @@ -213,5 +213,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/hu_HU.json b/bl-languages/hu_HU.json index 4ef7f69a..de4488bc 100644 --- a/bl-languages/hu_HU.json +++ b/bl-languages/hu_HU.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/it_IT.json b/bl-languages/it_IT.json index 070b671d..78f8f8a2 100644 --- a/bl-languages/it_IT.json +++ b/bl-languages/it_IT.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/ja_JP.json b/bl-languages/ja_JP.json index c253ac47..b41233ee 100644 --- a/bl-languages/ja_JP.json +++ b/bl-languages/ja_JP.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/ms_MY.json b/bl-languages/ms_MY.json index bc9b50d3..c4172e38 100644 --- a/bl-languages/ms_MY.json +++ b/bl-languages/ms_MY.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/nl_NL.json b/bl-languages/nl_NL.json index bec5ab64..17623c3b 100644 --- a/bl-languages/nl_NL.json +++ b/bl-languages/nl_NL.json @@ -211,5 +211,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/pl_PL.json b/bl-languages/pl_PL.json index d5b2a252..f5451ad1 100644 --- a/bl-languages/pl_PL.json +++ b/bl-languages/pl_PL.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/pt_BR.json b/bl-languages/pt_BR.json index da35e436..0f8776e3 100644 --- a/bl-languages/pt_BR.json +++ b/bl-languages/pt_BR.json @@ -211,5 +211,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/pt_PT.json b/bl-languages/pt_PT.json index cb486ed1..3d2d43aa 100644 --- a/bl-languages/pt_PT.json +++ b/bl-languages/pt_PT.json @@ -211,5 +211,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/ro_RO.json b/bl-languages/ro_RO.json index 10eab9e1..768584b4 100644 --- a/bl-languages/ro_RO.json +++ b/bl-languages/ro_RO.json @@ -212,5 +212,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/ru_RU.json b/bl-languages/ru_RU.json index 5998361c..50295fae 100644 --- a/bl-languages/ru_RU.json +++ b/bl-languages/ru_RU.json @@ -210,5 +210,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/tr_TR.json b/bl-languages/tr_TR.json index 14bd5466..0db83bee 100644 --- a/bl-languages/tr_TR.json +++ b/bl-languages/tr_TR.json @@ -210,5 +210,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/uk_UA.json b/bl-languages/uk_UA.json index 2d2dd071..7f2a564b 100644 --- a/bl-languages/uk_UA.json +++ b/bl-languages/uk_UA.json @@ -210,5 +210,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/vi_VN.json b/bl-languages/vi_VN.json index 055cfd92..d44ed83f 100644 --- a/bl-languages/vi_VN.json +++ b/bl-languages/vi_VN.json @@ -210,5 +210,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/zh_CN.json b/bl-languages/zh_CN.json index 813bcf82..5217e7bc 100644 --- a/bl-languages/zh_CN.json +++ b/bl-languages/zh_CN.json @@ -210,5 +210,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file diff --git a/bl-languages/zh_TW.json b/bl-languages/zh_TW.json index 6d3c082a..bc20b470 100644 --- a/bl-languages/zh_TW.json +++ b/bl-languages/zh_TW.json @@ -210,5 +210,12 @@ "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage" + "homepage": "Homepage", + "disabled": "Disabled", + "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", + "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", + "delete-the-user-and-all-his-pages": "Delete the user and all his pages", + "user-disabled": "User disabled", + "user-password-changed": "User password changed", + "page-edited": "Page edited" } \ No newline at end of file From 63a1aa93f30f7f3d0c44c036c30bbdef716fc7c1 Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sun, 24 Sep 2017 01:25:08 +0200 Subject: [PATCH 3/3] New words added to dictionaries --- bl-languages/de_CH.json | 174 ++++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 88 deletions(-) diff --git a/bl-languages/de_CH.json b/bl-languages/de_CH.json index 9829bca6..74a8f88a 100644 --- a/bl-languages/de_CH.json +++ b/bl-languages/de_CH.json @@ -4,55 +4,53 @@ "native": "Deutsch (Schweiz)", "english-name": "German", "locale": "de, de_CH", - "last-update": "2017-09-10", + "last-update": "2017-09-23", "author": "Clickwork", "email": "egoetschel@clickwork.ch", - "website": "https:\/\/clickwork.ch" + "website": "https://clickwork.ch" }, "dashboard": "Dashboard", - "manage-users": "Benutzerverwaltung", - "manage-categories": "Manage categories", + "manage-users": "Benutzer verwalten", + "manage-categories": "Kategorien verwalten", "general-settings": "Allgemein", "advanced-settings": "Erweitert", "thanks-for-support-bludit": "Thanks for support Bludit", - "upgrade-to-bludit-pro": "Upgrade to Bludit PRO", + "upgrade-to-bludit-pro": "Upgrade auf Bludit PRO", "language": "Sprache", "plugin": "Plugin", "plugins": "Plugins", - "developers": "Developers", + "developers": "Enwickler", "themes": "Themes", "about": "Über", "url": "URL", "fixed": "Fixed", "welcome": "Willkommen", "logout": "Abmelden", - "website": "Zur Website", + "website": "Website", "publish": "Veröffentlichen", "manage": "Verwalten", - "content": "Inhalt", - "category": "Category", + + "category": "Kategorie", "categories": "Kategorien", "users": "Benutzer", "settings": "Einstellungen", "general": "Allgemein", "advanced": "Erweitert", - "new-content": "New content", - "manage-content": "Manage content", - "add-new-content": "Add new content", - "new-category": "Neue Katgeorie", - "you-do-not-have-sufficient-permissions": "Du bist nicht berechtigt, die Seite aufzurufen.", - "add-a-new-user": "Neuer Benutzer", + + "new-category": "Neue Kategorie", + "you-do-not-have-sufficient-permissions": "You do not have sufficient permissions", + "add-a-new-user": "Neuen Benutzer hinzufügen", "url-associated-with-the-page": "URL associated with the page.", "language-and-timezone": "Sprache und Zeitzone", - "change-your-language-and-region-settings": "Sprache ändern und Lokalisierung einstellen.", - "notifications": "Notifications", + "change-your-language-and-region-settings": "Change your language and region settings.", + "notifications": "Meldungen", "plugin-activated": "Plugin activated", "plugin-deactivated": "Plugin deactivated", "new-theme-configured": "New theme configured", "changes-on-settings": "Changes on settings", "plugin-configured": "Plugin configured", - "welcome-to-bludit": "Willkommen bei Bludit", + "welcome-to-bludit": "Welcome to Bludit", "statistics": "Statistiken", "pages": "Seiten", "drafts": "Entwürfe", @@ -61,16 +59,16 @@ "save-as-draft": "Als Entwurf speichern", "cancel": "Abbrechen", "description": "Beschreibung", - "this-field-can-help-describe-the-content": "Kurze Inhaltsbeschreibung. Möglich sind bis zu 150 Zeichen.", + "this-field-can-help-describe-the-content": "This field can help describe the content in a few words. No more than 150 characters.", "images": "Bilder", - "error": "Fehler", - "supported-image-file-types": "Unterstützte Datei-Formate", + "error": "Error", + "supported-image-file-types": "Supported image file types", "cover-image": "Hauptbild", - "drag-and-drop-or-click-here": "Drag and Drop oder hier klicken", + "drag-and-drop-or-click-here": "Drag and drop or click here", "there-are-no-images": "Keine Bilder vorhanden", "upload-and-more-images": "Upload and more images", - "click-on-the-image-for-options": "Für die Bildoptionen auf das Bild klicken.", - "click-here-to-cancel": "Schliessen", + "click-on-the-image-for-options": "Click on the image for options.", + "click-here-to-cancel": "Click here to cancel.", "insert-image": "Bild einfügen", "set-as-cover-image": "Als Hauptbild verwenden", "delete-image": "Bild löschen", @@ -79,43 +77,43 @@ "status": "Status", "published": "Veröffentlicht", "draft": "Entwurf", - "empty-title": "Kein Titel", - "date": "Datum und Zeit", + "empty-title": "Empty title", + "date": "Datum", "external-cover-image": "External cover image", - "parent": "Übergeordnete Seite", + "parent": "Parent", "full-image-url": "Full image URL.", - "this-field-is-used-when-you-order-the-content-by-position": "This field is used when you order the content by position.", + "position": "Position", - "friendly-url": "Pretty URL", - "image-description": "Bildbeschreibung", - "add-a-new-category": "Eine neue Kategorie hinzufügen", + "friendly-url": "Friendly URL", + "image-description": "Image description", + "add-a-new-category": "Eine Kategorie hinzufügen", "name": "Name", "username": "Benutzername", "first-name": "Vorname", "last-name": "Nachname", "to-schedule-the-page-select-the-date-and-time": "To schedule the page select the date and time.", - "email": "E-Mail", + "email": "E-Mail-Adresse", "role": "Rolle", "registered": "Hinzugefügt", "site-information": "Angaben zur Website", "site-title": "Titel der Webseite", - "use-this-field-to-name-your-site": "Name der Website, wie er auf jeder Seite angezeigt wird.", - "site-slogan": "Untertitel", - "use-this-field-to-add-a-catchy-phrase": "Untertitel oder Slogan der Website.", - "site-description": "Informationen zur Website", - "you-can-add-a-site-description-to-provide": "Kurze Beschreibung der Website für Suchmaschinen.", + "use-this-field-to-name-your-site": "Use this field to name your site, it will appear at the top of every page of your site.", + "site-slogan": "Site slogan", + "use-this-field-to-add-a-catchy-phrase": "Use this field to add a catchy phrase on your site.", + "site-description": "Site description", + "you-can-add-a-site-description-to-provide": "You can add a site description to provide a short bio or description of your site.", "footer-text": "Footer-Text", "you-can-add-a-small-text-on-the-bottom": "Text im Fussbereich jeder Seite. Beispielsweise: Copyright-Hinweis, Eigentümer der Website usw.", "social-networks-links": "Links zu sozialen Netzwerken", - "site-url": "URL der Website", - "default-home-page": "Hauptseite", - "email-account-settings": "E-Mail-Adresse", + "site-url": "Site URL", + "default-home-page": "Default home page", + "email-account-settings": "Email account settings", "sender-email": "Absender", "emails-will-be-sent-from-this-address": "E-Mails werden mit dieser E-Mail-Adresse als Absender verschickt.", - "url-filters": "URL-Erweiterungen", - "select-your-sites-language": "Sprache der Website.", + "url-filters": "URL-Filter", + "select-your-sites-language": "Select your site's language.", "timezone": "Zeitzone", - "select-a-timezone-for-a-correct": "Zeitzone für die richtige Anzeige des Datums und der Zeit auf der Website.", + "select-a-timezone-for-a-correct": "Select a timezone for a correct date\/time display on your site.", "locale": "Lokalisierung", "date-and-time-formats": "Datum und Zeit", "date-format": "Datumsformat", @@ -127,32 +125,32 @@ "edit-category": "Kategorie bearbeiten", "delete": "Löschen", "password": "Passwort", - "confirm-password": "Passwort wiederholen", + "confirm-password": "Confirm Password", "editor": "Editor", "administrator": "Administrator", - "edit-user": "Benutzer bearbeiten", - "edit-content": "Edit content", + "edit-user": "Edit user", + "profile": "Profil", - "change-password": "Neues Passwort", + "change-password": "Change password", "enabled": "Aktiviert", - "disable-the-user": "Benutzer deaktivieren", - "profile-picture": "Profil-Bild", + "disable-the-user": "Disable the user", + "profile-picture": "Profile picture", "edit-or-delete-your-categories": "Edit or delete your categories", "create-a-new-page-for-your-site": "Create a new page for your site", - "create-a-new-category-to-organize-your-content": "Create a new category to organize your content", - "confirm-delete-this-action-cannot-be-undone": "Bestätige das Löschen, dieser Vorgang kann nicht rückgängig gemacht werden.", - "do-you-want-to-disable-the-user": "Willst Du den Benutzer deaktivieren?", - "new-password": "Neues Passwort", + + "confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.", + "do-you-want-to-disable-the-user": "Do you want to disable the user ?", + "new-password": "New password", "you-can-change-this-field-when-save-the-current-changes": "You can change this field when save the current changes.", "items-per-page": "Items per page", "invite-a-friend-to-collaborate-on-your-site": "Invite a friend to collaborate on your site", "number-of-items-to-show-per-page": "Number of items to show per page.", - "website-or-blog": "Website or Blog", + "website-or-blog": "Website oder Blog", "scheduled-pages": "Scheduled pages", - "there-are-no-scheduled-pages": "There are no scheduled pages", - "there-are-no-draft-pages": "There are no draft pages", + "there-are-no-scheduled-pages": "Es sind keine geplanten Beiträge vorhanden.", + "there-are-no-draft-pages": "Es sind keine Entwürfe vorhanden.", "order-content-by": "Order content By", - "edit-or-delete-content-from-your-site": "Edit or delete content from your site", + "order-the-content-by-position-to-build-a-website": "Order the content by position to build a Website or order the content by date to build a Blog.", "page-not-found-content": "Hey! look like the page doesn't exist.", "page-not-found": "Page not found", @@ -161,64 +159,64 @@ "returning-page-for-the-main-page": "Returning page for the main page, leave it blank if you want to show all the pages on the main page.", "full-url-of-your-site": "Full URL of your site. Complete with the protocol HTTP or HTTPS (only if you have enabled SSL on your server).", "with-the-locales-you-can-set-the-regional-user-interface": "With the locales, you can set the regional user interface, such as the dates in your language. The locales need to be installed on your system.", - "bludit-installer": "Bludit-Installer", - "choose-your-language": "Sprache wählen", - "next": "Weiter", - "complete-the-form-choose-a-password-for-the-username-admin": "Bitte ein Passwort für den Benutzer \"admin\" wählen
    und eine E-Mail-Adresse eingeben.", - "show-password": "Passwort zeigen", + "bludit-installer": "Bludit Installer", + "choose-your-language": "Choose your language", + "next": "Next", + "complete-the-form-choose-a-password-for-the-username-admin": "Bitte ein Passwort für den Benutzer \"admin\"
    und eine E-Mail-Adresse eingeben.", + "show-password": "Passwort im Klartext zeigen", "install": "Installieren", "login": "Anmelden", - "back-to-login-form": "Zurück zum Login", - "get-login-access-code": "Zugangscode schicken", - "email-access-code": "Zugangscode zuschicken", - "whats-next": "Und so geht es weiter:", - "username-or-password-incorrect": "Der Benutzername oder das Passwort stimmt nicht.", - "follow-bludit-on": "Folge Bludit bei", - "visit-the-forum-for-support": "Visit the [forum](https:\/\/forum.bludit.org) for support", - "manage-your-bludit-from-the-admin-panel": "Verwalte Bludit im [Administrationsbereich](.\/admin\/).", - "chat-with-developers-and-users-on-gitter": "Chatte mit Entwicklern und Benutzern bei [Gitter](https:\/\/gitter.im\/dignajar\/bludit)", - "this-is-a-brief-description-of-yourself-our-your-site": "Dies ist eine kurze Beschreibung, wer du bist, oder deiner Website. Um diesen Text zu ändern, gehe im Admin-Panel zu den Einstellungen und bearbeite sie unter \"Plugins\" das Plugin \"Über\".", - "read-the-documentation-for-more-information": "Lies die [Dokumentation](https:\/\/docs.bludit.com) und das [Bludit-Tutorial](https:\/\/bludit-tutorial.ch) für weitere Informationen.", - "new-page-created": "New page created", + "back-to-login-form": "Back to login form", + "get-login-access-code": "Get login access code", + "email-access-code": "Email access code", + "whats-next": "What's Next", + "username-or-password-incorrect": "Username or password incorrect", + "follow-bludit-on": "Follow Bludit on", + "visit-the-forum-for-support": "Visit the [forum](https://forum.bludit.org) for support", + "manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})", + "chat-with-developers-and-users-on-gitter":"Chat with developers and users on [Gitter](https://gitter.im/dignajar/bludit)", + "this-is-a-brief-description-of-yourself-our-your-site":"This is a brief description of yourself or your site, to change this text go to the admin panel, settings, plugins, and configure the plugin about.", + "read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information", + "new-page-created": "Neue Seite erstellt", "new-version-available": "New version available", "new-category-created": "New category created", - "category-deleted": "Category deleted", - "category-edited": "Category edited", + "category-deleted": "Kategorie gelöscht", + "category-edited": "Kategorie bearbeitet", "new-user-created": "New user created", "user-edited": "User edited", - "user-deleted": "Der Benutzer wurde gelöscht.", + "user-deleted": "Benutzer gelöscht", "recommended-for-recovery-password-and-notifications": "Recommended for recovery password and notifications.", "authentication-token": "Authentication Token", "token": "Token", "current-status": "Current status", - "upload-image": "Bild hochladen", + "upload-image": "Upload image", "this-token-is-similar-to-your-password-you-should-not-share-it": "This token is similar to your password, you should not share it.", - "the-changes-have-been-saved": "Die Änderungen wurden gespeichert.", + "the-changes-have-been-saved": "The changes have been saved", "label": "Label", "links": "Links", "this-title-is-almost-always-used-in-the-sidebar-of-the-site": "This title is almost always used in the sidebar of the site.", - "password-must-be-at-least-6-characters-long": "Das Passwort muss mindestens 6 Zeichen lang sein", - "ip-address-has-been-blocked": "Die IP-Adresse wurde blockiert.", - "try-again-in-a-few-minutes": "Bitte versuche es in einigen Minuten noch einmal.", + "password-must-be-at-least-6-characters-long": "Password must be at least 6 characters long", + "ip-address-has-been-blocked": "IP address has been blocked", + "try-again-in-a-few-minutes": "Try again in a few minutes", "page-published-from-scheduler": "Page published from scheduler", "installer-page-about-content": "The about page is an important and powerful for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information.", "blog": "Blog", "complete-all-fields": "Complete all fields", - "static": "Static", - "manage-pages": "Manage pages", - "new-page": "New page", - "edit-page": "Edit page", + "static": "Statische Seiten", + "manage-pages": "Seiten verwalten", + "new-page": "Neue Seite", + "edit-page": "Seite bearbeiten", "create-a-new-category-to-organize-your-pages": "Create a new category to organize your pages", "edit-or-delete-pages-from-your-site": "Edit or delete pages from your site", "add-new-page": "Add new page", "this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.", "about-your-site-or-yourself": "About your site or yourself", - "homepage": "Homepage", + "homepage": "Hauptseite", "disabled": "Disabled", "to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.", "delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user", "delete-the-user-and-all-his-pages": "Delete the user and all his pages", "user-disabled": "User disabled", "user-password-changed": "User password changed", - "page-edited": "Page edited" + "page-edited": "Seite bearbeitet" } \ No newline at end of file