Merge branch 'master' into stable

13 files changed, 73 insertions, 22 deletions

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index ad1de212b..fdb407da0 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
- * Arabic language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Mostafa Hussein <mostafa@gmail.com>
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
  * @author uahello@gmail.com
+ * @author Ahmad Abd-Elghany <tolpa1@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -50,6 +51,7 @@ $lang['btn_revert']            = 'استعد';
 $lang['btn_register']          = 'سجّل';
 $lang['btn_apply']             = 'طبق';
 $lang['btn_media']             = 'مدير الوسائط';
+$lang['btn_deleteuser']        = 'احذف حسابي الخاص';
 $lang['loggedinas']            = 'داخل باسم';
 $lang['user']                  = 'اسم المستخدم';
 $lang['pass']                  = 'كلمة السر';
@@ -61,6 +63,7 @@ $lang['fullname']              = 'الاسم الحقيقي';
 $lang['email']                 = 'البريد الإلكتروني';
 $lang['profile']               = 'الملف الشخصي';
 $lang['badlogin']              = 'عذرا، اسم المشترك أو كلمة السر غير صحيحة';
+$lang['badpassconfirm']        = 'عذراً,كلمة السر غير صحيحة';
 $lang['minoredit']             = 'تعديلات طفيفة';
 $lang['draftdate']             = 'حفظ المسودات آليا مفعّل';
 $lang['nosecedit']             = 'غُيرت الصفحة في هذه الأثناء، معلومات الجزء اصبحت قديمة. حُمُلت كل الصفحة بدلا.';
@@ -77,6 +80,11 @@ $lang['profna']                = 'هذه الويكي لا تدعم تعديل �
 $lang['profnochange']          = 'لا تغييرات، لا شيء ليُعمل.';
 $lang['profnoempty']           = 'غير مسموح باسم مستخدم أو بريد فارغ.';
 $lang['profchanged']           = 'حُدث الملف الشخصي للمستخدم بنجاح.';
+$lang['profnodelete']          = 'هذه الموسوعه لا ندعم حذف الأشخاص';
+$lang['profdeleteuser']        = 'احذف حساب';
+$lang['profdeleted']           = 'حسابك الخاص تم حذفه من هذه الموسوعة';
+$lang['profconfdelete']        = 'أنا أرغب في حذف حسابي من هذه الموسوعة.<br/> 
+هذا الحدث غير ممكن.';
 $lang['pwdforget']             = 'أنسيت كلمة السر؟ احصل على واحدة جديدة';
 $lang['resendna']              = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور.';
 $lang['resendpwd']             = 'اضبط كلمة سر جديدة لـ';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 0da7e4761..eb50bb240 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -16,6 +16,7 @@
  * @author Mikael Lyngvig <mikael@lyngvig.org>
  * @author Soren Birk <soer9648@hotmail.com>
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
+ * @author soer9648 <soer9648@eucl.dk>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -91,6 +92,7 @@ $lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
 $lang['profnodelete']          = 'Denne wiki supporterer ikke sletning af brugere';
 $lang['profdeleteuser']        = 'Slet Konto';
 $lang['profdeleted']           = 'Din brugerkonto er blevet slettet fra denne wiki';
+$lang['profconfdelete']        = 'Jeg ønsker at slette min konto fra denne wiki. <br/> Denne handling kan ikke fortrydes.';
 $lang['pwdforget']             = 'Har du glemt dit adgangskode? Få et nyt';
 $lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
 $lang['resendpwd']             = 'Vælg ny adgangskode for';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 685e668c4..dceaf1af0 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Christof <gagi@fin.de>
  * @author Anika Henke <anika@selfthinker.org>
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index d4ddf293a..17a75803f 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -315,6 +315,7 @@ $lang['i_policy']              = 'Initial ACL policy';
 $lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
 $lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
 $lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
+$lang['i_allowreg']            = 'Allow users to register themselves';
 $lang['i_retry']               = 'Retry';
 $lang['i_license']             = 'Please choose the license you want to put your content under:';
 $lang['i_license_none']        = 'Do not show any license information';
@@ -356,4 +357,8 @@ $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload
 $lang['media_update']          = 'Upload new version';
 $lang['media_restore']         = 'Restore this version';
 
+$lang['currentns']             = 'Current namespace';
+$lang['searchresult']          = 'Search Result';
+$lang['plainhtml']             = 'Plain HTML';
+$lang['wikimarkup']            = 'Wiki Markup';
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/eo/admin.txt b/inc/lang/eo/admin.txt
index 2ede2763c..4b0cf7909 100644
--- a/inc/lang/eo/admin.txt
+++ b/inc/lang/eo/admin.txt
@@ -1,3 +1,3 @@
-====== Administro ======
+====== Administrado ======
 
 Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki.
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 39346bb01..a543b2571 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Antono Vasiljev <esperanto.minsk ĈE tut.by>
  * @author Felipe Castro <fefcas@yahoo.com.br>
  * @author Felipe Castro <fefcas@uol.com.br>
@@ -330,3 +330,7 @@ $lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi d
 $lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
 $lang['media_update']          = 'Alŝuti novan version';
 $lang['media_restore']         = 'Restarigi ĉi tiun version';
+$lang['currentns']             = 'Aktuala nomspaco';
+$lang['searchresult']          = 'Serĉrezulto';
+$lang['plainhtml']             = 'Plena HTML';
+$lang['wikimarkup']            = 'Vikiteksto';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 4ddc3a019..2c4d758ff 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -10,6 +10,7 @@
  * @author Yaron Yogev <yaronyogev@gmail.com>
  * @author Yaron Shahrabani <sh.yaron@gmail.com>
  * @author Roy Zahor <roy.zahor@gmail.com>
+ * @author alex <ralexay@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -80,6 +81,7 @@ $lang['profna']                = 'בוויקי הזה לא ניתן לשנות �
 $lang['profnochange']          = 'אין שינויים, הפרופיל לא עודכן';
 $lang['profnoempty']           = 'השם וכתובת הדוא״ל לא יכולים להיות ריקים';
 $lang['profchanged']           = 'הפרופיל עודכן בהצלחה';
+$lang['profdeleteuser']        = 'הסר חשבון';
 $lang['pwdforget']             = 'שכחת את הססמה שלך? ניתן לקבל חדשה';
 $lang['resendna']              = 'הוויקי הזה אינו תומך בחידוש ססמה';
 $lang['resendpwd']             = 'הגדר סיסמא חדשה בעבור';
@@ -128,11 +130,15 @@ $lang['js']['nosmblinks']      = 'קישור לכונני שיתוף של Window
 $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_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']           = 'קובצי מדיה';
@@ -183,6 +189,10 @@ $lang['summary']               = 'תקציר העריכה';
 $lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">תוסף פלאש לדפדפן</a> נדרש כדי להציג תוכן זה.';
 $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']   = 'דפים שהשתנו במרחב השם:';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index e6cae3db0..39f2428fa 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -23,7 +23,7 @@ $lang['btn_edit']              = '문서 편집';
 $lang['btn_source']            = '원본 보기';
 $lang['btn_show']              = '문서 보기';
 $lang['btn_create']            = '문서 만들기';
-$lang['btn_search']            = '찾기';
+$lang['btn_search']            = '검색';
 $lang['btn_save']              = '저장';
 $lang['btn_preview']           = '미리 보기';
 $lang['btn_top']               = '맨 위로';
@@ -96,10 +96,10 @@ $lang['resendpwdnouser']       = '죄송하지만 데이터베이스에서 이 �
 $lang['resendpwdbadauth']      = '죄송하지만 인증 코드가 올바르지 않습니다. 잘못된 확인 링크인지 확인하세요.';
 $lang['resendpwdconfirm']      = '확인 링크를 이메일로 보냈습니다.';
 $lang['resendpwdsuccess']      = '새 비밀번호를 이메일로 보냈습니다.';
-$lang['license']               = '별도로 명시하지 않을 경우, 이 위키의 내용은 다음의 라이선스에 따라 사용할 수 있습니다:';
-$lang['licenseok']             = '참고: 이 문서를 편집하면 내용은 다음 라이선스에 따라 사용 허가에 동의합니다:';
-$lang['searchmedia']           = '파일 이름 찾기:';
-$lang['searchmedia_in']        = '%s에서 찾기';
+$lang['license']               = '별도로 명시하지 않을 경우, 이 위키의 내용은 다음 라이선스에 따라 사용할 수 있습니다:';
+$lang['licenseok']             = '참고: 이 문서를 편집하면 내용은 다음 라이선스에 따라 배포하는 데 동의합니다:';
+$lang['searchmedia']           = '파일 이름 검색:';
+$lang['searchmedia_in']        = '%s에서 검색';
 $lang['txt_upload']            = '올릴 파일 선택';
 $lang['txt_filename']          = '올릴 파일 이름 입력 (선택 사항)';
 $lang['txt_overwrt']           = '기존 파일에 덮어쓰기';
@@ -108,7 +108,7 @@ $lang['lockedby']              = '현재 잠겨진 사용자';
 $lang['lockexpire']            = '잠금 해제 시간';
 $lang['js']['willexpire']      = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리 보기를 눌러 잠금 시간을 다시 설정하세요.';
 $lang['js']['notsavedyet']     = '저장하지 않은 바뀜이 사라집니다.';
-$lang['js']['searchmedia']     = '파일 찾기';
+$lang['js']['searchmedia']     = '파일 검색';
 $lang['js']['keepopen']        = '선택할 때 창을 열어 놓기';
 $lang['js']['hidedetails']     = '자세한 정보 숨기기';
 $lang['js']['mediatitle']      = '링크 설정';
@@ -308,7 +308,7 @@ $lang['minutes']               = '%d분 전';
 $lang['seconds']               = '%d초 전';
 $lang['wordblock']             = '차단 문구(스팸)를 포함하고 있어서 바뀜을 저장하지 않았습니다.';
 $lang['media_uploadtab']       = '올리기';
-$lang['media_searchtab']       = '찾기';
+$lang['media_searchtab']       = '검색';
 $lang['media_file']            = '파일';
 $lang['media_viewtab']         = '보기';
 $lang['media_edittab']         = '편집';
@@ -320,7 +320,7 @@ $lang['media_sort_date']       = '날짜';
 $lang['media_namespaces']      = '이름공간 선택';
 $lang['media_files']           = '%s에 있는 파일';
 $lang['media_upload']          = '%s에 올리기';
-$lang['media_search']          = '%s에서 찾기';
+$lang['media_search']          = '%s에서 검색';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%2$s (%1$s에 있음)';
 $lang['media_edit']            = '%s 편집';
@@ -330,3 +330,7 @@ $lang['media_perm_read']       = '죄송하지만 파일을 읽을 권한이 없
 $lang['media_perm_upload']     = '죄송하지만 파일을 올릴 권한이 없습니다.';
 $lang['media_update']          = '새 판 올리기';
 $lang['media_restore']         = '이 판으로 되돌리기';
+$lang['currentns']             = '현재 이름공간';
+$lang['searchresult']          = '검색 결과';
+$lang['plainhtml']             = '일반 HTML';
+$lang['wikimarkup']            = '위키 문법';
diff --git a/inc/lang/ko/searchpage.txt b/inc/lang/ko/searchpage.txt
index cb9bae2e0..35384c536 100644
--- a/inc/lang/ko/searchpage.txt
+++ b/inc/lang/ko/searchpage.txt
@@ -1,5 +1,5 @@
-====== 찾기 ======
+====== 검색 ======
 
-아래에서 찾기 결과를 볼 수 있습니다. 만일 원하는 문서를 찾지 못하였다면, "문서 만들기"나 "문서 편집"을 사용해 쿼리 내용과 같은 이름의 문서를 만들거나 편집할 수 있습니다.
+아래에서 검색 결과를 볼 수 있습니다. 만일 원하는 문서를 찾지 못하였다면, "문서 만들기"나 "문서 편집"을 사용해 쿼리 내용과 같은 이름의 문서를 만들거나 편집할 수 있습니다.
 
 ===== 결과 =====
\ No newline at end of file
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index ed33dad3d..5f95a99bf 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -341,3 +341,7 @@ $lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om besta
 $lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
 $lang['media_update']          = 'Upload nieuwe versie';
 $lang['media_restore']         = 'Deze versie terugzetten';
+$lang['currentns']             = 'Huidige namespace';
+$lang['searchresult']          = 'Zoekresultaat';
+$lang['plainhtml']             = 'Alleen HTML';
+$lang['wikimarkup']            = 'Wiki Opmaak';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 6a0c4bb6b..237b819db 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -22,6 +22,7 @@
  * @author Johnny Utah <pcpa@cyberpunk.su>
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Pavel <ivanovtsk@mail.ru>
+ * @author Artur <ncuxxx@gmail.com>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index e8c1151d5..a5fc47f5f 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -327,3 +327,7 @@ $lang['media_perm_read']       = 'Prepáčte, ale nemáte dostatočné oprávnen
 $lang['media_perm_upload']     = 'Prepáčte, ale nemáte dostatočné oprávnenie na nahrávanie súborov.';
 $lang['media_update']          = 'Nahrať novú verziu';
 $lang['media_restore']         = 'Obnoviť túto verziu';
+$lang['currentns']             = 'Aktuálny menný priestor';
+$lang['searchresult']          = 'Výsledky hľadania';
+$lang['plainhtml']             = 'Jednoduché HTML';
+$lang['wikimarkup']            = 'Wiki formát';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 176121881..456377810 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -8,11 +8,11 @@
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
- * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
  * @author syaoranhinata@gmail.com
  * @author Ichirou Uchiki <syaoranhinata@gmail.com>
  * @author tsangho <ou4222@gmail.com>
+ * @author Danny Lin <danny0838@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -81,15 +81,17 @@ $lang['regbadmail']            = '您輸入的電郵地址似乎不正確。若�
 $lang['regbadpass']            = '兩次輸入的密碼不一致，請再試一次。';
 $lang['regpwmail']             = '您的 DokuWiki 帳號密碼';
 $lang['reghere']               = '您還沒有帳號嗎？註冊一個吧。';
-$lang['profna']                = '在本 wiki 上，不能修改個人資料。';
+$lang['profna']                = '本 wiki 不支援修改個人資料。';
 $lang['profnochange']          = '並未作任何變更。';
 $lang['profnoempty']           = '帳號或電郵地址不可空白！';
 $lang['profchanged']           = '個人資料已更新。';
-$lang['profnodelete']          = '這一wiki不支援刪除用戶';
+$lang['profnodelete']          = '本 wiki 不支援刪除使用者';
 $lang['profdeleteuser']        = '刪除帳號';
-$lang['profdeleted']           = '您在這wiki中的用戶帳號已經被刪除';
+$lang['profdeleted']           = '您的使用者帳號已從本 wiki 刪除';
+$lang['profconfdelete']        = '我想把帳號從本 wiki 刪除（不能復原）';
+$lang['profconfdeletemissing'] = '未勾選確認方塊';
 $lang['pwdforget']             = '忘記密碼了？索取新密碼！';
-$lang['resendna']              = '本 wiki 並不支援重寄密碼。';
+$lang['resendna']              = '本 wiki 不支援重寄密碼。';
 $lang['resendpwd']             = '設定新密碼供';
 $lang['resendpwdmissing']      = '抱歉，您必須填寫所有欄位。';
 $lang['resendpwdnouser']       = '抱歉，資料庫內找不到這個使用者。';
@@ -97,7 +99,7 @@ $lang['resendpwdbadauth']      = '抱歉，認證碼無效。請確認您使用�
 $lang['resendpwdconfirm']      = '確認連結已通過郵件發送給您了。';
 $lang['resendpwdsuccess']      = '您的新密碼已寄出。';
 $lang['license']               = '若無特別註明，本 wiki 上的內容都是採用以下授權方式：';
-$lang['licenseok']             = '注意：編輯此頁面表示您已同意以下的授權方式：';
+$lang['licenseok']             = '注意：編輯此頁面表示您同意用以下授權方式發布您撰寫的內容：';
 $lang['searchmedia']           = '搜尋檔名：';
 $lang['searchmedia_in']        = '在 %s 裏搜尋';
 $lang['txt_upload']            = '請選擇要上傳的檔案';
@@ -232,7 +234,7 @@ $lang['qb_extlink']            = '外部連結';
 $lang['qb_hr']                 = '水平線';
 $lang['qb_ol']                 = '有序列表項目';
 $lang['qb_ul']                 = '無序列表項目';
-$lang['qb_media']              = '加入圖片或檔案';
+$lang['qb_media']              = '加入圖片或檔案 (開新視窗)';
 $lang['qb_sig']                = '插入簽名';
 $lang['qb_smileys']            = '表情符號';
 $lang['qb_chars']              = '特殊字元';
@@ -271,6 +273,8 @@ $lang['subscr_m_receive']      = '接收';
 $lang['subscr_style_every']    = '每次更改都發送信件';
 $lang['subscr_style_digest']   = '對每個頁面發送更改的摘要信件 (每 %.2f 天)';
 $lang['subscr_style_list']     = '自上次發信以來更改的頁面的列表 (每 %.2f 天)';
+
+/* auth.class language support */
 $lang['authtempfail']          = '暫不提供帳號認證。若本狀況持續，請通知本 wiki 管理員。';
 $lang['authpwdexpire']         = '您的密碼將在 %d 天內到期，請馬上更換新密碼。';
 $lang['i_chooselang']          = '選擇您的語系';
@@ -332,3 +336,8 @@ $lang['media_perm_read']       = '抱歉，您沒有足夠權限讀取檔案。'
 $lang['media_perm_upload']     = '抱歉，您沒有足夠權限上傳檔案。';
 $lang['media_update']          = '上傳新的版本';
 $lang['media_restore']         = '還原這個版本';
+
+$lang['currentns']             = '目前的命名空間';
+$lang['searchresult']          = '搜尋結果';
+$lang['plainhtml']             = '純 HTML';
+$lang['wikimarkup']            = 'Wiki 語法標記';