From c277a6bdf6a2286eadaba9b8ad5c638b9d50922b Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Thu, 21 Oct 2010 13:20:08 -0400 Subject: Deprecate html_attbuild in favor of buildAttributes --- lib/plugins/acl/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 84932f7ac..3e7bd8121 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -765,7 +765,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { //build code $ret .= ''.NL; } -- cgit v1.2.3 From 11d7187b1b2e7bddc70324b865e01e750c5df162 Mon Sep 17 00:00:00 2001 From: YooS C Date: Thu, 18 Nov 2010 22:47:25 +0100 Subject: Korean language update --- lib/plugins/acl/lang/ko/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 43a5ceeeb..6f4e991cb 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -10,6 +10,7 @@ * @author dongnak@gmail.com * @author Song Younghwan * @author SONG Younghwan + * @author Seung-Chul Yoo */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; -- cgit v1.2.3 From ba6984cf400bde3cbdd7e1f203602cb0d04eb7d2 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 20 Nov 2010 15:35:17 +0100 Subject: Turkish language update --- lib/plugins/acl/lang/tr/lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/tr/lang.php b/lib/plugins/acl/lang/tr/lang.php index 45fbe7489..de96d2906 100644 --- a/lib/plugins/acl/lang/tr/lang.php +++ b/lib/plugins/acl/lang/tr/lang.php @@ -4,11 +4,10 @@ * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Selim Farsakoğlu - * @author Aydın Coşkuner aydinweb@gmail.com * @author Aydın Coşkuner - * @author yavuzselim@gmail.com - * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Cihan Kahveci * @author Yavuz Selim + * @author Caleb Maclennan */ $lang['admin_acl'] = 'Erişim Kontrol Listesi (ACL) Yönetimi'; $lang['acl_group'] = 'Grup'; -- cgit v1.2.3 From e3776c06c37cc197709dac60892604dfea894ac2 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Mon, 29 Nov 2010 01:34:36 +0100 Subject: Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3 As of VIM 7.3 it is no longer possible to specify the encoding in the modeline. This gives an error message whenever such a file is opened, thus this commit removes the enc setting from the modeline. --- lib/plugins/acl/lang/en/lang.php | 2 +- lib/plugins/acl/lang/et/lang.php | 2 +- lib/plugins/acl/lang/vi/lang.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/en/lang.php b/lib/plugins/acl/lang/en/lang.php index 38ff20c88..779614d32 100644 --- a/lib/plugins/acl/lang/en/lang.php +++ b/lib/plugins/acl/lang/en/lang.php @@ -43,4 +43,4 @@ $lang['acl_perm8'] = 'Upload'; $lang['acl_perm16'] = 'Delete'; $lang['acl_new'] = 'Add new Entry'; $lang['acl_mod'] = 'Modify Entry'; -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index e90d5eaa9..2f7208b7c 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -20,4 +20,4 @@ $lang['acl_perm2'] = 'Toimetamine'; $lang['acl_perm4'] = 'Tekitamine'; $lang['acl_perm8'] = 'Üles laadimine'; $lang['acl_new'] = 'Uue kirje lisamine'; -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php index 4458d806b..6237f79ba 100644 --- a/lib/plugins/acl/lang/vi/lang.php +++ b/lib/plugins/acl/lang/vi/lang.php @@ -18,4 +18,4 @@ $lang['acl_perm2'] = 'Biên soạn'; $lang['acl_perm4'] = 'Tạo'; $lang['acl_perm8'] = 'Tải lên'; $lang['acl_new'] = 'Thêm mục mới'; -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : -- cgit v1.2.3 From f2cfd2ce9ab3c204e78cd3e6589f8bb8d0079621 Mon Sep 17 00:00:00 2001 From: Gregor Skumavc Date: Tue, 21 Dec 2010 21:10:33 +0100 Subject: Slovak language update --- lib/plugins/acl/lang/sl/lang.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php index 32141fbce..f6dec25ef 100644 --- a/lib/plugins/acl/lang/sl/lang.php +++ b/lib/plugins/acl/lang/sl/lang.php @@ -4,14 +4,29 @@ * * @author Dejan Levec * @author Boštjan Seničar + * @author Gregor Skumavc (grega.skumavc@gmail.com) */ +$lang['admin_acl'] = 'ACL administracija'; $lang['acl_group'] = 'Skupina'; $lang['acl_user'] = 'Uporabnik'; $lang['acl_perms'] = 'Dovoljenja za'; $lang['page'] = 'Stran'; +$lang['namespace'] = 'Imenski prostor'; $lang['btn_select'] = 'Izberi'; +$lang['p_user_id'] = 'Uporabnik %s ima trenutno naslednje pravice na strani %s: %s.'; +$lang['p_user_ns'] = 'Uporabnik %s ima trenutno naslednje pravice v imenskem prostoru %s: %s.'; +$lang['p_group_id'] = 'Uporabnikka skupina %s ima trenutno naslednje pravice na strani %s: %s.'; +$lang['p_group_ns'] = 'Uporabniška skupina %s ima trenutno naslednje pravice v imenskem prostoru %s: %s.'; +$lang['p_choose_id'] = 'Prosimo vnesite uporabnika ali skupino v zgornji obrazec za ogled ali urejanje pravic za stran %s.'; +$lang['p_choose_ns'] = 'Prosimo vnesite uporabnika ali skupino v zgornji obrazec za ogled ali urejanje pravic za imenski prostor %s.'; +$lang['p_inherited'] = 'Opomba: Te pravice niso bile posebej nastavljene, temveč prevzete iz drugih skupin ali višjih imenskih prostorov.'; +$lang['p_isadmin'] = 'Opomba: Izbrana skupina ali uporabnik imajo vedno vse pravice, ker so določeni kot superuporabniki.'; +$lang['p_include'] = 'Višje pravice vključujejo tudi nižje. '; +$lang['current'] = 'Trenutna ACL pravila'; +$lang['where'] = 'Stran / Imenski prostor'; $lang['who'] = 'Uporabnik/Skupina'; $lang['perm'] = 'Dovoljenja'; +$lang['acl_perm0'] = 'Nič'; $lang['acl_perm1'] = 'Preberi'; $lang['acl_perm2'] = 'Uredi'; $lang['acl_perm4'] = 'Ustvari'; -- cgit v1.2.3 From 35e6af3e780b32ba4cd5dab9e4c190c484d2b838 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Tue, 4 Jan 2011 20:11:59 +0100 Subject: updated russian translations for bundled plugins --- lib/plugins/acl/lang/ru/help.txt | 16 ++++++---------- lib/plugins/acl/lang/ru/lang.php | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt index a3c1b4f64..7807105a8 100644 --- a/lib/plugins/acl/lang/ru/help.txt +++ b/lib/plugins/acl/lang/ru/help.txt @@ -1,11 +1,7 @@ -=== Краткая справка: === +=== Краткая справка === -На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам вашей вики. - -На панели слева отображены доступные пространства имён и страницы. - -Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы. - -Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил. - -Прочтение [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики». +На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам своей вики.\\ +На панели слева отображены доступные пространства имён и страницы.\\ +Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.\\ +Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.\\ +Прочтение [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики». diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 0c02dfbb1..f49e4b55a 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -19,7 +19,7 @@ $lang['acl_group'] = 'Группа'; $lang['acl_user'] = 'Пользователь'; $lang['acl_perms'] = 'Права доступа для'; $lang['page'] = 'Страница'; -$lang['namespace'] = 'Пространство имен'; +$lang['namespace'] = 'Пространство имён'; $lang['btn_select'] = 'Выбрать'; $lang['p_user_id'] = 'Сейчас пользователь %s имеет следующие права на доступ к странице %s: %s.'; $lang['p_user_ns'] = 'Сейчас пользователь %s имеет следующие права на доступ к пространству имён %s: %s.'; -- cgit v1.2.3 From 178c8be8577764b678fc145787fb5a5fe5bd5bf7 Mon Sep 17 00:00:00 2001 From: Massimiliano Vassalli Date: Sun, 9 Jan 2011 11:01:51 +0100 Subject: Latin language update - better use of Latin terminology for DokuWiki - ACL is not translated as AAA (Aditus Administrationis Aditus) but with ICA (Index Custodiae Aditus), which is a more literal translation - minor corrections of grammar and logic - The word "namespace" is more literally translated "spatium nominis", but according to other translations (like the Italian one), I preferred to use "genus". --- lib/plugins/acl/lang/la/help.txt | 4 ++-- lib/plugins/acl/lang/la/lang.php | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/la/help.txt b/lib/plugins/acl/lang/la/help.txt index ba974f48c..553884c30 100644 --- a/lib/plugins/acl/lang/la/help.txt +++ b/lib/plugins/acl/lang/la/help.txt @@ -1,8 +1,8 @@ === Auxilium: === -Hic facultates spatiorum nominis paginarumque addere delereue potes. +Hic facultates generum paginarumque addere delereue potes. -Tabella sinistra omnes paginas spatia nominisque ostendit. +Tabella sinistra omnes paginas generaque ostendit. His campis mutare facultates electorum Sodalium Gregumque potes. diff --git a/lib/plugins/acl/lang/la/lang.php b/lib/plugins/acl/lang/la/lang.php index dd6043602..941de1f79 100644 --- a/lib/plugins/acl/lang/la/lang.php +++ b/lib/plugins/acl/lang/la/lang.php @@ -2,25 +2,26 @@ /** * Latin language file * + * @author Massimiliano Vassalli */ -$lang['admin_acl'] = 'Aditus Administrationis Aditus'; +$lang['admin_acl'] = 'Administratio Indicis Custodiae Aditus'; $lang['acl_group'] = 'Grex'; $lang['acl_user'] = 'Sodalis'; $lang['acl_perms'] = 'Facultas:'; $lang['page'] = 'Pagina'; -$lang['namespace'] = 'Spatium nominis'; +$lang['namespace'] = 'Genus'; $lang['btn_select'] = 'eligere'; $lang['p_user_id'] = 'Sodalis %s nunc has facultates paginae "%s habes: %s.'; -$lang['p_user_ns'] = 'Sodalis %s nunc has facultates spatio nominis "%s habes: %s.'; +$lang['p_user_ns'] = 'Sodalis %s nunc has facultates generis "%s habes: %s.'; $lang['p_group_id'] = 'Socius\a gregis %s nunc has facultates paginae "%s habes: %s.'; -$lang['p_group_ns'] = 'Socius\a gregis %s nunc has facultates paginae "%s habes: %s.'; +$lang['p_group_ns'] = 'Socius\a gregis %s nunc has facultates generis "%s habes: %s.'; $lang['p_choose_id'] = 'Sodalis grexue in campo insere ut facultates paginae %s uideas.'; -$lang['p_choose_ns'] = 'Sodalis grexue in campo insere ut facultates paginae %s uideas.'; -$lang['p_inherited'] = 'Caue: hae facultates et huic rei et aliis gregibus uel spatiis nominis legitimae sunt.'; +$lang['p_choose_ns'] = 'Sodalis grexue in campo insere ut facultates generis %s uideas.'; +$lang['p_inherited'] = 'Caue: hae facultates et huic rei et aliis gregibus uel generibus legitimae sunt.'; $lang['p_isadmin'] = 'Caue: electi greges semper plenum ius habent, eo quod ut magister\stra elegitur.'; -$lang['p_include'] = 'Maiores facultates minores includunt. Creare, onerare uel delere facultates solum spatis nominis, non paginis potes'; -$lang['current'] = 'Communes AAA leges'; -$lang['where'] = 'Pagina/Spatium nominis'; +$lang['p_include'] = 'Maiores facultates minores includunt. Creandi, onerandi uel delendi facultates solum generibus, non paginis sunt.'; +$lang['current'] = 'Communes ICA leges'; +$lang['where'] = 'Pagina/Genus'; $lang['who'] = 'Sodalis/Grex'; $lang['perm'] = 'Facultates'; $lang['acl_perm0'] = 'Nihil'; -- cgit v1.2.3 From 73f799f0aa6144ef07d0af5a050b845a88ba991d Mon Sep 17 00:00:00 2001 From: Niels Lange Date: Sun, 9 Jan 2011 11:31:39 +0100 Subject: German language update --- lib/plugins/acl/lang/de/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 0d30fe7a1..13b3f3f05 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -17,6 +17,7 @@ * @author Blitzi94@gmx.de * @author Robert Bogenschneider * @author Robert Bogenschneider + * @author Niels Lange */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; -- cgit v1.2.3 From 99fef1646aeb4e3f5f819e991e4079bce08adc75 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Wed, 12 Jan 2011 23:15:52 +0100 Subject: Hebrew language update --- lib/plugins/acl/lang/he/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php index ac00730dd..91025f4b8 100644 --- a/lib/plugins/acl/lang/he/lang.php +++ b/lib/plugins/acl/lang/he/lang.php @@ -7,6 +7,7 @@ * @author Dotan Kamber * @author Moshe Kaplan * @author Yaron Yogev + * @author Yaron Shahrabani */ $lang['admin_acl'] = 'ניהול רשימת בקרת גישות'; $lang['acl_group'] = 'קבוצה'; -- cgit v1.2.3 From 168cead4e4c7d7c79cc57fa557dd21428243b2f9 Mon Sep 17 00:00:00 2001 From: Christian Wichmann Date: Fri, 14 Jan 2011 11:22:52 +0100 Subject: German language update --- lib/plugins/acl/lang/de/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 13b3f3f05..3c6bf8cf0 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -18,6 +18,7 @@ * @author Robert Bogenschneider * @author Robert Bogenschneider * @author Niels Lange + * @author Christian Wichmann */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; -- cgit v1.2.3 From ef7acde6835f3eda384a189e4d6f2f86a3ad9d3c Mon Sep 17 00:00:00 2001 From: Christian Wichmann Date: Fri, 14 Jan 2011 11:23:23 +0100 Subject: German (informal) language update --- lib/plugins/acl/lang/de-informal/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index fdb6f5a89..e24584a55 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -6,6 +6,7 @@ * @author Juergen Schwarzer * @author Marcel Metz * @author Matthias Schulte + * @author Christian Wichmann */ $lang['admin_acl'] = 'Zugriffskontrollsystem Management'; $lang['acl_group'] = 'Gruppe'; -- cgit v1.2.3