From 79504989f948613597d5516c9b31ba7e1529a303 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 9 Apr 2012 19:49:03 +0100 Subject: moved plugins' rtl.css to their style.css counterpart (part of FS#2185) --- lib/plugins/acl/rtl.css | 40 ---------------------------------- lib/plugins/acl/style.css | 31 +++++++++++++++++++++++++++ lib/plugins/config/rtl.css | 45 -------------------------------------- lib/plugins/config/style.css | 36 +++++++++++++++++++++++++++++++ lib/plugins/plugin/rtl.css | 51 -------------------------------------------- lib/plugins/plugin/style.css | 39 +++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 136 deletions(-) delete mode 100644 lib/plugins/acl/rtl.css delete mode 100644 lib/plugins/config/rtl.css delete mode 100644 lib/plugins/plugin/rtl.css diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css deleted file mode 100644 index e79abe596..000000000 --- a/lib/plugins/acl/rtl.css +++ /dev/null @@ -1,40 +0,0 @@ -div#acl_manager div#acl__tree { - float: right; - text-align: right; -} - -div#acl_manager div#acl__tree li { - padding-left: 0em; - padding-right: 1em; -} - -div#acl_manager div#acl__tree ul img { - margin-left: 0.25em; - margin-right: 0em; -} - - -div#acl_manager div#acl__detail { - float: left; -} - -div#acl_manager .aclgroup { - background: transparent url(pix/group.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .acluser { - background: transparent url(pix/user.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclpage { - background: transparent url(pix/page.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclns { - background: transparent url(pix/ns.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index b7154aa78..2eee4f41c 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -8,6 +8,10 @@ div#acl_manager div#acl__tree { border: 1px solid __border__; text-align: left; } +[dir=rtl] div#acl_manager div#acl__tree { + float: right; + text-align: right; +} div#acl_manager div#acl__tree a.cur { background-color: __highlight__; @@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li { padding-left: 1em; list-style-image: none; } +[dir=rtl] div#acl_manager div#acl__tree li { + padding-left: 0em; + padding-right: 1em; +} div#acl_manager div#acl__tree ul img { margin-right: 0.25em; cursor: pointer; } +[dir=rtl] div#acl_manager div#acl__tree ul img { + margin-left: 0.25em; + margin-right: 0em; +} div#acl_manager div#acl__detail { width: 73%; @@ -36,6 +48,9 @@ div#acl_manager div#acl__detail { float: right; overflow: auto; } +[dir=rtl] div#acl_manager div#acl__detail { + float: left; +} div#acl_manager div#acl__detail fieldset { width: 90%; @@ -56,21 +71,37 @@ div#acl_manager .aclgroup { background: transparent url(pix/group.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclgroup { + background: transparent url(pix/group.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .acluser { background: transparent url(pix/user.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .acluser { + background: transparent url(pix/user.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclpage { background: transparent url(pix/page.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclpage { + background: transparent url(pix/page.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclns { background: transparent url(pix/ns.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclns { + background: transparent url(pix/ns.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager label.disabled { color: __text_neu__!important; diff --git a/lib/plugins/config/rtl.css b/lib/plugins/config/rtl.css deleted file mode 100644 index b8b9660e2..000000000 --- a/lib/plugins/config/rtl.css +++ /dev/null @@ -1,45 +0,0 @@ -#config__manager fieldset { - clear: both; -} - -#config__manager fieldset td { - text-align: right; -} - -#config__manager label { - text-align: right; -} - -#config__manager td.value input.checkbox { - float: right; - padding-left: 0; - padding-right: 0.7em; -} - -#config__manager td.value label { - float: left; -} - -#config__manager td.label { - padding: 0.8em 1em 0.6em 0; -} - -#config__manager td.label span.outkey { - float: right; - margin-right: 1em; -} - -#config__manager td.label label { - clear: right; -} - -#config__manager td.label img { - float: left; -} - -#config__manager .selection { - width: 14.8em; - float: right; - margin: 0 0 2px 0.3em; -} - diff --git a/lib/plugins/config/style.css b/lib/plugins/config/style.css index 65c44a758..1be94feb9 100644 --- a/lib/plugins/config/style.css +++ b/lib/plugins/config/style.css @@ -15,6 +15,9 @@ color: __text__; padding: 0 1em; } +[dir=rtl] #config__manager fieldset { + clear: both; +} #config__manager legend { font-size: 1.25em; } @@ -28,25 +31,49 @@ #config__manager fieldset td { text-align: left; } +[dir=rtl] #config__manager fieldset td { + text-align: right; +} #config__manager fieldset td.value { /* fixed data column width */ width: 31em; } +[dir=rtl] #config__manager label { + text-align: right; +} +[dir=rtl] #config__manager td.value input.checkbox { + float: right; + padding-left: 0; + padding-right: 0.7em; +} +[dir=rtl] #config__manager td.value label { + float: left; +} + #config__manager td.label { padding: 0.8em 0 0.6em 1em; vertical-align: top; } +[dir=rtl] #config__manager td.label { + padding: 0.8em 1em 0.6em 0; +} #config__manager td.label label { clear: left; display: block; } +[dir=rtl] #config__manager td.label label { + clear: right; +} #config__manager td.label img { padding: 0 10px; vertical-align: middle; float: right; } +[dir=rtl] #config__manager td.label img { + float: left; +} #config__manager td.label span.outkey { font-size: 70%; @@ -60,6 +87,10 @@ position: relative; z-index: 1; } +[dir=rtl] #config__manager td.label span.outkey { + float: right; + margin-right: 1em; +} #config__manager td input.edit { width: 30em; @@ -106,6 +137,11 @@ float: left; margin: 0 0.3em 2px 0; } +[dir=rtl] #config__manager .selection { + width: 14.8em; + float: right; + margin: 0 0 2px 0.3em; +} #config__manager .selection label { float: right; diff --git a/lib/plugins/plugin/rtl.css b/lib/plugins/plugin/rtl.css deleted file mode 100644 index 6ababd8e0..000000000 --- a/lib/plugins/plugin/rtl.css +++ /dev/null @@ -1,51 +0,0 @@ - -#plugin__manager .pm_menu, -#plugin__manager .pm_info, -#plugin__manager p, -#plugin__manager label { - text-align: right; -} - -#plugin__manager .pm_menu { - float: right; -} - -#plugin__manager .pm_info { - float: left; -} - -#plugin__manager .pm_info dt { - float: right; - clear: right; -} - -#plugin__manager .pm_info dd { - margin: 0 7em 0 0; -} - -#plugin__manager .common fieldset { - text-align: right; -} - - -#plugin__manager .plugins .legend { - text-align: right; - float: right; -} - -#plugin__manager .plugins .enable { - float: right; - margin-right: 0; - margin-left: 0.5em; -} - -#plugin__manager .plugins .button { - float: left; - margin-right: 0.5em; -} - - -#plugin__manager .plugins fieldset.buttons .button { - float: right; -} - diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css index de6cca579..9433e6001 100644 --- a/lib/plugins/plugin/style.css +++ b/lib/plugins/plugin/style.css @@ -52,15 +52,28 @@ text-align: left; } +[dir=rtl] #plugin__manager .pm_menu, +[dir=rtl] #plugin__manager .pm_info, +[dir=rtl] #plugin__manager p, +[dir=rtl] #plugin__manager label { + text-align: right; +} + #plugin__manager .pm_menu { float: left; width: 48%; } +[dir=rtl] #plugin__manager .pm_menu { + float: right; +} #plugin__manager .pm_info { float: right; width: 50%; } +[dir=rtl] #plugin__manager .pm_info { + float: left; +} #plugin__manager .common fieldset { margin: 0; @@ -68,6 +81,9 @@ text-align: left; border: none; } +[dir=rtl] #plugin__manager .common fieldset { + text-align: right; +} #plugin__manager .common label { padding: 0 0 0.5em 0; @@ -111,6 +127,10 @@ padding: 0; clear: none; } +[dir=rtl] #plugin__manager .plugins .legend { + text-align: right; + float: right; +} #plugin__manager .plugins .button { font-size: 95%; @@ -123,6 +143,13 @@ #plugin__manager .plugins fieldset.buttons .button { float: left; } +[dir=rtl] #plugin__manager .plugins .button { + float: left; + margin-right: 0.5em; +} +[dir=rtl] #plugin__manager .plugins fieldset.buttons .button { + float: right; +} #plugin__manager .pm_info h3 { margin-left: 0; @@ -140,17 +167,29 @@ margin: 0; padding: 0; } +[dir=rtl] #plugin__manager .pm_info dt { + float: right; + clear: right; +} #plugin__manager .pm_info dd { margin: 0 0 0 7em; padding: 0; background: none; } +[dir=rtl] #plugin__manager .pm_info dd { + margin: 0 7em 0 0; +} #plugin__manager .plugins .enable { float: left; width: auto; margin-right: 0.5em; } +[dir=rtl] #plugin__manager .plugins .enable { + float: right; + margin-right: 0; + margin-left: 0.5em; +} /* end admin plugin styles */ -- cgit v1.2.3 From 47260a57d569ff440e40a675d0afde195befbfcd Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 9 Apr 2012 19:52:06 +0100 Subject: added minimal RTL print styles (part of FS#2185) --- lib/tpl/dokuwiki/css/print.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index f4f81d741..58b8a5f0d 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -137,6 +137,9 @@ div.clearer { border: solid #ccc; border-width: 0 0 0 2pt; } +[dir=rtl] .dokuwiki blockquote { + border-width: 0 2pt 0 0; +} /* tables */ .dokuwiki table { @@ -153,6 +156,10 @@ div.clearer { border: 1pt solid #666; text-align: left; } +[dir=rtl] .dokuwiki th, +[dir=rtl] .dokuwiki td { + text-align: right; +} .dokuwiki th { font-weight: bold; } @@ -173,6 +180,11 @@ div.clearer { float: left; margin-right: .5em; } +[dir=rtl] #dokuwiki__header h1 img { + float: right; + margin-right: 0; + margin-left: .5em; +} .dokuwiki div.footnotes { clear: both; border-top: 1pt solid #000; -- cgit v1.2.3 From bd28ae8066c753421603f70737fa91fa9697ec58 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 9 Apr 2012 19:54:20 +0100 Subject: when there's not enough space for images, make sure they stay proportional (might be FS#2480) --- lib/tpl/dokuwiki/css/basic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index c8e0c435e..7ffe42ec4 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -195,6 +195,7 @@ img { img, object { max-width: 100%; + height: auto; } hr { -- cgit v1.2.3 From bed6e6e5baa092db263210240784e7e640729579 Mon Sep 17 00:00:00 2001 From: Usama Akkad Date: Wed, 11 Apr 2012 23:02:09 +0200 Subject: Arabic Language Update --- inc/lang/ar/lang.php | 54 ++++++++++++++++++++++++++++++++++++- inc/lang/ar/resetpwd.txt | 3 +++ lib/plugins/config/lang/ar/lang.php | 11 ++++++++ lib/plugins/plugin/lang/ar/lang.php | 1 + 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 inc/lang/ar/resetpwd.txt diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index af92243c9..350e26695 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -42,11 +42,14 @@ $lang['btn_backtomedia'] = 'ارجع إلى اختيار ملف الوسا $lang['btn_subscribe'] = 'ادر الاشتراكات'; $lang['btn_profile'] = 'حدث الملف الشخصي'; $lang['btn_reset'] = 'صفّر'; +$lang['btn_resendpwd'] = 'اضبط كلمة سر جديدة'; $lang['btn_draft'] = 'حرر المسودة'; $lang['btn_recover'] = 'استرجع المسودة'; $lang['btn_draftdel'] = 'احذف المسوّدة'; $lang['btn_revert'] = 'استعد'; $lang['btn_register'] = 'سجّل'; +$lang['btn_apply'] = 'طبق'; +$lang['btn_media'] = 'مدير الوسائط'; $lang['loggedinas'] = 'داخل باسم'; $lang['user'] = 'اسم المستخدم'; $lang['pass'] = 'كلمة السر'; @@ -76,6 +79,7 @@ $lang['profnoempty'] = 'غير مسموح باسم مستخدم أو $lang['profchanged'] = 'حُدث الملف الشخصي للمستخدم بنجاح.'; $lang['pwdforget'] = 'أنسيت كلمة السر؟ احصل على واحدة جديدة'; $lang['resendna'] = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور.'; +$lang['resendpwd'] = 'اضبط كلمة سر جديدة لـ'; $lang['resendpwdmissing'] = 'عذراّ، يجب أن تملأ كل الحقول.'; $lang['resendpwdnouser'] = 'عذراً، لم نجد المستخدم هذا في قاعدة بياناتنا.'; $lang['resendpwdbadauth'] = 'عذراً، رمز التفعيل هذا غير صحيح. نأكد من استخدامك كامل وصلة التأكيد.'; @@ -90,7 +94,7 @@ $lang['txt_filename'] = 'رفع كـ (اختياري)'; $lang['txt_overwrt'] = 'اكتب على ملف موجود'; $lang['lockedby'] = 'مقفلة حاليا لـ'; $lang['lockexpire'] = 'ينتهي القفل في'; -$lang['js']['willexpire'] = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.'; +$lang['js']['willexpire'] = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.'; $lang['js']['notsavedyet'] = 'التعديلات غير المحفوظة ستفقد.'; $lang['js']['searchmedia'] = 'ابحث عن ملفات'; $lang['js']['keepopen'] = 'أبقي النافذة مفتوحة أثناء الاختيار'; @@ -121,6 +125,17 @@ $lang['js']['nosmblinks'] = 'الروابط لمجلدات مشاركة و $lang['js']['linkwiz'] = 'مرشد الروابط'; $lang['js']['linkto'] = 'الرابط إلى :'; $lang['js']['del_confirm'] = 'هل حقاً تريد حذف البنود المختارة؟'; +$lang['js']['restore_confirm'] = 'أمتأكد من استرجاع هذه النسخة؟'; +$lang['js']['media_diff'] = 'عرض الفروق:'; +$lang['js']['media_diff_both'] = 'جنبا إلى جنب'; +$lang['js']['media_diff_opacity'] = 'Shine-through'; +$lang['js']['media_diff_portions'] = 'Swipe'; +$lang['js']['media_select'] = 'اختر ملفا...'; +$lang['js']['media_upload_btn'] = 'ارفع'; +$lang['js']['media_done_btn'] = 'تم'; +$lang['js']['media_drop'] = 'اسقط الملف هنا لرفعه'; +$lang['js']['media_cancel'] = 'أزل'; +$lang['js']['media_overwrt'] = 'أكتب فوق الملفات الموجودة'; $lang['rssfailed'] = 'خطأ ما حدث أثناء جلب ملف التغذية:'; $lang['nothingfound'] = 'لا يوجد شيء'; $lang['mediaselect'] = 'ملفات الوسائط'; @@ -170,11 +185,20 @@ $lang['external_edit'] = 'تحرير خارجي'; $lang['summary'] = 'ملخص التحرير'; $lang['noflash'] = 'تحتاج إلىملحق فلاش أدوبي لعرض هذا المحتوى.'; $lang['download'] = 'نزل Snippet'; +$lang['tools'] = 'أدوات'; +$lang['user_tools'] = 'أدوات المستخدم'; +$lang['site_tools'] = 'أدوات الموقع'; +$lang['page_tools'] = 'أدوات الصفحة'; +$lang['skip_to_content'] = 'تجاوز إلى المحتوى'; $lang['mail_newpage'] = 'إضافة صفحة:'; $lang['mail_changed'] = 'تعديل صفحة:'; $lang['mail_subscribe_list'] = 'صفحات غيرت في النطاق:'; $lang['mail_new_user'] = 'مشترك جديد:'; $lang['mail_upload'] = 'رفع ملف:'; +$lang['changes_type'] = 'أظهر تغييرات الـ'; +$lang['pages_changes'] = 'صفحات'; +$lang['media_changes'] = 'ملفات الوسائط'; +$lang['both_changes'] = 'كلا من الصفحات وملفات الوسائط'; $lang['qb_bold'] = 'نص عريض'; $lang['qb_italic'] = 'نص مائل'; $lang['qb_underl'] = 'نص مسطر'; @@ -215,6 +239,9 @@ $lang['img_copyr'] = 'حقوق النسخ'; $lang['img_format'] = 'الهيئة'; $lang['img_camera'] = 'الكمرا'; $lang['img_keywords'] = 'كلمات مفتاحية'; +$lang['img_width'] = 'العرض'; +$lang['img_height'] = 'الإرتفاع'; +$lang['img_manager'] = 'اعرض في مدير الوسائط'; $lang['subscr_subscribe_success'] = 'اضيف %s لقائمة اشتراك %s'; $lang['subscr_subscribe_error'] = 'خطأ في إضافة %s لقائمة اشتراك %s'; $lang['subscr_subscribe_noaddress'] = 'ليس هناك عنوان مرتبط بولوجك، لا يمكن اضافتك لقائمة الاشتراك'; @@ -233,6 +260,7 @@ $lang['subscr_style_digest'] = 'بريد ملخص عن تغييرات كل ص $lang['subscr_style_list'] = 'قائمة بالصفحات المتغيرة منذ آخر بريد'; $lang['authmodfailed'] = 'إعدادات تصريح فاسدة، يرجى مراسلة المدير.'; $lang['authtempfail'] = 'تصريح المشترك غير متوفر مؤقتاً، إن استمرت هذه الحالة يرجى مراسلة المدير'; +$lang['authpwdexpire'] = 'ستنتهي صلاحية كلمة السر في %d . عليك بتغييرها سريعا.'; $lang['i_chooselang'] = 'اختر لغتك'; $lang['i_installer'] = 'برنامج تنصيب دوكو ويكي'; $lang['i_wikiname'] = 'اسم الويكي'; @@ -273,3 +301,27 @@ $lang['hours'] = '%d ساعة مضت'; $lang['minutes'] = '%d دقيقة مضت'; $lang['seconds'] = '%d ثانية مضت'; $lang['wordblock'] = 'لم تحفظ تغييراتك لاحتوائها على نص ممنوع )غثاء('; +$lang['media_uploadtab'] = 'ارفع'; +$lang['media_searchtab'] = 'ابحث'; +$lang['media_file'] = 'ملف'; +$lang['media_viewtab'] = 'عرض'; +$lang['media_edittab'] = 'تحرير'; +$lang['media_historytab'] = 'التاريخ'; +$lang['media_list_thumbs'] = 'المصغرات'; +$lang['media_list_rows'] = 'صفوف'; +$lang['media_sort_name'] = 'الاسم'; +$lang['media_sort_date'] = 'التاريخ'; +$lang['media_namespaces'] = 'اختر نطاقا'; +$lang['media_files'] = 'الملفات في %s'; +$lang['media_upload'] = 'ارفع إلى %s'; +$lang['media_search'] = 'ابحث في %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s في %s'; +$lang['media_edit'] = 'حرر %s'; +$lang['media_history'] = 'تاريخ %s'; +$lang['media_meta_edited'] = 'عُدلت الميتاداتا'; +$lang['media_perm_read'] = 'عفوا، لست مخولا بقراءة الملفات.'; +$lang['media_perm_upload'] = 'عفوا، لست مخولا برفع الملفات.'; +$lang['media_update'] = 'ارفع إصدارا أحدث'; +$lang['media_restore'] = 'استرجع هذه النسخة'; +$lang['plugin_install_err'] = 'ثبتت الإضافة بشكل خاطئ. أعد تسمية دليل الإضافة \'%s\' إلى \'%s\'.'; diff --git a/inc/lang/ar/resetpwd.txt b/inc/lang/ar/resetpwd.txt new file mode 100644 index 000000000..2bbd4a21a --- /dev/null +++ b/inc/lang/ar/resetpwd.txt @@ -0,0 +1,3 @@ +====== اضبط كلمة سر جديدة ====== + +أدخل كلمة سر جديدة لحسابك في هذه الويكي. diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 3855f4ac1..2e55446ec 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -41,9 +41,13 @@ $lang['lang'] = 'لغة الواجهة'; $lang['basedir'] = 'مسار الخادوم (مثال. /dokuwiki/) اترك فارغا للاكتشاف التلقائي.'; $lang['baseurl'] = 'عنوان الخادوم (مثال. http://www.yourserver.com). اترك فارغا للاكتشاف التلقائي.'; $lang['savedir'] = 'دليل حفظ البيانات'; +$lang['cookiedir'] = 'مسار الكعكات. اترك فارغا لاستخدام baseurl.'; $lang['start'] = 'اسم صفحة البداية'; $lang['title'] = 'عنوان الويكي'; $lang['template'] = 'القالب'; +$lang['tagline'] = 'Tagline (في حال دعم القالب له) +'; +$lang['sidebar'] = 'اسم صفحة الشريط الجانبي (في حال دعم القالب له). تركه فارغا يعطل الشريط الجانبي.'; $lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; $lang['recent'] = 'أحدث التغييرات'; @@ -64,6 +68,7 @@ $lang['useheading'] = 'استخدم اول ترويسة كأسم لل $lang['refcheck'] = 'التحقق من مرجع الوسائط'; $lang['refshow'] = 'عدد مراجع الوسائط لتعرض'; $lang['allowdebug'] = 'مكّن التنقيح عطّلها إن لم تكن بحاجلة لها!'; +$lang['mediarevisions'] = 'تفعيل إصدارات الوسائط؟'; $lang['usewordblock'] = 'احجز الغثاء بناء على قائمة كلمات'; $lang['indexdelay'] = 'التأخير قبل الفهرسة (ثوان)'; $lang['relnofollow'] = 'استخدم rel="nofollow" للروابط الخارجية'; @@ -86,6 +91,8 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; +$lang['remote'] = 'مكّن نظام API البعيد. يسمح هذا لبرامج أخرى بالوصول للويكي عبر XML-RPC أو آليات أخرى.'; +$lang['remoteuser'] = 'احصر الوصول البعيد ل API لمستخدمين ومجموعات يفصل بينها بالفاصلة هنا. اترك فارغا لتمكين الجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; @@ -109,10 +116,13 @@ $lang['jpg_quality'] = 'دقة ضغط JPG (0-100)'; $lang['subscribers'] = 'مكن دعم اشتراك الصفحة'; $lang['subscribe_time'] = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.'; $lang['compress'] = 'رُص مخرجات CSS و جافا سكربت'; +$lang['cssdatauri'] = 'الحجم بالبايتات للصور المذكورة في CSS التي ستُضمن في صفحة-التنسيق لخفض طلبات HTTP. لن تعمل هذه التقنية في IE 7 أو أقل! 400 إلى 600 بايت تعد قيمة جيدة. اضبط إلى 0 لتعطلها.'; $lang['hidepages'] = 'أخف الصفحات المنطبق عليها (تعابير شرطية)'; $lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة'; $lang['sitemap'] = 'ولد خرائط موقع جوجل (أيام)'; +$lang['broken_iua'] = 'هل الوظيفة ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل فهرسة البحث. IIS+PHP/CGI تعرف بأنها لاتعمل. أنظر العلة 852 لمزيد من المعلومات.'; $lang['xsendfile'] = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملفات ثابتة؟ يجب أن يكون خادم الوب داعما له.'; +$lang['renderer_xhtml'] = 'المحرك ليستخدم لمخرجات الويكي الأساسية وفق (xhtml).'; $lang['renderer__core'] = '%s (نواة دوكو ويكي)'; $lang['renderer__plugin'] = '%s (ملحق)'; $lang['rememberme'] = 'اسمح بكعكات الدخول الدائم (تذكرني)'; @@ -122,6 +132,7 @@ $lang['rss_content'] = 'مالذي يعرض في عناصر تلقيم $lang['rss_update'] = 'تحديث تلقيم XML (ثوان)'; $lang['recent_days'] = 'مدة إبقاء أحدث التغييرات (ايام)'; $lang['rss_show_summary'] = 'تلقيم XML يظهر ملخصا في العنوان'; +$lang['rss_media'] = 'مانوع التغييرات التي ستدرج في تغذية XML؟'; $lang['target____wiki'] = 'النافذة الهدف للروابط الداخلية'; $lang['target____interwiki'] = 'النافذة الهدف للروابط الممرة interwiki'; $lang['target____extern'] = 'النافذة الهدف للروابط الخارجية'; diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php index fbc6d3c36..8327e5ce3 100644 --- a/lib/plugins/plugin/lang/ar/lang.php +++ b/lib/plugins/plugin/lang/ar/lang.php @@ -50,3 +50,4 @@ $lang['enabled'] = 'الاضافة %s فُعلت. '; $lang['notenabled'] = 'تعذر تفعيل الاضافة %s، تحقق من اذونات الملف.'; $lang['disabled'] = 'عُطلت الإضافة %s.'; $lang['notdisabled'] = 'تعذر تعطيل الإضافة %s، تحقق من اذونات الملف.'; +$lang['packageinstalled'] = 'حزمة الإضافة (%d plugin(s): %Xs) ثبتت بنجاج.'; -- cgit v1.2.3 From cffea7877fa1a5e2c46852274ae878bf73284598 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 12 Apr 2012 22:23:09 +0200 Subject: Added page title to search results in Remote API --- inc/RemoteAPICore.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 546832100..80deb7377 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -302,6 +302,7 @@ class RemoteAPICore { 'mtime' => filemtime($file), 'size' => filesize($file), 'snippet' => $snippet, + 'title' => p_get_first_heading($id) ); } return $pages; -- cgit v1.2.3 From 5529fa3167d83c7fd8ab03d077c2b46163b20c24 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 12 Apr 2012 23:29:24 +0200 Subject: Remote search is aware of useheading option --- inc/RemoteAPICore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 80deb7377..9da493210 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -302,7 +302,7 @@ class RemoteAPICore { 'mtime' => filemtime($file), 'size' => filesize($file), 'snippet' => $snippet, - 'title' => p_get_first_heading($id) + 'title' => useHeading('navigation') ? p_get_first_heading($id) : $id ); } return $pages; -- cgit v1.2.3 From 389762f8976d87198af8a6aa178bc7026dde98f0 Mon Sep 17 00:00:00 2001 From: Padmanabh Kulkarni Date: Sun, 15 Apr 2012 12:46:42 +0200 Subject: Marathi language update --- inc/lang/mr/lang.php | 82 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 12 deletions(-) diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 96323394d..32781e6d4 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -44,13 +44,16 @@ $lang['btn_back'] = 'मागॆ'; $lang['btn_backlink'] = 'येथे काय जोडले आहे'; $lang['btn_backtomedia'] = 'परत माध्यम फाइल निवडीकड़े'; $lang['btn_subscribe'] = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा '; -$lang['btn_unsubscribe'] = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा'; $lang['btn_profile'] = 'प्रोफाइल अद्ययावत करा'; $lang['btn_reset'] = 'रिसेट'; +$lang['btn_resendpwd'] = 'नवीन पासवर्ड'; $lang['btn_draft'] = 'प्रत संपादन'; $lang['btn_recover'] = 'प्रत परत मिळवा'; $lang['btn_draftdel'] = 'प्रत रद्द'; +$lang['btn_revert'] = 'पुनर्स्थापन'; $lang['btn_register'] = 'नोंदणी'; +$lang['btn_apply'] = 'लागू'; +$lang['btn_media'] = 'मिडिया व्यवस्थापक'; $lang['loggedinas'] = 'लॉगिन नाव'; $lang['user'] = 'वापरकर्ता'; $lang['pass'] = 'परवलीचा शब्द'; @@ -81,19 +84,58 @@ $lang['profchanged'] = 'सदस्याची प्रोफाइ $lang['pwdforget'] = 'परवलीचा शब्द विसरला आहे का? नविन मागवा.'; $lang['resendna'] = 'ह्या विकी मधे परवलीचा शब्द परत पाथाव्न्याची सुविधा नाही.'; $lang['resendpwd'] = 'नविन परवली इच्छुक'; +$lang['resendpwdmissing'] = 'माफ करा, पण सर्व जागा भरल्या पाहिजेत.'; $lang['resendpwdnouser'] = 'माफ़ करा, हा सदस्य आमच्या माहितिसंग्रहात सापडला नाही.'; $lang['resendpwdbadauth'] = 'माफ़ करा, हा अधिकार कोड बरोबर नाही. कृपया आपण पूर्ण शिकामोर्तबाची लिंक वापरल्याची खात्री करा.'; $lang['resendpwdconfirm'] = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.'; $lang['resendpwdsuccess'] = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.'; $lang['license'] = 'विशिष्ठ नोंद केलि नसल्यास ह्या विकी वरील सर्व मजकूर खालील लायसन्स मधे मोडतो : '; $lang['licenseok'] = 'नोंद : हे पृष्ठ संपादित केल्यास तुम्ही तुमचे योगदान खालील लायसन्स अंतर्गत येइल : '; +$lang['searchmedia'] = 'फाईल शोधा:'; +$lang['searchmedia_in'] = '%s मधे शोधा'; $lang['txt_upload'] = 'अपलोड करण्याची फाइल निवडा'; $lang['txt_filename'] = 'अपलोड उर्फ़ ( वैकल्पिक )'; $lang['txt_overwrt'] = 'अस्तित्वात असलेल्या फाइलवरच सुरक्षित करा.'; $lang['lockedby'] = 'सध्या लॉक करणारा :'; $lang['lockexpire'] = 'सध्या लॉक करणारा :'; -$lang['js']['willexpire'] = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.'; -$lang['js']['notsavedyet'] = "सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?"; +$lang['js']['willexpire'] = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.'; +$lang['js']['notsavedyet'] = 'सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?'; +$lang['js']['searchmedia'] = 'फाईल्ससाठी शोधा'; +$lang['js']['keepopen'] = 'निवड केल्यावर विण्डो उघडी ठेवा'; +$lang['js']['hidedetails'] = 'सविस्तर मजकूर लपवा'; +$lang['js']['mediatitle'] = 'लिंक सेटिंग'; +$lang['js']['mediadisplay'] = 'लिंकचा प्रकार'; +$lang['js']['mediaalign'] = 'जुळवणी'; +$lang['js']['mediasize'] = 'प्रतिमेचा आकार'; +$lang['js']['mediatarget'] = 'लिंकचे लक्ष्य'; +$lang['js']['mediaclose'] = 'बंद'; +$lang['js']['mediadisplayimg'] = 'प्रतिमा दाखवा.'; +$lang['js']['mediadisplaylnk'] = 'फक्त लिंक दाखवा.'; +$lang['js']['mediasmall'] = 'लहान आवृत्ती'; +$lang['js']['mediamedium'] = 'माध्यम आवृत्ती'; +$lang['js']['medialarge'] = 'मोठी आवृत्ती'; +$lang['js']['mediaoriginal'] = 'मूळ आवृत्ती'; +$lang['js']['medialnk'] = 'सविस्तर माहितीकडेची लिंक'; +$lang['js']['mediadirect'] = 'मूळ मजकुराकडे थेट लिंक'; +$lang['js']['medianolnk'] = 'लिंक नको'; +$lang['js']['medianolink'] = 'प्रतिमा लिंक करू नका'; +$lang['js']['medialeft'] = 'प्रतिमा डाव्या बाजूला जुळवून घ्या.'; +$lang['js']['mediaright'] = 'प्रतिमा उजव्या बाजूला जुळवून घ्या.'; +$lang['js']['mediacenter'] = 'प्रतिमा मध्यभागी जुळवून घ्या.'; +$lang['js']['medianoalign'] = 'जुळवाजुळव वापरू नका.'; +$lang['js']['nosmblinks'] = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.'; +$lang['js']['linkwiz'] = 'लिंक जादूगार'; +$lang['js']['linkto'] = 'याला लिंक करा:'; +$lang['js']['del_confirm'] = 'निवडलेल्या गोष्टी नक्की नष्ट करू का ?'; +$lang['js']['restore_confirm'] = 'हि आवृत्ती खरोखर पुनर्स्थापित करू का?'; +$lang['js']['media_diff'] = 'फरक बघू:'; +$lang['js']['media_diff_both'] = 'बाजूबाजूला'; +$lang['js']['media_diff_portions'] = 'स्वाईप'; +$lang['js']['media_select'] = 'फाईल निवड...'; +$lang['js']['media_upload_btn'] = 'अपलोड'; +$lang['js']['media_done_btn'] = 'झालं'; +$lang['js']['media_drop'] = 'अपलोड करण्यासाठी इथे फाईल टाका'; +$lang['js']['media_cancel'] = 'काढा'; $lang['rssfailed'] = 'ही पुरवणी आणण्यात काही चूक झाली:'; $lang['nothingfound'] = 'काही सापडला नाही.'; $lang['mediaselect'] = 'दृकश्राव्य फाइल'; @@ -111,9 +153,7 @@ $lang['deletefail'] = '%s ही फाइल नष्ट करू $lang['mediainuse'] = '%s ही फाइल नष्ट केली नाही - ती अजुन वापरात आहे.'; $lang['namespaces'] = 'नेमस्पेस'; $lang['mediafiles'] = 'मध्ये उपलब्ध असलेल्या फाइल'; -$lang['js']['keepopen'] = 'निवड केल्यावर विण्डो उघडी ठेवा'; -$lang['js']['hidedetails'] = 'सविस्तर मजकूर लपवा'; -$lang['js']['nosmblinks'] = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.'; +$lang['accessdenied'] = 'तुम्हाला हे पान बघायची परवानगी नाही.'; $lang['mediausage'] = 'ह्या फाइलचा संदर्भ देण्यासाठी खालील सिन्टॅक्स वापरा :'; $lang['mediaview'] = 'मूळ फाइल बघू '; $lang['mediaroot'] = 'रूट'; @@ -129,6 +169,10 @@ $lang['current'] = 'चालू'; $lang['yours'] = 'तुमची आवृत्ति'; $lang['diff'] = 'सध्याच्या आवृत्तिंशी फरक दाखवा'; $lang['diff2'] = 'निवडलेल्या आवृत्तिंमधील फरक दाखवा'; +$lang['difflink'] = 'ह्या तुलना दृष्टीकोनाला लिंक करा'; +$lang['diff_type'] = 'फरक बघू:'; +$lang['diff_inline'] = 'एका ओळीत'; +$lang['diff_side'] = 'बाजूबाजूला'; $lang['line'] = 'ओळ'; $lang['breadcrumb'] = 'मागमूस'; $lang['youarehere'] = 'तुम्ही इथे आहात'; @@ -140,10 +184,21 @@ $lang['restored'] = 'जुनी आवृत्ति पुन $lang['external_edit'] = 'बाहेरून संपादित'; $lang['summary'] = 'सारांश बदला'; $lang['noflash'] = 'ही माहिती दाखवण्यासाठी अडोब फ्लॅश प्लेअर ची गरज आहे.'; +$lang['download'] = 'तुकडा डाउनलोड करा'; +$lang['tools'] = 'साधने'; +$lang['user_tools'] = 'युजरची साधने'; +$lang['site_tools'] = 'साईटची साधने'; +$lang['page_tools'] = 'पानाची साधने'; +$lang['skip_to_content'] = 'सरळ मजकुराकडे '; $lang['mail_newpage'] = 'पृष्ठ जोडले : '; $lang['mail_changed'] = 'पृष्ठ बदलले : '; +$lang['mail_subscribe_list'] = 'ह्या नेमस्पेस नाढे बदललेली पाने:'; $lang['mail_new_user'] = 'नवीन सदस्य : '; $lang['mail_upload'] = 'फाइल अपलोड केली : '; +$lang['changes_type'] = 'ह्याचे बदल बघू'; +$lang['pages_changes'] = 'पाने'; +$lang['media_changes'] = 'मिडिया फाईल'; +$lang['both_changes'] = 'पाने आणि मिडिया फाईल दोन्ही'; $lang['qb_bold'] = 'ठळक मजकूर'; $lang['qb_italic'] = 'तिरका मजकूर'; $lang['qb_underl'] = 'अधोरेखित मजकूर'; @@ -154,6 +209,11 @@ $lang['qb_h2'] = 'दुसर्या पातळीचे $lang['qb_h3'] = 'तिसर्या पातळीचे शीर्षक'; $lang['qb_h4'] = 'चवथ्या पातळीचे शीर्षक'; $lang['qb_h5'] = 'पाचव्या पातळीचे शीर्षक'; +$lang['qb_h'] = 'शीर्षक'; +$lang['qb_hs'] = 'शीर्षक निवड'; +$lang['qb_hplus'] = 'उंच शीर्षक'; +$lang['qb_hminus'] = 'खालचं शीर्षक'; +$lang['qb_hequal'] = 'समान लेवलचे शीर्षक'; $lang['qb_link'] = 'अंतर्गत लिंक'; $lang['qb_extlink'] = 'बाह्य लिंक'; $lang['qb_hr'] = 'आडवी पट्टी'; @@ -163,7 +223,7 @@ $lang['qb_media'] = 'प्रतिमा आणि इतर फ $lang['qb_sig'] = 'स्वाक्षरी टाका'; $lang['qb_smileys'] = 'स्माइली'; $lang['qb_chars'] = 'ख़ास चिन्ह'; -$lang['js']['del_confirm'] = 'निवडलेल्या गोष्टी नक्की नष्ट करू का ?'; +$lang['upperns'] = 'ह्यावरच्या नेमस्पेसकडे उडी मारा'; $lang['admin_register'] = 'नवीन सदस्य'; $lang['metaedit'] = 'मेटाडेटा बदला'; $lang['metasaveerr'] = 'मेटाडेटा सुरक्षित झाला नाही'; @@ -179,11 +239,9 @@ $lang['img_copyr'] = 'कॉपीराइट'; $lang['img_format'] = 'प्रकार'; $lang['img_camera'] = 'कॅमेरा'; $lang['img_keywords'] = 'मुख्य शब्द'; -$lang['subscribe_success'] = '%s ला %s च्या पुरवणिसाठि नोंदवले'; -$lang['subscribe_error'] = '%s ला %s च्या पुरवणिसाठि नोंदवताना चूक झाली'; -$lang['subscribe_noaddress'] = 'तुमच्या लॉगिनशी सम्बंधित कुठलाही पत्ता नाही , त्यामुळे पुरवणिसाठि नोंद केली जाऊ शकत नाही'; -$lang['unsubscribe_success'] = '%s ला %s च्या पुरवणी यादी मधून काढून टाकले'; -$lang['unsubscribe_error'] = '%s ला %s च्या पुरवणी यादी मधून काढून टाकण्यात चूक झाली'; +$lang['img_width'] = 'रुंदी'; +$lang['img_height'] = 'उंची'; +$lang['img_manager'] = 'मिडिया व्यवस्थापकात बघू'; $lang['authmodfailed'] = 'सदस्य अधिकृत करण्याची व्यवस्था चुकीची आहे. कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.'; $lang['authtempfail'] = 'सदस्य अधिकृत करण्याची सुविधा सध्या चालू नाही. सतत हा मजकूर दिसल्यास कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.'; $lang['i_chooselang'] = 'तुमची भाषा निवडा'; -- cgit v1.2.3 From 026b314868ee80aca644bf4107f78d8e8052b43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?= Date: Sun, 15 Apr 2012 12:47:43 +0200 Subject: Romanian language update --- inc/lang/ro/lang.php | 9 +++++++++ inc/lang/ro/resetpwd.txt | 3 +++ lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 6 ++++++ lib/plugins/plugin/lang/ro/lang.php | 1 + lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 8 files changed, 23 insertions(+) create mode 100644 inc/lang/ro/resetpwd.txt diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 21a6ecef4..41727e521 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -44,6 +45,7 @@ $lang['btn_backtomedia'] = 'Înapoi la Selecţia Mediafile'; $lang['btn_subscribe'] = 'Subscrie Modificarea Paginii'; $lang['btn_profile'] = 'Actualizează Profil'; $lang['btn_reset'] = 'Resetează'; +$lang['btn_resendpwd'] = 'Setează o parolă nouă'; $lang['btn_draft'] = 'Editează schiţă'; $lang['btn_recover'] = 'Recuperează schiţă'; $lang['btn_draftdel'] = 'Şterge schiţă'; @@ -80,6 +82,7 @@ $lang['profnoempty'] = 'Nu sunt admise numele sau adresa de email neco $lang['profchanged'] = 'Profilul de utilizator a fost actualizat succes.'; $lang['pwdforget'] = 'Parola uitată? Luaţi una nouă'; $lang['resendna'] = 'Această wiki nu suportă retrimiterea parolei.'; +$lang['resendpwd'] = 'Setează o parolă nouă pentru'; $lang['resendpwdmissing'] = 'Ne pare rău, trebuie completate toate câmpurile.'; $lang['resendpwdnouser'] = 'Ne pare rău, acest utilizator nu poate fi găsit în baza de date.'; $lang['resendpwdbadauth'] = 'Ne pare rău, acest cod de autorizare nu este corect. Verificaţi dacă aţi folosit tot link-ul de confirmare.'; @@ -186,6 +189,11 @@ $lang['external_edit'] = 'editare externă'; $lang['summary'] = 'Editează sumarul'; $lang['noflash'] = 'Plugin-ul Adobe Flash Plugin este necesar pentru afişarea corectă a conţinutului.'; $lang['download'] = 'Bloc descărcări'; +$lang['tools'] = 'Unelte'; +$lang['user_tools'] = 'Unelte utilizator'; +$lang['site_tools'] = 'Unelte Site'; +$lang['page_tools'] = 'Unelte Pagină'; +$lang['skip_to_content'] = 'sari la conținut'; $lang['mail_newpage'] = 'pagina adăugată:'; $lang['mail_changed'] = 'page schimbată:'; $lang['mail_subscribe_list'] = 'pagini modificate în spaţiul de nume:'; @@ -256,6 +264,7 @@ $lang['subscr_style_digest'] = 'digerează email la schimbări pentru fiecare $lang['subscr_style_list'] = 'lista paginilor schimbate de la ultimul email (la fiecare %.2f zile)'; $lang['authmodfailed'] = 'Configuraţia autentificării utilizatorului este eronată. Anunţaţi Wiki Admin-ul.'; $lang['authtempfail'] = 'Autentificarea utilizatorului este temporar indisponibilă. Anunţaţi Wiki Admin-ul.'; +$lang['authpwdexpire'] = 'Parola vă va expira în %d zile, ar trebui să o schimbați curând.'; $lang['i_chooselang'] = 'Alegeţi limba'; $lang['i_installer'] = 'DokuWiki Installer'; $lang['i_wikiname'] = 'Numele Wiki'; diff --git a/inc/lang/ro/resetpwd.txt b/inc/lang/ro/resetpwd.txt new file mode 100644 index 000000000..2eb8052f1 --- /dev/null +++ b/inc/lang/ro/resetpwd.txt @@ -0,0 +1,3 @@ +====== Setează parolă nouă ====== + +Vă rugăm să introduceți o nouă parolă pentru contul dvs. pe acest wiki. \ No newline at end of file diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index c278c918e..4d093216b 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index d638e1eec..72b205b90 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou.
Valorile incorecte vor apărea într-un chenar roşu.'; @@ -48,6 +49,8 @@ $lang['cookiedir'] = 'Cale Cookie. Lăsați gol pentru a utiliza bas $lang['start'] = 'Numele paginii de start'; $lang['title'] = 'Titlul wiki'; $lang['template'] = 'Şablon'; +$lang['tagline'] = 'Slogan (dacă templateul suportă opțiunea)'; +$lang['sidebar'] = 'Numele paginii barei laterale (dacă templateul suportă opțiunea), câmpul lăsat gol dezactivează bara laterală'; $lang['license'] = 'Sub ce licenţă va fi publicat conţinutul?'; $lang['fullpath'] = 'Arată calea completă a paginii în subsol'; $lang['recent'] = 'Modificări recente'; @@ -91,6 +94,8 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; +$lang['remote'] = 'Activează sistemul remote API. Acesta permite altor aplicații să acceseze wiki-ul via XML-RPC sau alte mecanisme.'; +$lang['remoteuser'] = 'Restricționează accesul sistemului remote API la grupurile sau utilizatorii următori (separați prin virgulă). Lăsați câmpul gol pentru a da acces către toți.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; @@ -130,6 +135,7 @@ $lang['rss_content'] = 'Ce să afişez în obiectele fluxurilor XML'; $lang['rss_update'] = 'Intervalul de actualizare a fluxului XML (sec)'; $lang['recent_days'] = 'Câte modificări recente să se păstreze?'; $lang['rss_show_summary'] = 'Fluxul XML arată rezumat în titlu'; +$lang['rss_media'] = 'Ce fel de modificări ar trebui afișate în fluxul XML?'; $lang['target____wiki'] = 'Fereastra ţintă pentru legăturile interne'; $lang['target____interwiki'] = 'Fereastra ţintă pentru legăturile interwiki'; $lang['target____extern'] = 'Fereastra ţintă pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 50f6ca6f6..c57647e0b 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 9e9086b0d..8ba119dcb 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index f1fcf727c..5ea802575 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 7aac6cfb0..1b33cc4f8 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From 7cd0713ea65947455fd790e72d67409e261fcd1f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 15 Apr 2012 14:57:20 +0200 Subject: rearranged the config options We had a lot of options lumped together under "Advanced Settings". I introduced two more categories and move a few options to other existing categories. I also reordered the appropriate entries in the source files to make it easier to find stuff when extending the options. --- conf/dokuwiki.php | 164 ++++++++++++------------ lib/plugins/config/lang/en/lang.php | 124 ++++++++++-------- lib/plugins/config/settings/config.metadata.php | 40 +++--- 3 files changed, 175 insertions(+), 153 deletions(-) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 5c0b28114..4ca29b461 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -7,39 +7,40 @@ * * This is a piece of PHP code so PHP syntax applies! * - * For help with the configuration see http://www.dokuwiki.org/config + * For help with the configuration and a more detailed explanation of the various options + * see http://www.dokuwiki.org/config */ -/* Datastorage and Permissions */ - -$conf['fmode'] = 0644; //set file creation mode -$conf['dmode'] = 0755; //set directory creation mode +/* Basic Settings */ +$conf['title'] = 'DokuWiki'; //what to show in the title +$conf['start'] = 'start'; //name of start page $conf['lang'] = 'en'; //your language +$conf['template'] = 'dokuwiki'; //see lib/tpl directory +$conf['tagline'] = ''; //tagline in header (if template supports it) +$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it) +$conf['license'] = 'cc-by-nc-sa'; //see conf/license.php +$conf['savedir'] = './data'; //where to store all the files $conf['basedir'] = ''; //absolute dir from serveroot - blank for autodetection $conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect -$conf['cookiedir'] = ''; //Cookie path. Leave blank for using baseurl. -$conf['savedir'] = './data'; //where to store all the files +$conf['cookiedir'] = ''; //path to use in cookies - blank for basedir +$conf['dmode'] = 0755; //set directory creation mode +$conf['fmode'] = 0644; //set file creation mode $conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1 -$conf['mediarevisions'] = 1; //enable/disable media revisions -/* Display Options */ - -$conf['start'] = 'start'; //name of start page -$conf['title'] = 'DokuWiki'; //what to show in the title -$conf['template'] = 'dokuwiki'; //see lib/tpl directory -$conf['tagline'] = ''; //tagline in header (if template supports it) -$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it) -$conf['license'] = 'cc-by-nc-sa'; //see conf/license.php -$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1 +/* Display Settings */ $conf['recent'] = 20; //how many entries to show in recent +$conf['recent_days'] = 7; //How many days of recent changes to keep. (days) $conf['breadcrumbs'] = 10; //how many recent visited pages to show $conf['youarehere'] = 0; //show "You are here" navigation? 0|1 +$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1 $conf['typography'] = 1; //smartquote conversion 0=off, 1=doublequotes, 2=all quotes -$conf['htmlok'] = 0; //may raw HTML be embedded? This may break layout and XHTML validity 0|1 -$conf['phpok'] = 0; //may PHP code be embedded? Never do this on the internet! 0|1 $conf['dformat'] = '%Y/%m/%d %H:%M'; //dateformat accepted by PHPs strftime() function -$conf['signature'] = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki:config for details +$conf['signature'] = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki page for details +$conf['showuseras'] = 'loginname'; // 'loginname' users login name + // 'username' users full name + // 'email' e-mail address (will be obfuscated as per mailguard) + // 'email_link' e-mail address as a mailto: link (obfuscated) $conf['toptoclevel'] = 1; //Level starting with and below to include in AutoTOC (max. 5) $conf['tocminheads'] = 3; //Minimum amount of headlines that determines if a TOC is built $conf['maxtoclevel'] = 3; //Up to which level include into AutoTOC (max. 5) @@ -47,27 +48,10 @@ $conf['maxseclevel'] = 3; //Up to which level create editable se $conf['camelcase'] = 0; //Use CamelCase for linking? (I don't like it) 0|1 $conf['deaccent'] = 1; //deaccented chars in pagenames (1) or romanize (2) or keep (0)? $conf['useheading'] = 0; //use the first heading in a page as its name -$conf['refcheck'] = 1; //check for references before deleting media files -$conf['refshow'] = 0; //how many references should be shown, 5 is a good value -$conf['showuseras'] = 'loginname'; // 'loginname' users login name - // 'username' users full name - // 'email' e-mail address (will be obfuscated as per mailguard) - // 'email_link' e-mail address as a mailto: link (obfuscated) - -/* Antispam Features */ - -$conf['usewordblock']= 1; //block spam based on words? 0|1 -$conf['indexdelay'] = 60*60*24*5; //allow indexing after this time (seconds) default is 5 days -$conf['relnofollow'] = 1; //use rel="nofollow" for external links? -$conf['mailguard'] = 'hex'; //obfuscate email addresses against spam harvesters? - //valid entries are: - // 'visible' - replace @ with [at], . with [dot] and - with [dash] - // 'hex' - use hex entities to encode the mail address - // 'none' - do not obfuscate addresses -$conf['iexssprotect']= 1; // check for JavaScript and HTML in uploaded files 0|1 - -/* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */ +$conf['sneaky_index']= 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior) +$conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes +/* Authentication Settings */ $conf['useacl'] = 0; //Use Access Control Lists to restrict access? $conf['autopasswd'] = 1; //autogenerate passwords and email them to user $conf['authtype'] = 'plain'; //which authentication backend should be used @@ -76,45 +60,58 @@ $conf['defaultgroup']= 'user'; //Default groups new Users are added to $conf['superuser'] = '!!not set!!'; //The admin can be user or @group or comma separated list user1,@group1,user2 $conf['manager'] = '!!not set!!'; //The manager can be user or @group or comma separated list user1,@group1,user2 $conf['profileconfirm'] = 1; //Require current password to confirm changes to user profile +$conf['rememberme'] = 1; //Enable/disable remember me on login $conf['disableactions'] = ''; //comma separated list of actions to disable -$conf['sneaky_index'] = 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior) $conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view $conf['securecookie'] = 1; //never send HTTPS cookies via HTTP - $conf['remote'] = 0; //Enable/disable remote interfaces $conf['remoteuser'] = '!!not set !!'; //user/groups that have access to remote interface (comma separated) -/* Advanced Options */ - -$conf['updatecheck'] = 1; //automatically check for new releases? -$conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal -$conf['useslash'] = 0; //use slash instead of colon? only when rewrite is on +/* Antispam Features */ +$conf['usewordblock']= 1; //block spam based on words? 0|1 +$conf['relnofollow'] = 1; //use rel="nofollow" for external links? +$conf['indexdelay'] = 60*60*24*5; //allow indexing after this time (seconds) default is 5 days +$conf['mailguard'] = 'hex'; //obfuscate email addresses against spam harvesters? + //valid entries are: + // 'visible' - replace @ with [at], . with [dot] and - with [dash] + // 'hex' - use hex entities to encode the mail address + // 'none' - do not obfuscate addresses +$conf['iexssprotect']= 1; // check for JavaScript and HTML in uploaded files 0|1 + +/* Editing Settings */ $conf['usedraft'] = 1; //automatically save a draft while editing (0|1) -$conf['sepchar'] = '_'; //word separator character in page names; may be a - // letter, a digit, '_', '-', or '.'. -$conf['canonical'] = 0; //Should all URLs use full canonical http://... style? -$conf['fnencode'] = 'url'; //encode filenames (url|safe|utf-8) -$conf['autoplural'] = 0; //try (non)plural form of nonexisting files? -$conf['compression'] = 'gz'; //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip) - // bz2 generates smaller files, but needs more cpu-power -$conf['cachetime'] = 60*60*24; //maximum age for cachefile in seconds (defaults to a day) +$conf['htmlok'] = 0; //may raw HTML be embedded? This may break layout and XHTML validity 0|1 +$conf['phpok'] = 0; //may PHP code be embedded? Never do this on the internet! 0|1 $conf['locktime'] = 15*60; //maximum age for lockfiles (defaults to 15 minutes) -$conf['fetchsize'] = 0; //maximum size (bytes) fetch.php may download from extern, disabled by default -$conf['notify'] = ''; //send change info to this email (leave blank for nobody) -$conf['registernotify'] = ''; //send info about newly registered users to this email (leave blank for nobody) -$conf['mailfrom'] = ''; //use this email when sending mails -$conf['mailprefix'] = ''; //use this as prefix of outgoing mails -$conf['gzip_output'] = 0; //use gzip content encodeing for the output xhtml (if allowed by browser) +$conf['cachetime'] = 60*60*24; //maximum age for cachefile in seconds (defaults to a day) + +/* Link Settings */ +// Set target to use when creating links - leave empty for same window +$conf['target']['wiki'] = ''; +$conf['target']['interwiki'] = ''; +$conf['target']['extern'] = ''; +$conf['target']['media'] = ''; +$conf['target']['windows'] = ''; + +/* Media Settings */ +$conf['mediarevisions'] = 1; //enable/disable media revisions +$conf['refcheck'] = 1; //check for references before deleting media files +$conf['refshow'] = 0; //how many references should be shown, 5 is a good value $conf['gdlib'] = 2; //the GDlib version (0, 1 or 2) 2 tries to autodetect $conf['im_convert'] = ''; //path to ImageMagicks convert (will be used instead of GD) $conf['jpg_quality'] = '70'; //quality of compression when scaling jpg images (0-100) +$conf['fetchsize'] = 0; //maximum size (bytes) fetch.php may download from extern, disabled by default + +/* Notification Settings */ $conf['subscribers'] = 0; //enable change notice subscription support $conf['subscribe_time'] = 24*60*60; //Time after which digests / lists are sent (in sec, default 1 day) //Should be smaller than the time specified in recent_days -$conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0 -$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8 -$conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes -$conf['send404'] = 0; //Send a HTTP 404 status for non existing pages? +$conf['notify'] = ''; //send change info to this email (leave blank for nobody) +$conf['registernotify'] = ''; //send info about newly registered users to this email (leave blank for nobody) +$conf['mailfrom'] = ''; //use this email when sending mails +$conf['mailprefix'] = ''; //use this as prefix of outgoing mails + +/* Syndication Settings */ $conf['sitemap'] = 0; //Create a google sitemap? How often? In days. $conf['rss_type'] = 'rss1'; //type of RSS feed to provide, by default: // 'rss' - RSS 0.91 @@ -138,34 +135,41 @@ $conf['rss_media'] = 'both'; //what should be listed? // 'media' - media changes only $conf['rss_update'] = 5*60; //Update the RSS feed every n seconds (defaults to 5 minutes) $conf['rss_show_summary'] = 1; //Add revision summary to title? 0|1 -$conf['recent_days'] = 7; //How many days of recent changes to keep. (days) + +/* Advanced Settings */ +$conf['updatecheck'] = 1; //automatically check for new releases? +$conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal +$conf['useslash'] = 0; //use slash instead of colon? only when rewrite is on +$conf['sepchar'] = '_'; //word separator character in page names; may be a + // letter, a digit, '_', '-', or '.'. +$conf['canonical'] = 0; //Should all URLs use full canonical http://... style? +$conf['fnencode'] = 'url'; //encode filenames (url|safe|utf-8) +$conf['autoplural'] = 0; //try (non)plural form of nonexisting files? +$conf['compression'] = 'gz'; //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip) + // bz2 generates smaller files, but needs more cpu-power +$conf['gzip_output'] = 0; //use gzip content encodeing for the output xhtml (if allowed by browser) +$conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0 +$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8 +$conf['send404'] = 0; //Send a HTTP 404 status for non existing pages? $conf['broken_iua'] = 0; //Platform with broken ignore_user_abort (IIS+CGI) 0|1 $conf['xsendfile'] = 0; //Use X-Sendfile (1 = lighttpd, 2 = standard) $conf['renderer_xhtml'] = 'xhtml'; //renderer to use for main page generation -$conf['rememberme'] = 1; //Enable/disable remember me on login - -//Set target to use when creating links - leave empty for same window -$conf['target']['wiki'] = ''; -$conf['target']['interwiki'] = ''; -$conf['target']['extern'] = ''; -$conf['target']['media'] = ''; -$conf['target']['windows'] = ''; +$conf['readdircache'] = 0; //time cache in second for the readdir operation, 0 to deactivate. -//Proxy setup - if your Server needs a proxy to access the web set these +/* Network Settings */ +// Proxy setup - if your Server needs a proxy to access the web set these $conf['proxy']['host'] = ''; $conf['proxy']['port'] = ''; $conf['proxy']['user'] = ''; $conf['proxy']['pass'] = ''; $conf['proxy']['ssl'] = 0; $conf['proxy']['except'] = ''; - -/* Safemode Hack */ - -$conf['safemodehack'] = 0; //read http://www.dokuwiki.org/config:safemodehack ! +// Safemode Hack - read http://www.dokuwiki.org/config:safemodehack ! +$conf['safemodehack'] = 0; $conf['ftp']['host'] = 'localhost'; $conf['ftp']['port'] = '21'; $conf['ftp']['user'] = 'user'; $conf['ftp']['pass'] = 'password'; $conf['ftp']['root'] = '/home/user/htdocs'; -$conf['readdircache'] = 0; //time cache in second for the readdir opération, 0 to deactivate. + diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 2151d7543..3ce70528f 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -36,6 +36,8 @@ $lang['_anti_spam'] = 'Anti-Spam Settings'; $lang['_editing'] = 'Editing Settings'; $lang['_links'] = 'Link Settings'; $lang['_media'] = 'Media Settings'; +$lang['_notifications'] = 'Notification Settings'; +$lang['_syndication'] = 'Syndication Settings'; $lang['_advanced'] = 'Advanced Settings'; $lang['_network'] = 'Network Settings'; // The settings group name for plugins and templates can be set with @@ -52,28 +54,32 @@ $lang['_msg_setting_no_default'] = 'No default value.'; /* -------------------- Config Options --------------------------- */ -$lang['fmode'] = 'File creation mode'; -$lang['dmode'] = 'Directory creation mode'; -$lang['lang'] = 'Interface language'; -$lang['basedir'] = 'Server path (eg. /dokuwiki/). Leave blank for autodetection.'; -$lang['baseurl'] = 'Server URL (eg. http://www.yourserver.com). Leave blank for autodetection.'; -$lang['savedir'] = 'Directory for saving data'; -$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; -$lang['start'] = 'Start page name'; +/* Basic Settings */ $lang['title'] = 'Wiki title'; +$lang['start'] = 'Start page name'; +$lang['lang'] = 'Interface language'; $lang['template'] = 'Template'; $lang['tagline'] = 'Tagline (if template supports it)'; $lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; -$lang['fullpath'] = 'Reveal full path of pages in the footer'; +$lang['savedir'] = 'Directory for saving data'; +$lang['basedir'] = 'Server path (eg. /dokuwiki/). Leave blank for autodetection.'; +$lang['baseurl'] = 'Server URL (eg. http://www.yourserver.com). Leave blank for autodetection.'; +$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; +$lang['dmode'] = 'Directory creation mode'; +$lang['fmode'] = 'File creation mode'; +$lang['allowdebug'] = 'Allow debug disable if not needed!'; + +/* Display Settings */ $lang['recent'] = 'Recent changes'; +$lang['recent_days'] = 'How many recent changes to keep (days)'; $lang['breadcrumbs'] = 'Number of breadcrumbs'; $lang['youarehere'] = 'Hierarchical breadcrumbs'; +$lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; -$lang['htmlok'] = 'Allow embedded HTML'; -$lang['phpok'] = 'Allow embedded PHP'; $lang['dformat'] = 'Date format (see PHP\'s strftime function)'; $lang['signature'] = 'Signature'; +$lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; $lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built'; $lang['maxtoclevel'] = 'Maximum level for table of contents'; @@ -81,19 +87,10 @@ $lang['maxseclevel'] = 'Maximum section edit level'; $lang['camelcase'] = 'Use CamelCase for links'; $lang['deaccent'] = 'Clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; -$lang['refcheck'] = 'Media reference check'; -$lang['refshow'] = 'Number of media references to show'; -$lang['allowdebug'] = 'Allow debug disable if not needed!'; -$lang['mediarevisions'] = 'Enable Mediarevisions?'; - -$lang['usewordblock']= 'Block spam based on wordlist'; -$lang['indexdelay'] = 'Time delay before indexing (sec)'; -$lang['relnofollow'] = 'Use rel="nofollow" on external links'; -$lang['mailguard'] = 'Obfuscate email addresses'; -$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; -$lang['showuseras'] = 'What to display when showing the user that last edited a page'; +$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; +$lang['hidepages'] = 'Hide matching pages (regular expressions)'; -/* Authentication Options */ +/* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; @@ -102,66 +99,82 @@ $lang['defaultgroup']= 'Default group'; $lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings'; $lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions'; $lang['profileconfirm'] = 'Confirm profile changes with password'; +$lang['rememberme'] = 'Allow permanent login cookies (remember me)'; $lang['disableactions'] = 'Disable DokuWiki actions'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe'; $lang['disableactions_wikicode'] = 'View source/Export Raw'; $lang['disableactions_other'] = 'Other actions (comma separated)'; -$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; $lang['remote'] = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.'; $lang['remoteuser'] = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +/* Anti-Spam Settings */ +$lang['usewordblock']= 'Block spam based on wordlist'; +$lang['relnofollow'] = 'Use rel="nofollow" on external links'; +$lang['indexdelay'] = 'Time delay before indexing (sec)'; +$lang['mailguard'] = 'Obfuscate email addresses'; +$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; + +/* Editing Settings */ +$lang['usedraft'] = 'Automatically save a draft while editing'; +$lang['htmlok'] = 'Allow embedded HTML'; +$lang['phpok'] = 'Allow embedded PHP'; +$lang['locktime'] = 'Maximum age for lock files (sec)'; +$lang['cachetime'] = 'Maximum age for cache (sec)'; + +/* Link settings */ +$lang['target____wiki'] = 'Target window for internal links'; +$lang['target____interwiki'] = 'Target window for interwiki links'; +$lang['target____extern'] = 'Target window for external links'; +$lang['target____media'] = 'Target window for media links'; +$lang['target____windows'] = 'Target window for windows links'; + +/* Media Settings */ +$lang['mediarevisions'] = 'Enable Mediarevisions?'; +$lang['refcheck'] = 'Media reference check'; +$lang['refshow'] = 'Number of media references to show'; +$lang['gdlib'] = 'GD Lib version'; +$lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; +$lang['jpg_quality'] = 'JPG compression quality (0-100)'; +$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; + +/* Notification Settings */ +$lang['subscribers'] = 'Allow users to subscribe to page changes by email'; +$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; +$lang['notify'] = 'Send change notifications to this email address'; +$lang['registernotify'] = 'Send info on newly registered users to this email address'; +$lang['mailfrom'] = 'Email address to use for automatic mails'; +$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; + +/* Syndication Settings */ +$lang['sitemap'] = 'Generate Google sitemap (days)'; +$lang['rss_type'] = 'XML feed type'; +$lang['rss_linkto'] = 'XML feed links to'; +$lang['rss_content'] = 'What to display in the XML feed items?'; +$lang['rss_update'] = 'XML feed update interval (sec)'; +$lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; + /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; $lang['userewrite'] = 'Use nice URLs'; $lang['useslash'] = 'Use slash as namespace separator in URLs'; -$lang['usedraft'] = 'Automatically save a draft while editing'; $lang['sepchar'] = 'Page name word separator'; $lang['canonical'] = 'Use fully canonical URLs'; $lang['fnencode'] = 'Method for encoding non-ASCII filenames.'; $lang['autoplural'] = 'Check for plural forms in links'; $lang['compression'] = 'Compression method for attic files'; -$lang['cachetime'] = 'Maximum age for cache (sec)'; -$lang['locktime'] = 'Maximum age for lock files (sec)'; -$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; -$lang['notify'] = 'Send change notifications to this email address'; -$lang['registernotify'] = 'Send info on newly registered users to this email address'; -$lang['mailfrom'] = 'Email address to use for automatic mails'; -$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; -$lang['gdlib'] = 'GD Lib version'; -$lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; -$lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['subscribers'] = 'Enable page subscription support'; -$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! 400 to 600 bytes is a good value. Set 0 to disable.'; -$lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -$lang['sitemap'] = 'Generate Google sitemap (days)'; $lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See Bug 852 for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Allow permanent login cookies (remember me)'; - -$lang['rss_type'] = 'XML feed type'; -$lang['rss_linkto'] = 'XML feed links to'; -$lang['rss_content'] = 'What to display in the XML feed items?'; -$lang['rss_update'] = 'XML feed update interval (sec)'; -$lang['recent_days'] = 'How many recent changes to keep (days)'; -$lang['rss_show_summary'] = 'XML feed show summary in title'; -$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; - -/* Target options */ -$lang['target____wiki'] = 'Target window for internal links'; -$lang['target____interwiki'] = 'Target window for interwiki links'; -$lang['target____extern'] = 'Target window for external links'; -$lang['target____media'] = 'Target window for media links'; -$lang['target____windows'] = 'Target window for windows links'; /* Proxy Options */ $lang['proxy____host'] = 'Proxy servername'; @@ -179,6 +192,7 @@ $lang['ftp____user'] = 'FTP user name for safemode hack'; $lang['ftp____pass'] = 'FTP password for safemode hack'; $lang['ftp____root'] = 'FTP root directory for safemode hack'; +/* License Options */ $lang['license_o_'] = 'None chosen'; /* typography options */ diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index a472a954b..e610ac4d4 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -104,6 +104,7 @@ $meta['allowdebug'] = array('onoff'); $meta['_display'] = array('fieldset'); $meta['recent'] = array('numeric'); +$meta['recent_days'] = array('numeric'); $meta['breadcrumbs'] = array('numeric','_min' => 0); $meta['youarehere'] = array('onoff'); $meta['fullpath'] = array('onoff'); @@ -118,8 +119,8 @@ $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // $meta['camelcase'] = array('onoff'); $meta['deaccent'] = array('multichoice','_choices' => array(0,1,2)); $meta['useheading'] = array('multichoice','_choices' => array(0,'navigation','content',1)); -$meta['refcheck'] = array('onoff'); -$meta['refshow'] = array('numeric'); +$meta['sneaky_index'] = array('onoff'); +$meta['hidepages'] = array('string'); $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); @@ -131,11 +132,9 @@ $meta['superuser'] = array('string'); $meta['manager'] = array('string'); $meta['profileconfirm'] = array('onoff'); $meta['rememberme'] = array('onoff'); -$meta['registernotify'] = array('email'); $meta['disableactions'] = array('disableactions', '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'), '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); -$meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); $meta['remote'] = array('onoff'); @@ -152,9 +151,6 @@ $meta['_editing'] = array('fieldset'); $meta['usedraft'] = array('onoff'); $meta['htmlok'] = array('onoff'); $meta['phpok'] = array('onoff'); -$meta['notify'] = array('email', '_multiple' => true); -$meta['subscribers'] = array('onoff'); -$meta['subscribe_time'] = array('numeric'); $meta['locktime'] = array('numeric'); $meta['cachetime'] = array('numeric'); @@ -171,6 +167,25 @@ $meta['gdlib'] = array('multichoice','_choices' => array(0,1,2)); $meta['im_convert'] = array('im_convert'); $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100) $meta['fetchsize'] = array('numeric'); +$meta['refcheck'] = array('onoff'); +$meta['refshow'] = array('numeric'); + +$meta['_notifications'] = array('fieldset'); +$meta['subscribers'] = array('onoff'); +$meta['subscribe_time'] = array('numeric'); +$meta['notify'] = array('email', '_multiple' => true); +$meta['registernotify'] = array('email'); +$meta['mailfrom'] = array('richemail'); +$meta['mailprefix'] = array('string'); + +$meta['_syndication'] = array('fieldset'); +$meta['sitemap'] = array('numeric'); +$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); +$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); +$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); +$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); +$meta['rss_update'] = array('numeric'); +$meta['rss_show_summary'] = array('onoff'); $meta['_advanced'] = array('fieldset'); $meta['updatecheck'] = array('onoff'); @@ -180,22 +195,11 @@ $meta['sepchar'] = array('sepchar'); $meta['canonical'] = array('onoff'); $meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8')); $meta['autoplural'] = array('onoff'); -$meta['mailfrom'] = array('richemail'); -$meta['mailprefix'] = array('string'); $meta['compress'] = array('onoff'); $meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/'); $meta['gzip_output'] = array('onoff'); -$meta['hidepages'] = array('string'); $meta['send404'] = array('onoff'); $meta['compression'] = array('compression'); -$meta['sitemap'] = array('numeric'); -$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); -$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); -$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); -$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); -$meta['rss_update'] = array('numeric'); -$meta['rss_show_summary'] = array('onoff'); -$meta['recent_days'] = array('numeric'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); -- cgit v1.2.3 From b5cc8f4b6bd4593e984fa6009532fae8eda57a7f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 15 Apr 2012 15:11:29 +0200 Subject: extended some config options a bit, to make more clear what they do --- lib/plugins/config/lang/en/lang.php | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 3ce70528f..42f34de74 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -55,10 +55,10 @@ $lang['_msg_setting_no_default'] = 'No default value.'; /* -------------------- Config Options --------------------------- */ /* Basic Settings */ -$lang['title'] = 'Wiki title'; -$lang['start'] = 'Start page name'; +$lang['title'] = 'Wiki title aka. your wiki\'s name'; +$lang['start'] = 'Page name to use as the starting point for each namespace'; $lang['lang'] = 'Interface language'; -$lang['template'] = 'Template'; +$lang['template'] = 'Template aka. the design of the wiki.'; $lang['tagline'] = 'Tagline (if template supports it)'; $lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; @@ -71,31 +71,31 @@ $lang['fmode'] = 'File creation mode'; $lang['allowdebug'] = 'Allow debug disable if not needed!'; /* Display Settings */ -$lang['recent'] = 'Recent changes'; +$lang['recent'] = 'Number of entries per page in the recent changes'; $lang['recent_days'] = 'How many recent changes to keep (days)'; -$lang['breadcrumbs'] = 'Number of breadcrumbs'; -$lang['youarehere'] = 'Hierarchical breadcrumbs'; +$lang['breadcrumbs'] = 'Number of "trace" breadcrumbs. Set to 0 to disable.'; +$lang['youarehere'] = 'Use hierarchical breadcrumbs (you probably want to disable the above option then)'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; $lang['dformat'] = 'Date format (see PHP\'s strftime function)'; -$lang['signature'] = 'Signature'; +$lang['signature'] = 'What to insert with the signature button in the editor'; $lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; $lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built'; $lang['maxtoclevel'] = 'Maximum level for table of contents'; $lang['maxseclevel'] = 'Maximum section edit level'; $lang['camelcase'] = 'Use CamelCase for links'; -$lang['deaccent'] = 'Clean pagenames'; +$lang['deaccent'] = 'How to clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; -$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; -$lang['hidepages'] = 'Hide matching pages (regular expressions)'; +$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.'; +$lang['hidepages'] = 'Hide pages matching this regular expressions from search, the sitemap and other automatic indexes'; /* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; $lang['passcrypt'] = 'Password encryption method'; -$lang['defaultgroup']= 'Default group'; +$lang['defaultgroup']= 'Default group, all new users will be placed in this group'; $lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings'; $lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions'; $lang['profileconfirm'] = 'Confirm profile changes with password'; @@ -133,23 +133,23 @@ $lang['target____windows'] = 'Target window for windows links'; /* Media Settings */ $lang['mediarevisions'] = 'Enable Mediarevisions?'; -$lang['refcheck'] = 'Media reference check'; -$lang['refshow'] = 'Number of media references to show'; +$lang['refcheck'] = 'Check if a media file is still in use before deleting it'; +$lang['refshow'] = 'Number of media references to show when the above setting is enabled'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; +$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from external URLs, eg. to cache and resize external images.'; /* Notification Settings */ $lang['subscribers'] = 'Allow users to subscribe to page changes by email'; $lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; -$lang['notify'] = 'Send change notifications to this email address'; -$lang['registernotify'] = 'Send info on newly registered users to this email address'; -$lang['mailfrom'] = 'Email address to use for automatic mails'; -$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; +$lang['notify'] = 'Always send change notifications to this email address'; +$lang['registernotify'] = 'Always send info on newly registered users to this email address'; +$lang['mailfrom'] = 'Sender email address to use for automatic mails'; +$lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title'; /* Syndication Settings */ -$lang['sitemap'] = 'Generate Google sitemap (days)'; +$lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable'; $lang['rss_type'] = 'XML feed type'; $lang['rss_linkto'] = 'XML feed links to'; $lang['rss_content'] = 'What to display in the XML feed items?'; @@ -170,7 +170,7 @@ $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! 400 to 600 bytes is a good value. Set 0 to disable.'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See Bug 852 for more info.'; +$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See Bug 852 for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; -- cgit v1.2.3