summaryrefslogtreecommitdiff
path: root/inc/lang
diff options
context:
space:
mode:
Diffstat (limited to 'inc/lang')
-rw-r--r--inc/lang/ar/lang.php1
-rw-r--r--inc/lang/bg/lang.php2
-rw-r--r--inc/lang/cs/lang.php5
-rw-r--r--inc/lang/cs/mailwrap.html13
-rw-r--r--inc/lang/cs/resetpwd.txt3
-rw-r--r--inc/lang/da/lang.php1
-rw-r--r--inc/lang/de-informal/lang.php1
-rw-r--r--inc/lang/de/lang.php1
-rw-r--r--inc/lang/el/lang.php1
-rw-r--r--inc/lang/en/lang.php2
-rw-r--r--inc/lang/en/preview.txt2
-rw-r--r--inc/lang/eo/lang.php3
-rw-r--r--inc/lang/eo/mailwrap.html13
-rw-r--r--inc/lang/eo/resetpwd.txt4
-rw-r--r--inc/lang/es/lang.php15
-rw-r--r--inc/lang/es/mailwrap.html13
-rw-r--r--inc/lang/es/resetpwd.txt3
-rw-r--r--inc/lang/es/subscr_single.txt4
-rw-r--r--inc/lang/eu/lang.php46
-rw-r--r--inc/lang/eu/mailwrap.html13
-rw-r--r--inc/lang/eu/resetpwd.txt3
-rw-r--r--inc/lang/fa/lang.php3
-rw-r--r--inc/lang/fi/lang.php11
-rw-r--r--inc/lang/fi/mailwrap.html13
-rw-r--r--inc/lang/fi/resetpwd.txt3
-rw-r--r--inc/lang/fr/lang.php3
-rw-r--r--inc/lang/fr/mailtext.txt1
-rw-r--r--inc/lang/fr/mailwrap.html13
-rw-r--r--inc/lang/gl/lang.php1
-rw-r--r--inc/lang/it/lang.php9
-rw-r--r--inc/lang/ja/lang.php1
-rw-r--r--inc/lang/kk/lang.php18
-rw-r--r--inc/lang/ko/install.html6
-rw-r--r--inc/lang/ko/lang.php20
-rw-r--r--inc/lang/ko/mailtext.txt2
-rw-r--r--inc/lang/ko/preview.txt2
-rw-r--r--inc/lang/ko/showrev.txt2
-rw-r--r--inc/lang/ko/updateprofile.txt2
-rw-r--r--inc/lang/lv/lang.php12
-rw-r--r--inc/lang/lv/mailwrap.html13
-rw-r--r--inc/lang/lv/resetpwd.txt3
-rw-r--r--inc/lang/nl/index.txt2
-rw-r--r--inc/lang/nl/install.html8
-rw-r--r--inc/lang/nl/lang.php7
-rw-r--r--inc/lang/nl/register.txt2
-rw-r--r--inc/lang/nl/resetpwd.txt3
-rw-r--r--inc/lang/nl/subscr_digest.txt2
-rw-r--r--inc/lang/nl/subscr_single.txt5
-rw-r--r--inc/lang/nl/uploadmail.txt1
-rw-r--r--inc/lang/no/lang.php1
-rw-r--r--inc/lang/pl/lang.php1
-rw-r--r--inc/lang/pt-br/lang.php59
-rw-r--r--inc/lang/pt-br/mailwrap.html13
-rw-r--r--inc/lang/pt-br/resetpwd.txt3
-rw-r--r--inc/lang/pt/lang.php1
-rw-r--r--inc/lang/ro/lang.php1
-rw-r--r--inc/lang/ru/lang.php2
-rw-r--r--inc/lang/sk/lang.php13
-rw-r--r--inc/lang/sk/mailwrap.html13
-rw-r--r--inc/lang/sk/resetpwd.txt3
-rw-r--r--inc/lang/sl/lang.php1
-rw-r--r--inc/lang/vi/lang.php2
-rw-r--r--inc/lang/zh-tw/admin.txt3
-rw-r--r--inc/lang/zh-tw/diff.txt3
-rw-r--r--inc/lang/zh-tw/index.txt2
-rw-r--r--inc/lang/zh-tw/install.html6
-rw-r--r--inc/lang/zh-tw/lang.php72
-rw-r--r--inc/lang/zh-tw/mailwrap.html13
-rw-r--r--inc/lang/zh-tw/resetpwd.txt3
-rw-r--r--inc/lang/zh-tw/subscr_digest.txt4
-rw-r--r--inc/lang/zh-tw/subscr_form.txt2
-rw-r--r--inc/lang/zh-tw/subscr_list.txt6
-rw-r--r--inc/lang/zh-tw/subscr_single.txt4
-rw-r--r--inc/lang/zh/lang.php4
74 files changed, 436 insertions, 116 deletions
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 350e26695..8f34936f3 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -324,4 +324,3 @@ $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/bg/lang.php b/inc/lang/bg/lang.php
index 562dc78b3..3c6c17211 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -344,6 +344,4 @@ $lang['media_perm_upload'] = 'За съжаление нямате дост
$lang['media_update'] = 'Качване на нова версия';
$lang['media_restore'] = 'Възстановяване на тази версия';
-$lang['plugin_install_err'] = 'Неправилно инсталирана приставка. Моля, преименувайте директорията \'%s\' на \'%s\'.';
-
//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 608beafd8..a53da327a 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -47,6 +47,7 @@ $lang['btn_backtomedia'] = 'Zpět do Výběru dokumentu';
$lang['btn_subscribe'] = 'Odebírat emailem změny stránky';
$lang['btn_profile'] = 'Upravit profil';
$lang['btn_reset'] = 'Reset';
+$lang['btn_resendpwd'] = 'Nastavit nové heslo';
$lang['btn_draft'] = 'Upravit koncept';
$lang['btn_recover'] = 'Obnovit koncept';
$lang['btn_draftdel'] = 'Vymazat koncept';
@@ -83,6 +84,7 @@ $lang['profnoempty'] = 'Nelze zadat prázdné jméno nebo mailová adr
$lang['profchanged'] = 'Uživatelský profil změněn.';
$lang['pwdforget'] = 'Zapomněli jste heslo? Nechte si zaslat nové';
$lang['resendna'] = 'Tato wiki neumožňuje zasílání nových hesel.';
+$lang['resendpwd'] = 'Nastavit nové heslo pro';
$lang['resendpwdmissing'] = 'Musíte vyplnit všechny položky.';
$lang['resendpwdnouser'] = 'Bohužel takový uživatel v systému není.';
$lang['resendpwdbadauth'] = 'Autorizační kód není platný. Zadali jste opravdu celý odkaz na potvrzovací stránku?';
@@ -95,6 +97,7 @@ $lang['searchmedia_in'] = 'Hledat v %s';
$lang['txt_upload'] = 'Vyberte soubor jako přílohu';
$lang['txt_filename'] = 'Wiki jméno (volitelné)';
$lang['txt_overwrt'] = 'Přepsat existující soubor';
+$lang['maxuploadsize'] = 'Max. velikost souboru %s';
$lang['lockedby'] = 'Právě zamknuto:';
$lang['lockexpire'] = 'Zámek vyprší:';
$lang['js']['willexpire'] = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
@@ -264,6 +267,7 @@ $lang['subscr_style_digest'] = 'souhrnný email změn pro každou stránku (ka
$lang['subscr_style_list'] = 'seznam změněných stránek od posledního emailu (každé %.2f dny/dní)';
$lang['authmodfailed'] = 'Autentizace uživatelů je špatně nastavena. Informujte prosím správce této wiki.';
$lang['authtempfail'] = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.';
+$lang['authpwdexpire'] = 'Platnost vašeho hesla vyprší za %d dní, měli byste ho změnit co nejdříve.';
$lang['i_chooselang'] = 'Vyberte si jazyk';
$lang['i_installer'] = 'Instalace DokuWiki';
$lang['i_wikiname'] = 'Název wiki';
@@ -318,4 +322,3 @@ $lang['media_perm_read'] = 'Bohužel, nemáte práva číst soubory.';
$lang['media_perm_upload'] = 'Bohužel, nemáte práva nahrávat soubory.';
$lang['media_update'] = 'Nahrát novou verzi';
$lang['media_restore'] = 'Obnovit tuto verzi';
-$lang['plugin_install_err'] = 'Plugin je špatně nainstalován. Přejmenujte adresář pluginu \'%s\' na \'%s\'.';
diff --git a/inc/lang/cs/mailwrap.html b/inc/lang/cs/mailwrap.html
new file mode 100644
index 000000000..dacd38d57
--- /dev/null
+++ b/inc/lang/cs/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+ <head>
+ <title>@TITLE@</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ </head>
+ <body>
+
+ @HTMLBODY@
+
+ <br /><hr />
+ <small>Tento mail byl vygenerován systémem DokuWiki na adrese @DOKUWIKIURL@.</small>
+ </body>
+ </html> \ No newline at end of file
diff --git a/inc/lang/cs/resetpwd.txt b/inc/lang/cs/resetpwd.txt
new file mode 100644
index 000000000..9aa449cb6
--- /dev/null
+++ b/inc/lang/cs/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Nastavení nového hesla ======
+
+Zadejte prosím nové heslo pro váš účet. \ No newline at end of file
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 97f2138b4..ee8de1bb8 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -325,4 +325,3 @@ $lang['media_perm_read'] = 'Du har ikke nok rettigheder til at læse filer
$lang['media_perm_upload'] = 'Du har ikke nok rettigheder til at uploade filer.';
$lang['media_update'] = 'Upload ny version';
$lang['media_restore'] = 'Genskab denne version';
-$lang['plugin_install_err'] = 'Plugin installeret forkert. Omdøb plugin folder \'%s\' til \'%s\'.';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 37469522f..0558a2a56 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -327,4 +327,3 @@ $lang['media_perm_read'] = 'Du besitzt nicht die notwendigen Berechtigunge
$lang['media_perm_upload'] = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
$lang['media_update'] = 'Neue Version hochladen';
$lang['media_restore'] = 'Diese Version wiederherstellen';
-$lang['plugin_install_err'] = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 4ea75157b..410022a3d 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -329,4 +329,3 @@ $lang['media_perm_read'] = 'Sie besitzen nicht die notwendigen Berechtigun
$lang['media_perm_upload'] = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
$lang['media_update'] = 'Neue Version hochladen';
$lang['media_restore'] = 'Diese Version wiederherstellen';
-$lang['plugin_install_err'] = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 95f1a1ea5..443a5061d 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -306,4 +306,3 @@ $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/en/lang.php b/inc/lang/en/lang.php
index 3c51ba224..0e5a9ac3c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -347,6 +347,4 @@ $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['plugin_install_err'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
-
//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/en/preview.txt b/inc/lang/en/preview.txt
index 16c96c5d7..5ca69694d 100644
--- a/inc/lang/en/preview.txt
+++ b/inc/lang/en/preview.txt
@@ -1,4 +1,4 @@
====== Preview ======
-This is a preview of how your text will look like. Remember: It is **not saved** yet!
+This is a preview of what your text will look like. Remember: It is **not saved** yet!
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index b2c64b2a6..5a0b0245f 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -95,6 +95,7 @@ $lang['searchmedia_in'] = 'Serĉi en %s';
$lang['txt_upload'] = 'Elektu dosieron por alŝuti';
$lang['txt_filename'] = 'Alŝuti kiel (laŭvole)';
$lang['txt_overwrt'] = 'Anstataŭigi ekzistantan dosieron';
+$lang['maxuploadsize'] = 'Alŝuto maks. %s po dosiero.';
$lang['lockedby'] = 'Nune ŝlosita de';
$lang['lockexpire'] = 'Ŝlosado ĉesos en';
$lang['js']['willexpire'] = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempokontrolon de la ŝlosado, premu la butonon "Antaŭrigardi".';
@@ -193,6 +194,7 @@ $lang['user_tools'] = 'Uzantaj iloj';
$lang['site_tools'] = 'Retejaj iloj';
$lang['page_tools'] = 'Paĝaj iloj';
$lang['skip_to_content'] = 'al la enhavo';
+$lang['sidebar'] = 'Flanka strio';
$lang['mail_newpage'] = 'paĝo aldonita:';
$lang['mail_changed'] = 'paĝo modifita:';
$lang['mail_subscribe_list'] = 'ŝanĝitaj paĝoj en nomspaco:';
@@ -263,6 +265,7 @@ $lang['subscr_style_digest'] = 'resuma retpoŝtaĵo de ŝanĝoj por ĉiu paĝo
$lang['subscr_style_list'] = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo (je %.2f tagoj)';
$lang['authmodfailed'] = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.';
$lang['authtempfail'] = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
+$lang['authpwdexpire'] = 'Via pasvorto malvalidos post %d tagoj, prefere ŝanĝu ĝin baldaũ.';
$lang['i_chooselang'] = 'Elektu vian lingvon';
$lang['i_installer'] = 'Instalilo de DokuWiki';
$lang['i_wikiname'] = 'Nomo de la vikio';
diff --git a/inc/lang/eo/mailwrap.html b/inc/lang/eo/mailwrap.html
new file mode 100644
index 000000000..9e92a00f7
--- /dev/null
+++ b/inc/lang/eo/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Tiu retpoŝtaĵo venas de DokuWiki ĉe @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/eo/resetpwd.txt b/inc/lang/eo/resetpwd.txt
new file mode 100644
index 000000000..442a7ac4e
--- /dev/null
+++ b/inc/lang/eo/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Difini novan pasvorton ======
+
+
+Bonvolu indiki novan pasvorton por via konto en tiu ĉi vikio. \ No newline at end of file
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index ee3da258b..4c15877e3 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -26,6 +26,8 @@
* @author emezeta <emezeta@infoprimo.com>
* @author Oscar Ciudad <oscar@jacho.net>
* @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -56,11 +58,12 @@ $lang['btn_admin'] = 'Administrar';
$lang['btn_update'] = 'Actualizar';
$lang['btn_delete'] = 'Borrar';
$lang['btn_back'] = 'Atrás';
-$lang['btn_backlink'] = 'Enlaces anteriores';
+$lang['btn_backlink'] = 'Enlaces a esta página';
$lang['btn_backtomedia'] = 'Volver a la selección de archivos multimedia';
$lang['btn_subscribe'] = 'Suscribirse a cambios de la página';
$lang['btn_profile'] = 'Actualizar perfil';
$lang['btn_reset'] = 'Restablecer';
+$lang['btn_resendpwd'] = 'Establecer nueva contraseña';
$lang['btn_draft'] = 'Editar borrador';
$lang['btn_recover'] = 'Recuperar borrador';
$lang['btn_draftdel'] = 'Eliminar borrador';
@@ -97,6 +100,7 @@ $lang['profnoempty'] = 'No se permite que el nombre o la dirección de
$lang['profchanged'] = 'Se actualizó correctamente el perfil del usuario.';
$lang['pwdforget'] = '¿Has olvidado tu contraseña? Consigue una nueva';
$lang['resendna'] = 'Este wiki no brinda la posibilidad de reenvío de contraseña.';
+$lang['resendpwd'] = 'Establecer nueva contraseña para';
$lang['resendpwdmissing'] = 'Lo siento, debes completar todos los campos.';
$lang['resendpwdnouser'] = 'Lo siento, no se encuentra este usuario en nuestra base de datos.';
$lang['resendpwdbadauth'] = 'Lo siento, este código de autenticación no es válido. Asegúrate de haber usado el enlace de confirmación entero.';
@@ -109,6 +113,7 @@ $lang['searchmedia_in'] = 'Buscar en %s';
$lang['txt_upload'] = 'Selecciona el archivo a subir';
$lang['txt_filename'] = 'Subir como (opcional)';
$lang['txt_overwrt'] = 'Sobreescribir archivo existente';
+$lang['maxuploadsize'] = 'Peso máximo de %s por archivo';
$lang['lockedby'] = 'Actualmente bloqueado por';
$lang['lockexpire'] = 'El bloqueo expira en';
$lang['js']['willexpire'] = 'El bloqueo para la edición de esta página expira en un minuto.\nPAra prevenir conflictos uso el botón Previsualizar para restaurar el contador de bloqueo.';
@@ -203,6 +208,12 @@ $lang['external_edit'] = 'editor externo';
$lang['summary'] = 'Resumen de la edición';
$lang['noflash'] = 'Para mostrar este contenido es necesario el <a href="http://www.adobe.com/products/flashplayer/">Plugin Adobe Flash</a>.';
$lang['download'] = 'Descargar trozo de código fuente';
+$lang['tools'] = 'Herramientas';
+$lang['user_tools'] = 'Herramientas de usuario';
+$lang['site_tools'] = 'Herramientas del sitio';
+$lang['page_tools'] = 'Herramientas de la página';
+$lang['skip_to_content'] = 'Saltar a contenido';
+$lang['sidebar'] = 'Barra lateral';
$lang['mail_newpage'] = 'página añadida:';
$lang['mail_changed'] = 'página cambiada:';
$lang['mail_subscribe_list'] = 'páginas cambiadas en el espacio de nombre:';
@@ -273,6 +284,7 @@ $lang['subscr_style_digest'] = 'recopilar correo de cambios por cada página';
$lang['subscr_style_list'] = 'lista de páginas con cambios desde el último correo';
$lang['authmodfailed'] = 'Está mal configurada la autenticación de usuarios. Por favor, avisa al administrador del wiki.';
$lang['authtempfail'] = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor avisa al administrador del wiki.';
+$lang['authpwdexpire'] = 'Su contraseña caducara en %d días, debería cambiarla lo antes posible';
$lang['i_chooselang'] = 'Elija su idioma';
$lang['i_installer'] = 'Instalador de DokuWiki';
$lang['i_wikiname'] = 'Nombre del wiki';
@@ -327,4 +339,3 @@ $lang['media_perm_read'] = 'Disculpa, no tienes los permisos necesarios pa
$lang['media_perm_upload'] = 'Disculpa, no tienes los permisos necesarios para cargar ficheros.';
$lang['media_update'] = 'Actualizar nueva versión';
$lang['media_restore'] = 'Restaurar esta versión';
-$lang['plugin_install_err'] = 'Plugin instalado incorrectamente. Renombra el directorio de plugins \'%s\' to \'%s\'.';
diff --git a/inc/lang/es/mailwrap.html b/inc/lang/es/mailwrap.html
new file mode 100644
index 000000000..3cf255f79
--- /dev/null
+++ b/inc/lang/es/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Este correo ha sido generado por DokuWiki desde @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/es/resetpwd.txt b/inc/lang/es/resetpwd.txt
new file mode 100644
index 000000000..6fade9598
--- /dev/null
+++ b/inc/lang/es/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Establecer nueva contraseña ======
+
+Favor de introducir una nueva contraseña para su cuenta en este wiki \ No newline at end of file
diff --git a/inc/lang/es/subscr_single.txt b/inc/lang/es/subscr_single.txt
index e2a54c79f..abddeeb21 100644
--- a/inc/lang/es/subscr_single.txt
+++ b/inc/lang/es/subscr_single.txt
@@ -1,7 +1,7 @@
Hola!
La página @PAGE@ en @TITLE@ wiki ha cambiado.
-Estos son los cambioss:
+Estos son los cambios:
--------------------------------------------------------
@DIFF@
@@ -9,7 +9,7 @@ Estos son los cambioss:
Fecha : @DATE@
Usuario : @USER@
-Resúmen de edición: @SUMMARY@
+Resumen de edición: @SUMMARY@
Revisión Anterior: @OLDPAGE@
Nueva Revisión: @NEWPAGE@
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index f7a517fe4..59d9d86fb 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -5,6 +5,7 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Xabi Ezpeleta <xezpeleta@mendikute.com>
* @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -40,11 +41,14 @@ $lang['btn_backtomedia'] = 'Atzera Multimedia Fitxategiaren Aukeraketara';
$lang['btn_subscribe'] = 'Harpidetu Orri Aldaketetara';
$lang['btn_profile'] = 'Eguneratu Profila ';
$lang['btn_reset'] = 'Aldaketak Desegin';
+$lang['btn_resendpwd'] = 'Pasahitza berria ezarri';
$lang['btn_draft'] = 'Editatu zirriborroa';
$lang['btn_recover'] = 'Berreskuratu zirriborroa';
$lang['btn_draftdel'] = 'Ezabatu zirriborroa';
$lang['btn_revert'] = 'Berrezarri';
$lang['btn_register'] = 'Erregistratu';
+$lang['btn_apply'] = 'Baieztatu';
+$lang['btn_media'] = 'Media Kudeatzailea';
$lang['loggedinas'] = 'Erabiltzailea';
$lang['user'] = 'Erabiltzailea';
$lang['pass'] = 'Pasahitza';
@@ -74,6 +78,7 @@ $lang['profnoempty'] = 'Izen edota e-posta hutsa ez dago onartua.';
$lang['profchanged'] = 'Erabiltzaile profila arrakastaz eguneratua.';
$lang['pwdforget'] = 'Pasahitza ahaztu duzu? Eskuratu berri bat';
$lang['resendna'] = 'Wiki honek ez du pasahitz berbidalketa onartzen.';
+$lang['resendpwd'] = '-entzat pasahitza berria ezarri';
$lang['resendpwdmissing'] = 'Barkatu, eremu guztiak bete behar dituzu.';
$lang['resendpwdnouser'] = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen';
$lang['resendpwdbadauth'] = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.';
@@ -88,7 +93,7 @@ $lang['txt_filename'] = 'Idatzi wikiname-a (aukerazkoa)';
$lang['txt_overwrt'] = 'Oraingo fitxategiaren gainean idatzi';
$lang['lockedby'] = 'Momentu honetan blokeatzen:';
$lang['lockexpire'] = 'Blokeaketa iraungitzen da:';
-$lang['js']['willexpire'] = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
+$lang['js']['willexpire'] = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
$lang['js']['notsavedyet'] = 'Gorde gabeko aldaketak galdu egingo dira.
Benetan jarraitu nahi duzu?';
$lang['js']['searchmedia'] = 'Bilatu fitxategiak';
@@ -120,6 +125,15 @@ Esteka kopiatu eta itsatsi dezakezu dena den.';
$lang['js']['linkwiz'] = 'Estekatze Laguntzailea';
$lang['js']['linkto'] = 'Estekatu hona:';
$lang['js']['del_confirm'] = 'Benetan ezabatu aukeratutako fitxategia(k)?';
+$lang['js']['restore_confirm'] = 'Benetan bertsio hau berrezarri?';
+$lang['js']['media_diff'] = 'Diferentziak ikusi:';
+$lang['js']['media_diff_both'] = 'Ondoz ondo';
+$lang['js']['media_select'] = 'Fitxategiak hautatu';
+$lang['js']['media_upload_btn'] = 'Igo';
+$lang['js']['media_done_btn'] = 'Egina';
+$lang['js']['media_drop'] = 'Fitxategiak igotzeko hona bota';
+$lang['js']['media_cancel'] = 'ezabatu';
+$lang['js']['media_overwrt'] = 'Dauden fitxategiak berridatzi';
$lang['rssfailed'] = 'Errorea gertatu da feed hau irakurtzean:';
$lang['nothingfound'] = 'Ez da ezer aurkitu.';
$lang['mediaselect'] = 'Aukeratu Multimedia fitxategia';
@@ -169,11 +183,21 @@ $lang['external_edit'] = 'kanpoko aldaketa';
$lang['summary'] = 'Aldatu laburpena';
$lang['noflash'] = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> beharrezkoa da eduki hau bistaratzeko.';
$lang['download'] = 'Deskarga Snippet-a';
+$lang['tools'] = 'Tresnak';
+$lang['user_tools'] = 'Erabiltzaile Tresnak';
+$lang['site_tools'] = 'Gune Tresnak';
+$lang['page_tools'] = 'Orri Tresnak';
+$lang['skip_to_content'] = 'edukira sahiestu';
+$lang['sidebar'] = 'Alboko-barra';
$lang['mail_newpage'] = '[DokuWiki] gehitutako orria:';
$lang['mail_changed'] = '[DokuWiki] aldatutako orria:';
$lang['mail_subscribe_list'] = 'izen-espazioan aldatutako orriak:';
$lang['mail_new_user'] = 'erabiltzaile berria:';
$lang['mail_upload'] = 'fitxategia igota:';
+$lang['changes_type'] = '-ren aldaketak ikusi';
+$lang['pages_changes'] = 'Orriak';
+$lang['media_changes'] = 'Media fitxategiak';
+$lang['both_changes'] = 'Bai orriak nahiz media fitxategiak';
$lang['qb_bold'] = 'Letra beltzez';
$lang['qb_italic'] = 'Letra italiarrez';
$lang['qb_underl'] = 'Azpimarratua';
@@ -214,6 +238,9 @@ $lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Formatua';
$lang['img_camera'] = 'Kamera';
$lang['img_keywords'] = 'Hitz-gakoak';
+$lang['img_width'] = 'Zabalera';
+$lang['img_height'] = 'Altuera';
+$lang['img_manager'] = 'Media kudeatzailean ikusi';
$lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara';
$lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara';
$lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.';
@@ -232,6 +259,7 @@ $lang['subscr_style_digest'] = 'e-posta laburbildua orri bakoitzeko aldaketent
$lang['subscr_style_list'] = 'aldatutako orrien zerrenda azken e-postatik (%.2f egunero)';
$lang['authmodfailed'] = 'Erabiltzaile kautotzearen konfigurazioa okerra da. Mesedez, eman honen berri Wiki administratzaileari';
$lang['authtempfail'] = 'Erabiltzaile kautotzea denboraldi batez ez dago erabilgarri. Egoerak hala jarraitzen badu, mesedez, eman honen berri Wiki administratzaileari';
+$lang['authpwdexpire'] = 'Zure pasahitza %d egun barru iraungiko da, laster aldatu beharko zenuke.';
$lang['i_chooselang'] = 'Hautatu zure hizkuntza';
$lang['i_installer'] = 'DokuWiki instalatzailea';
$lang['i_wikiname'] = 'Wiki Izena';
@@ -263,3 +291,19 @@ $lang['hours'] = 'duela %d ordu';
$lang['minutes'] = 'duela %d minutu';
$lang['seconds'] = 'duela %d segundu';
$lang['wordblock'] = 'Zure aldaketa ez da aldatua izan blokeatutako testua (spam) daukalako.';
+$lang['media_uploadtab'] = 'Igo';
+$lang['media_searchtab'] = 'Bilatu';
+$lang['media_file'] = 'Fitxategia';
+$lang['media_viewtab'] = 'Begiratu';
+$lang['media_edittab'] = 'Editatu';
+$lang['media_historytab'] = 'Historia';
+$lang['media_sort_name'] = 'Izena';
+$lang['media_sort_date'] = 'Data';
+$lang['media_files'] = '%s -n fitxategiak';
+$lang['media_upload'] = 'Igo %s -ra';
+$lang['media_search'] = 'Bilatu %s -n';
+$lang['media_view'] = '%s';
+$lang['media_viewold'] = '%s -n %s';
+$lang['media_edit'] = '%s editatu';
+$lang['media_update'] = 'Bertsio berria igo';
+$lang['media_restore'] = 'Bertsio hau berrezarri';
diff --git a/inc/lang/eu/mailwrap.html b/inc/lang/eu/mailwrap.html
new file mode 100644
index 000000000..0cf92c28b
--- /dev/null
+++ b/inc/lang/eu/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Mezu elektroniko hau DokuWiki-k sortua da @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/eu/resetpwd.txt b/inc/lang/eu/resetpwd.txt
new file mode 100644
index 000000000..9bb6e3ae8
--- /dev/null
+++ b/inc/lang/eu/resetpwd.txt
@@ -0,0 +1,3 @@
+ ====== Pasahitza berria ezarri ======
+
+Mesedez wiki honetako zure pasahitza berria sartu. \ No newline at end of file
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 1b8586d5a..fdcdeb1bc 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -13,6 +13,7 @@
* @author Omid Mottaghi <omidmr@gmail.com>
* @author Mohammad Reza Shoaei <shoaei@gmail.com>
* @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'rtl';
@@ -198,6 +199,7 @@ $lang['user_tools'] = 'ابزار کاربر';
$lang['site_tools'] = 'ابزار سایت';
$lang['page_tools'] = 'ابزار صفحه';
$lang['skip_to_content'] = 'پرش به محتوا';
+$lang['sidebar'] = 'نوار کناری';
$lang['mail_newpage'] = 'صفحه اضافه شد:';
$lang['mail_changed'] = 'صفحه تغییر داده شد:';
$lang['mail_subscribe_list'] = 'صفحات تغییر داده شده در فضای‌نام';
@@ -323,4 +325,3 @@ $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/fi/lang.php b/inc/lang/fi/lang.php
index ce15f68d0..4f5f6f1a2 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -43,6 +43,7 @@ $lang['btn_backtomedia'] = 'Takaisin mediatiedostojen valintaan';
$lang['btn_subscribe'] = 'Tilaa muutokset';
$lang['btn_profile'] = 'Päivitä profiili';
$lang['btn_reset'] = 'Tyhjennä';
+$lang['btn_resendpwd'] = 'Aseta uusi salasana';
$lang['btn_draft'] = 'Muokkaa luonnosta';
$lang['btn_recover'] = 'Palauta luonnos';
$lang['btn_draftdel'] = 'Poista luonnos';
@@ -79,6 +80,7 @@ $lang['profnoempty'] = 'Tyhjä nimi tai sähköpostiosoite ei ole sall
$lang['profchanged'] = 'Käyttäjän profiilin päivitys onnistui.';
$lang['pwdforget'] = 'Unohtuiko salasana? Hanki uusi';
$lang['resendna'] = 'Tämä wiki ei tue salasanan uudelleenlähettämistä.';
+$lang['resendpwd'] = 'Aseta uusisalasana';
$lang['resendpwdmissing'] = 'Kaikki kentät on täytettävä.';
$lang['resendpwdnouser'] = 'Käyttäjää ei löydy tietokannastamme.';
$lang['resendpwdbadauth'] = 'Tunnistuskoodi on virheellinen. Varmista, että käytit koko varmistuslinkkiä.';
@@ -91,6 +93,7 @@ $lang['searchmedia_in'] = 'Etsi kohteesta %s';
$lang['txt_upload'] = 'Valitse tiedosto lähetettäväksi';
$lang['txt_filename'] = 'Lähetä nimellä (valinnainen)';
$lang['txt_overwrt'] = 'Ylikirjoita olemassa oleva';
+$lang['maxuploadsize'] = 'Palvelimelle siirto max. %s / tiedosto.';
$lang['lockedby'] = 'Tällä hetkellä tiedoston on lukinnut';
$lang['lockexpire'] = 'Lukitus päättyy';
$lang['js']['willexpire'] = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
@@ -185,6 +188,12 @@ $lang['external_edit'] = 'ulkoinen muokkaus';
$lang['summary'] = 'Yhteenveto muokkauksesta';
$lang['noflash'] = 'Tarvitset <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash-liitännäisen</a> nähdäksesi tämän sisällön.';
$lang['download'] = 'Lataa palanen';
+$lang['tools'] = 'Työkalut';
+$lang['user_tools'] = 'Käyttäjän työkalut';
+$lang['site_tools'] = 'Sivuston työkalut';
+$lang['page_tools'] = 'Sivutyökalut';
+$lang['skip_to_content'] = 'Siirry sisältöön';
+$lang['sidebar'] = 'Sivupalkki';
$lang['mail_newpage'] = 'sivu lisätty:';
$lang['mail_changed'] = 'sivu muutettu:';
$lang['mail_subscribe_list'] = 'muuttuneet sivut nimiavaruudessa:';
@@ -255,6 +264,7 @@ $lang['subscr_style_digest'] = 'yhteenveto-sähköposti joka sivusta (joka %.2
$lang['subscr_style_list'] = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen (joka %.2f. päivä)';
$lang['authmodfailed'] = 'Käyttäjien autentikoinnin asetukset ovat virheelliset. Ilmoita asiasta wikin ylläpitäjälle.';
$lang['authtempfail'] = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.';
+$lang['authpwdexpire'] = 'Salasanasi vanhenee %d pv:n päästä, vaihda salasanasi pikaisesti.';
$lang['i_chooselang'] = 'Valitse kieli';
$lang['i_installer'] = 'DokuWikin asentaja';
$lang['i_wikiname'] = 'Wikin nimi';
@@ -309,4 +319,3 @@ $lang['media_perm_read'] = 'Anteeksi. Sinulla ei ole riittävästi oikeuks
$lang['media_perm_upload'] = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.';
$lang['media_update'] = 'Lähetä uusi versio';
$lang['media_restore'] = 'Palauta tämä versio';
-$lang['plugin_install_err'] = 'Liitännäinen asentui virheellisesti. Nimeä liitännäisen hakemisto \'%s\' -> \'%s\'';
diff --git a/inc/lang/fi/mailwrap.html b/inc/lang/fi/mailwrap.html
new file mode 100644
index 000000000..6ff63c04e
--- /dev/null
+++ b/inc/lang/fi/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Tämä viesti on tehty DokuWiki:ssä @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/fi/resetpwd.txt b/inc/lang/fi/resetpwd.txt
new file mode 100644
index 000000000..c6780949a
--- /dev/null
+++ b/inc/lang/fi/resetpwd.txt
@@ -0,0 +1,3 @@
+===== Aseta salasana =====
+
+Anna uusi salasanasi tässä wikissä. \ No newline at end of file
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index a77be6965..c4080bc50 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -24,6 +24,7 @@
* @author schplurtz@laposte.net
* @author skimpax@gmail.com
* @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -109,6 +110,7 @@ $lang['searchmedia_in'] = 'Chercher dans %s';
$lang['txt_upload'] = 'Sélectionnez un fichier à envoyer ';
$lang['txt_filename'] = 'Donnez un « wikiname » (optionnel) ';
$lang['txt_overwrt'] = 'Écraser le fichier cible';
+$lang['maxuploadsize'] = 'Téléverser max. %s par fichier';
$lang['lockedby'] = 'Actuellement bloqué par';
$lang['lockexpire'] = 'Le blocage expire à';
$lang['js']['willexpire'] = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
@@ -331,4 +333,3 @@ $lang['media_perm_read'] = 'Désolé, vous n\'avez pas les droits pour lir
$lang['media_perm_upload'] = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
$lang['media_update'] = 'Télécharger une nouvelle version';
$lang['media_restore'] = 'Restaurer cette version';
-$lang['plugin_install_err'] = 'Extension mal installée. Renommez le dossier de l\'extension \'%s\' en \'%s\'.';
diff --git a/inc/lang/fr/mailtext.txt b/inc/lang/fr/mailtext.txt
index add3b2779..3c2d53292 100644
--- a/inc/lang/fr/mailtext.txt
+++ b/inc/lang/fr/mailtext.txt
@@ -7,7 +7,6 @@ Adresse IP : @IPADDRESS@
Nom d'hôte : @HOSTNAME@
Ancienne révision : @OLDPAGE@
Nouvelle révision : @NEWPAGE@
-Différences : @OLDPAGE@&do=diff
Résumé : @SUMMARY@
Utilisateur : @USER@
diff --git a/inc/lang/fr/mailwrap.html b/inc/lang/fr/mailwrap.html
new file mode 100644
index 000000000..2b674196b
--- /dev/null
+++ b/inc/lang/fr/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Ce courriel a été automatiquement généré par DokuWiki à l'adresse @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 9636d6c15..23bd9a741 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -310,4 +310,3 @@ $lang['media_perm_read'] = 'Sentímolo, non tes permisos suficientes para
$lang['media_perm_upload'] = 'Sentímolo, non tes permisos suficientes para subir arquivos.';
$lang['media_update'] = 'Subir nova versión';
$lang['media_restore'] = 'Restaurar esta versión';
-$lang['plugin_install_err'] = 'Extensión instalada correctamente. Re-nomea o directorio da extensión de \'%s\' a \'%s\'.';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 70082caae..a415f2a2c 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -14,6 +14,7 @@
* @author Osman Tekin <osman.tekin93@hotmail.it>
* @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
* @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -177,6 +178,7 @@ $lang['diff'] = 'differenze con la versione attuale';
$lang['diff2'] = 'differenze tra le versioni selezionate';
$lang['difflink'] = 'Link a questa pagina di confronto';
$lang['diff_type'] = 'Guarda le differenze:';
+$lang['diff_inline'] = 'In linea';
$lang['diff_side'] = 'Fianco a Fianco';
$lang['line'] = 'Linea';
$lang['breadcrumb'] = 'Traccia';
@@ -195,6 +197,7 @@ $lang['user_tools'] = 'Strumenti Utente';
$lang['site_tools'] = 'Strumenti Sito';
$lang['page_tools'] = 'Strumenti Pagina';
$lang['skip_to_content'] = 'salta al contenuto';
+$lang['sidebar'] = 'Barra laterale';
$lang['mail_newpage'] = 'pagina aggiunta:';
$lang['mail_changed'] = 'pagina modificata:';
$lang['mail_subscribe_list'] = 'pagine modificate nella categoria:';
@@ -298,20 +301,24 @@ $lang['hours'] = '%d ore fa';
$lang['minutes'] = '%d minuti fa';
$lang['seconds'] = '%d secondi fa';
$lang['wordblock'] = 'La modifica non è stata salvata perché contiene testo bloccato (spam).';
+$lang['media_uploadtab'] = 'Upload';
$lang['media_searchtab'] = 'Cerca';
+$lang['media_file'] = 'File';
$lang['media_viewtab'] = 'Guarda';
$lang['media_edittab'] = 'Modifica';
$lang['media_historytab'] = 'Storia';
+$lang['media_list_thumbs'] = 'Miniatura';
$lang['media_list_rows'] = 'Righe';
$lang['media_sort_name'] = 'Nome';
$lang['media_sort_date'] = 'Data';
$lang['media_namespaces'] = 'Scegli il namespace';
$lang['media_files'] = 'File in %s';
+$lang['media_upload'] = 'Upload al %s';
$lang['media_search'] = 'Cerca in %s';
+$lang['media_view'] = '%s';
$lang['media_edit'] = 'Modifica %s';
$lang['media_history'] = 'Storia di %s';
$lang['media_perm_read'] = 'Spiacente, non hai abbastanza privilegi per leggere i files.';
$lang['media_perm_upload'] = 'Spiacente, non hai abbastanza privilegi per caricare files.';
$lang['media_update'] = 'Carica nuova versione';
$lang['media_restore'] = 'Ripristina questa versione';
-$lang['plugin_install_err'] = 'Plugin installato non correttamente. Rinomino la cartella del plugin \'%s\' in \'%s\'.';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 490c84cc9..791ef9a6e 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -318,4 +318,3 @@ $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/kk/lang.php b/inc/lang/kk/lang.php
index 3ff5ae455..37b0f462b 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -38,11 +38,13 @@ $lang['btn_backtomedia'] = 'Медиафайлды таңдауға қай
$lang['btn_subscribe'] = 'Жазылуларды басқару';
$lang['btn_profile'] = 'Профильді жаңарту';
$lang['btn_reset'] = 'Түсіру';
+$lang['btn_resendpwd'] = 'Шартты белгінi Өзгерту';
$lang['btn_draft'] = 'Шимайды өңдеу';
$lang['btn_recover'] = 'Шимайды қайтару';
$lang['btn_draftdel'] = 'Шимайды өшіру';
$lang['btn_revert'] = 'Қалпына келтіру';
$lang['btn_register'] = 'Тіркеу';
+$lang['btn_apply'] = 'Қолдану/Енгізу';
$lang['loggedinas'] = 'түпнұсқамен кірген';
$lang['user'] = 'Түпнұсқа';
$lang['pass'] = 'Құпиясөз';
@@ -86,7 +88,7 @@ $lang['txt_filename'] = 'Келесідей еңгізу (қалауы
$lang['txt_overwrt'] = 'Бар файлды қайта жазу';
$lang['lockedby'] = 'Осы уақытта тойтарылған';
$lang['lockexpire'] = 'Тойтару келесі уақытта бітеді';
-$lang['js']['willexpire'] = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
+$lang['js']['willexpire'] = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
$lang['js']['notsavedyet'] = 'Сақталмаған өзгерістер жоғалатын болады.';
$lang['js']['searchmedia'] = 'Файлдарды іздеу';
$lang['js']['keepopen'] = 'Таңдаған соң терезе жаппаңыз';
@@ -112,3 +114,17 @@ $lang['js']['medialeft'] = 'Сүретті сол жаққа тегіст
$lang['js']['mediaright'] = 'Сүретті оң жаққа тегістеу';
$lang['js']['mediacenter'] = 'Сүретті ортаға тегістеу';
$lang['js']['medianoalign'] = 'Тегістеусіз';
+$lang['js']['linkwiz'] = 'Сілтеме көмекшіci';
+$lang['js']['media_diff'] = 'Өзгеліктердi Көрсету';
+$lang['js']['media_select'] = 'Файлды тандау';
+$lang['mediaselect'] = 'Медиа файлдар';
+$lang['mediaroot'] = 'root';
+$lang['yours'] = 'Сендердің болжамыңыз';
+$lang['created'] = 'ЖасалFан';
+$lang['mail_new_user'] = 'Жаңа пайдаланушы';
+$lang['qb_chars'] = 'Арнайы белгiлер';
+$lang['img_backto'] = 'Қайта оралу';
+$lang['img_format'] = 'Формат';
+$lang['img_camera'] = 'Камера';
+$lang['i_chooselang'] = 'Тіл таңдау';
+$lang['i_retry'] = 'Қайталау';
diff --git a/inc/lang/ko/install.html b/inc/lang/ko/install.html
index 382fb7df0..aeeac870f 100644
--- a/inc/lang/ko/install.html
+++ b/inc/lang/ko/install.html
@@ -1,12 +1,12 @@
<p>이 페이지는 <a href="http://dokuwiki.org">Dokuwiki</a> 설치와 환경 설정을 도와줍니다.
-설치 과정에 대한 더 자세한 정보는 <a href="http://dokuwiki.org/ko:install">(한국어) 설치 문서</a>와
+설치 과정에 대한 더 자세한 정보는 <a href="http://dokuwiki.org/ko:install">(한국어) 설치 문서</a>와
<a href="http://dokuwiki.org/install">(영어) 설치 문서</a>를 참고하기 바랍니다.</p>
<p>DokuWiki는 위키 문서와 문서와 관련된 정보(예를 들어 그림, 검색 색인, 이전 버전 문서)를 저장하기 위해 일반적인 텍스트 파일을 사용합니다. 정상적으로 DokuWiki를 사용하려면 이 파일을 담고 있는 디렉토리에 대한 쓰기 권한을 가지고 있어야 합니다.
현재 설치 과정 중에는 디렉토리 권한 설정이 불가능합니다. 보통 직접 쉘 명령어를 사용하거나, 호스팅을 사용한다면 FTP나 호스팅 제어판(예를 들어 CPanel)을 사용해서 설정해야 합니다.</p>
-<p>현재 설치 과정중에 관리자로 로그인 후 DokuWiki의 관리 메뉴(플러그인 설치, 사용자 관리, 위키 문서 접근 권한 관리, 옵션 설정)를 가능하게 <abbr title="접근 제어 목록">ACL</abbr>에 대한 환경 설정을 수행합니다.
-이 것은 DokuWiki가 동작하는데 필요한 사항은 아니지만, 어쨌든 더 쉽게 관리자가 관리할 수 있도록 해줍니다.</p>
+<p>현재 설치 과정중에 관리자로 로그인 후 DokuWiki의 관리 메뉴(플러그인 설치, 사용자 관리, 위키 문서 접근 권한 관리, 옵션 설정)를 가능하게 <acronym title="접근 제어 목록">ACL</acronym>에 대한 환경 설정을 수행합니다.
+DokuWiki가 동작하는데 필요한 사항은 아니지만, 어쨌든 더 쉽게 관리자가 관리할 수 있도록 해줍니다.</p>
<p>숙련된 사용자나 특별한 설치 과정이 필요한 경우에 다음 링크를 참고하기 바랍니다:
<a href="http://dokuwiki.org/ko:install">설치 과정 (한국어)</a>
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 7b4e30a49..89d045503 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -7,7 +7,7 @@
* @author jk Lee
* @author dongnak@gmail.com
* @author Song Younghwan <purluno@gmail.com>
- * @author Seung-Chul Yoo <dryoo@live.com>
+ * @author Seung-Chul Yoo <dryoo@live.com>
* @author erial2@gmail.com
* @author Myeongjin <aranet100@gmail.com>
*/
@@ -37,13 +37,13 @@ $lang['btn_secedit'] = '편집';
$lang['btn_login'] = '로그인';
$lang['btn_logout'] = '로그아웃';
$lang['btn_admin'] = '관리';
-$lang['btn_update'] = '변경';
+$lang['btn_update'] = '바꾸기';
$lang['btn_delete'] = '삭제';
$lang['btn_back'] = '뒤로';
$lang['btn_backlink'] = '가리키는 링크';
$lang['btn_backtomedia'] = '미디어 파일 선택으로 돌아가기';
$lang['btn_subscribe'] = '구독 관리';
-$lang['btn_profile'] = '개인 정보 변경';
+$lang['btn_profile'] = '개인 정보 바꾸기';
$lang['btn_reset'] = '초기화';
$lang['btn_resendpwd'] = '새 비밀번호 설정';
$lang['btn_draft'] = '문서 초안 편집';
@@ -53,7 +53,7 @@ $lang['btn_revert'] = '복원';
$lang['btn_register'] = '등록';
$lang['btn_apply'] = '적용';
$lang['btn_media'] = '미디어 관리';
-$lang['loggedinas'] = '다른 사용자로 로그인';
+$lang['loggedinas'] = '다음 사용자로 로그인';
$lang['user'] = '사용자 이름';
$lang['pass'] = '비밀번호';
$lang['newpass'] = '새 비밀번호';
@@ -66,7 +66,7 @@ $lang['profile'] = '개인 정보';
$lang['badlogin'] = '잘못된 사용자 이름이거나 비밀번호입니다.';
$lang['minoredit'] = '사소한 바뀜';
$lang['draftdate'] = '문서 초안 자동 저장 시간';
-$lang['nosecedit'] = '문서가 수정되어 세션 정보의 유효 시간이 지나 문서 전부를 다시 읽습니다.';
+$lang['nosecedit'] = '한동안 문서가 바뀌어 세션 정보의 유효 시간이 지나 문서 전부를 다시 읽습니다.';
$lang['regmissing'] = '모든 항목을 입력해야 합니다.';
$lang['reguexists'] = '같은 이름을 사용하는 사용자가 있습니다.';
$lang['regsuccess'] = '사용자를 만들었으며 비밀번호는 이메일로 보냈습니다.';
@@ -193,6 +193,7 @@ $lang['user_tools'] = '사용자 도구';
$lang['site_tools'] = '사이트 도구';
$lang['page_tools'] = '문서 도구';
$lang['skip_to_content'] = '콘텐츠 넘기기';
+$lang['sidebar'] = '사이드바';
$lang['mail_newpage'] = '문서 추가:';
$lang['mail_changed'] = '문서 바뀜:';
$lang['mail_subscribe_list'] = '이름공간에서 바뀐 문서:';
@@ -218,7 +219,7 @@ $lang['qb_hplus'] = '상위 문단 제목';
$lang['qb_hminus'] = '하위 문단 제목';
$lang['qb_hequal'] = '동급 문단 제목';
$lang['qb_link'] = '내부 링크';
-$lang['qb_extlink'] = '외부 링크';
+$lang['qb_extlink'] = '바깥 링크';
$lang['qb_hr'] = '가로줄';
$lang['qb_ol'] = '순서 있는 목록';
$lang['qb_ul'] = '순서 없는 목록';
@@ -295,7 +296,7 @@ $lang['days'] = '%d일 전';
$lang['hours'] = '%d시간 전';
$lang['minutes'] = '%d분 전';
$lang['seconds'] = '%d초 전';
-$lang['wordblock'] = '스팸 문구를 포함하고 있어서 저장되지 않았습니다.';
+$lang['wordblock'] = '스팸 문구를 포함하고 있어서 저장하지 않았습니다.';
$lang['media_uploadtab'] = '올리기';
$lang['media_searchtab'] = '찾기';
$lang['media_file'] = '파일';
@@ -312,11 +313,10 @@ $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_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/ko/mailtext.txt b/inc/lang/ko/mailtext.txt
index 219fe6e0b..01bada9ba 100644
--- a/inc/lang/ko/mailtext.txt
+++ b/inc/lang/ko/mailtext.txt
@@ -1,4 +1,4 @@
-DokuWiki 문서가 추가 또는 변경되었습니다. 자세한 정보는 다음과 같습니다:
+DokuWiki 문서가 추가 또는 바뀌었습니다. 자세한 정보는 다음과 같습니다:
날짜 : @DATE@
브라우저 : @BROWSER@
diff --git a/inc/lang/ko/preview.txt b/inc/lang/ko/preview.txt
index 6563874ee..1b7710e2f 100644
--- a/inc/lang/ko/preview.txt
+++ b/inc/lang/ko/preview.txt
@@ -1,3 +1,3 @@
====== 미리 보기 ======
-이것은 입력한 내용이 어떻게 보일지 미리 보여줍니다. 아직 **저장되지 않았다**는 점을 기억해두십시오! \ No newline at end of file
+입력한 내용이 어떻게 보일지 미리 보여줍니다. 아직 **저장되지 않았다**는 점을 기억해두십시오! \ No newline at end of file
diff --git a/inc/lang/ko/showrev.txt b/inc/lang/ko/showrev.txt
index 084d82737..f6930044b 100644
--- a/inc/lang/ko/showrev.txt
+++ b/inc/lang/ko/showrev.txt
@@ -1,2 +1,2 @@
-**이것은 문서의 이전 버전입니다!**
+**문서의 이전 버전입니다!**
----
diff --git a/inc/lang/ko/updateprofile.txt b/inc/lang/ko/updateprofile.txt
index ebf19d8ab..379981cb3 100644
--- a/inc/lang/ko/updateprofile.txt
+++ b/inc/lang/ko/updateprofile.txt
@@ -1,3 +1,3 @@
-====== 개인 정보 수정 ======
+====== 개인 정보 바꾸기 ======
바꾸고 싶은 항목을 입력하기 바랍니다. 사용자 이름은 바꿀 수 없습니다. \ No newline at end of file
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index b02e7f471..19a7b7cce 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -39,6 +39,7 @@ $lang['btn_backtomedia'] = 'Atpakaļ uz mēdiju failu izvēli';
$lang['btn_subscribe'] = 'Abonēt izmaiņu paziņojumus';
$lang['btn_profile'] = 'Labot savu profilu';
$lang['btn_reset'] = 'Atsaukt izmaiņas';
+$lang['btn_resendpwd'] = 'Uzstādīt jaunu paroli';
$lang['btn_draft'] = 'Labot melnrakstu';
$lang['btn_recover'] = 'Atjaunot melnrakstu';
$lang['btn_draftdel'] = 'Dzēst melnrakstu';
@@ -75,6 +76,7 @@ $lang['profnoempty'] = 'Bez vārda vai e-pasta adreses nevar.';
$lang['profchanged'] = 'Profils veiksmīgi izlabots.';
$lang['pwdforget'] = 'Aizmirsi paroli? Saņem jaunu';
$lang['resendna'] = 'Paroļu izsūtīšanu nepiedāvāju.';
+$lang['resendpwd'] = 'Uzstādīt jaunu paroli lietotājam';
$lang['resendpwdmissing'] = 'Atvaino, jāizpilda visas ailes.';
$lang['resendpwdnouser'] = 'Atvaino, tāda lietotāja nav.';
$lang['resendpwdbadauth'] = 'Atvaino, šis autorizācijas kods nav derīgs. Pārliecinies, ka lietoji pilnu apstiprināšanas adresi.';
@@ -87,6 +89,7 @@ $lang['searchmedia_in'] = 'Meklēt iekš %s';
$lang['txt_upload'] = 'Norādi augšupielādējamo failu';
$lang['txt_filename'] = 'Ievadi vikivārdu (nav obligāts)';
$lang['txt_overwrt'] = 'Aizstāt esošo failu';
+$lang['maxuploadsize'] = 'Augšuplādējamā faila ierobežojums: %s.';
$lang['lockedby'] = 'Patlaban bloķējis ';
$lang['lockexpire'] = 'Bloķējums beigsies ';
$lang['js']['willexpire'] = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
@@ -129,6 +132,7 @@ $lang['js']['media_select'] = 'Norādīt failus...';
$lang['js']['media_upload_btn'] = 'Augšuplādēt';
$lang['js']['media_done_btn'] = 'Gatavs';
$lang['js']['media_drop'] = 'Nomet te augšuplādējamos failus';
+$lang['js']['media_cancel'] = 'atlikt';
$lang['js']['media_overwrt'] = 'Rakstīt pāri esošajiem failiem';
$lang['rssfailed'] = 'Kļūda saņemot saturu no ';
$lang['nothingfound'] = 'Nekas nav atrasts.';
@@ -179,6 +183,12 @@ $lang['external_edit'] = 'ārpussistēmas labojums';
$lang['summary'] = 'Anotācija';
$lang['noflash'] = 'Lai attēlotu lapas saturu, vajag <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
$lang['download'] = 'Lejuplādēt «kodiņu»((snippet))';
+$lang['tools'] = 'Rīki';
+$lang['user_tools'] = 'Lietotāja rīki';
+$lang['site_tools'] = 'Vietnes rīki';
+$lang['page_tools'] = 'Lapas rīki';
+$lang['skip_to_content'] = 'uz rakstu';
+$lang['sidebar'] = 'Izvēlne';
$lang['mail_newpage'] = 'lapa pievienota:';
$lang['mail_changed'] = 'lapa mainīta:';
$lang['mail_subscribe_list'] = 'Nodaļā mainītās lapas:';
@@ -249,6 +259,7 @@ $lang['subscr_style_digest'] = 'kopsavilkumu par katru lapu (reizi %.2f dienā
$lang['subscr_style_list'] = 'kopš pēdējās vēstules notikušo labojumu sarakstu (reizi %.2f dienās)';
$lang['authmodfailed'] = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzu ziņo Wiki administratoram.';
$lang['authtempfail'] = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.';
+$lang['authpwdexpire'] = 'Tavai parolei pēc %d dienām biegsies termiņš, tā drīzumā jānomaina.';
$lang['i_chooselang'] = 'Izvēlies valodu';
$lang['i_installer'] = 'DokuWiki instalētājs';
$lang['i_wikiname'] = 'Wiki vārds';
@@ -304,4 +315,3 @@ $lang['media_perm_read'] = 'Atvainojiet, jums nav tiesību skatīt failus.
$lang['media_perm_upload'] = 'Atvainojiet, jums nav tiesību augšupielādēt. ';
$lang['media_update'] = 'Augšupielādēt jaunu versiju';
$lang['media_restore'] = 'Atjaunot šo versiju';
-$lang['plugin_install_err'] = 'Modulis aplami instalēts. Pārdēvē moduļa direktoriju %s par %s.';
diff --git a/inc/lang/lv/mailwrap.html b/inc/lang/lv/mailwrap.html
new file mode 100644
index 000000000..34b723901
--- /dev/null
+++ b/inc/lang/lv/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Šo vēstuli nosūtījusi programma DokuWiki no vietnes @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/lv/resetpwd.txt b/inc/lang/lv/resetpwd.txt
new file mode 100644
index 000000000..757f34cff
--- /dev/null
+++ b/inc/lang/lv/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Uzstādīt jaunu paroli ======
+
+Lūdzu izvēlies savam kontam jaunu paroli. \ No newline at end of file
diff --git a/inc/lang/nl/index.txt b/inc/lang/nl/index.txt
index 288957ed4..ad7122ba0 100644
--- a/inc/lang/nl/index.txt
+++ b/inc/lang/nl/index.txt
@@ -1,4 +1,4 @@
====== Index ======
-Dit is een index van alle beschikbare pagina's gesorteerd op [[doku>wiki:namespaces|namespaces]].
+Dit is een index van alle beschikbare pagina's gesorteerd op [[doku>namespaces|namespaces]].
diff --git a/inc/lang/nl/install.html b/inc/lang/nl/install.html
index e13b9d3ad..a65325826 100644
--- a/inc/lang/nl/install.html
+++ b/inc/lang/nl/install.html
@@ -1,5 +1,5 @@
-<p>Deze pagina helpt u bij de eerste installatie en configuratie van <a href="http://wiki.splitbrain.org">Dokuwiki</a>.
-Meer informatie over deze installer is beschikbaar op zijn eigen <a href="http://wiki.splitbrain.org/wiki:installer">documentatiepagina</a>.</p>
+<p>Deze pagina helpt u bij de eerste installatie en configuratie van <a href="http://dokuwiki.org">Dokuwiki</a>.
+Meer informatie over deze installer is beschikbaar op zijn eigen <a href="http://dokuwiki.org/installer">documentatiepagina</a>.</p>
<p>DokuWiki gebruikt platte tekstbestanden voor het opslaan van wikipagina's en andere informatie die bij deze pagina's horen (bijvoorbeeld plaatjes, zoek-indexen, oude revisies enz.). Om goed te kunnen functioneren, <strong>moet</strong>
DokuWiki schrijftoegang hebben tot de directories die deze bestanden bevatten.
@@ -10,5 +10,5 @@ wat de beheerder in staat stelt in te loggen en toegang te verkrijgen tot het be
Het is niet noodzakelijk voor DokuWiki om te functioneren maar het maakt het een stuk makkelijker om Dokuwiki te beheren.</p>
<p>Ervaren gebruikers of gebruikers die een aangepaste configuratie nodig hebben kunnen voor details terecht op de volgende pagina's:
-<a href="http://wiki.splitbrain.org/wiki:install">installatie-instructies</a>
-en <a href="http://wiki.splitbrain.org/wiki:config">configuratie-instellingen</a>.</p>
+<a href="http://dokuwiki.org/install">installatie-instructies</a>
+en <a href="http://dokuwiki.org/config">configuratie-instellingen</a>.</p>
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 911ffdc10..fdc0c075a 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -16,6 +16,7 @@
* @author Timon Van Overveldt <timonvo@gmail.com>
* @author Jeroen
* @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -58,7 +59,7 @@ $lang['btn_draftdel'] = 'Verwijder concept';
$lang['btn_revert'] = 'Herstellen';
$lang['btn_register'] = 'Registreren';
$lang['btn_apply'] = 'Toepassen';
-$lang['btn_media'] = 'Media beheerder';
+$lang['btn_media'] = 'Mediabeheerder';
$lang['loggedinas'] = 'Ingelogd als';
$lang['user'] = 'Gebruikersnaam';
$lang['pass'] = 'Wachtwoord';
@@ -201,6 +202,7 @@ $lang['user_tools'] = 'Gebruikershulpmiddelen';
$lang['site_tools'] = 'Site-hulpmiddelen';
$lang['page_tools'] = 'Paginahulpmiddelen';
$lang['skip_to_content'] = 'spring naar tekst';
+$lang['sidebar'] = 'Zijbalk';
$lang['mail_newpage'] = 'pagina toegevoegd:';
$lang['mail_changed'] = 'pagina aangepast:';
$lang['mail_subscribe_list'] = 'Pagina\'s veranderd in namespace:';
@@ -278,7 +280,7 @@ $lang['i_wikiname'] = 'Wikinaam';
$lang['i_enableacl'] = 'ACLs inschakelen (aanbevolen)';
$lang['i_superuser'] = 'Superuser';
$lang['i_problems'] = 'De installer vond problemen, hieronder aangegeven. Verhelp deze voor je doorgaat.';
-$lang['i_modified'] = 'Uit veiligheidsoverwegingen werkt dit script alleen met nieuwe en onveranderde DokuWiki-installaties. Pak de bestanden opnieuw uit of raadpleeg de <a href="http://wiki.splitbrain.org/wiki:install">Dokuwiki installatie-instructies</a>';
+$lang['i_modified'] = 'Uit veiligheidsoverwegingen werkt dit script alleen met nieuwe en onveranderde DokuWiki-installaties. Pak de bestanden opnieuw uit of raadpleeg de <a href="http://dokuwiki.org/install">Dokuwiki installatie-instructies</a>';
$lang['i_funcna'] = 'PHP functie <code>%s</code> is niet beschikbaar. Wellicht heeft je hosting provider deze uitgeschakeld?';
$lang['i_phpver'] = 'PHP-versie <code>%s</code> is lager dan de vereiste <code>%s</code>. Upgrade PHP.';
$lang['i_permfail'] = '<code>%s</code> is niet schrijfbaar voor DokuWiki. Pas de permissie-instellingen van deze directory aan.';
@@ -326,4 +328,3 @@ $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['plugin_install_err'] = 'Plugin is juist geinstalleerd. Hernoem plugin map \'%s\' naar \'%s\'.';
diff --git a/inc/lang/nl/register.txt b/inc/lang/nl/register.txt
index 338edcca3..fc31860da 100644
--- a/inc/lang/nl/register.txt
+++ b/inc/lang/nl/register.txt
@@ -1,4 +1,4 @@
====== Registreer als nieuwe gebruiker ======
-Vul alle informatie hieronder in om een nieuw account voor deze wiki aan te maken. Zorg dat je een **geldig e-mailadres** opgeeft - als je je wachtwoord hier niet in kunt vullen wordt het naar dit adres verzonden. De gebruikersnaam moet een geldige [[doku>wiki:pagename|pagename]] zijn.
+Vul alle informatie hieronder in om een nieuw account voor deze wiki aan te maken. Zorg dat je een **geldig e-mailadres** opgeeft - als je je wachtwoord hier niet in kunt vullen wordt het naar dit adres verzonden. De gebruikersnaam moet een geldige [[doku>pagename|paginanaam]] zijn.
diff --git a/inc/lang/nl/resetpwd.txt b/inc/lang/nl/resetpwd.txt
new file mode 100644
index 000000000..345e30725
--- /dev/null
+++ b/inc/lang/nl/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Een nieuw wachtwoord instellen ======
+
+Vul alstublieft een nieuw wachtwoord in voor jouw account in deze wiki. \ No newline at end of file
diff --git a/inc/lang/nl/subscr_digest.txt b/inc/lang/nl/subscr_digest.txt
index 0e6c2c5ba..9f0fe878c 100644
--- a/inc/lang/nl/subscr_digest.txt
+++ b/inc/lang/nl/subscr_digest.txt
@@ -9,7 +9,7 @@ De pagina @PAGE@ in de @TITLE@ wiki is veranderd. Hier zijn de wijzigingen:
Vorige revisie: @OLDPAGE@
Nieuwe revisie: @NEWPAGE@
-Om het verzenden van deze wijzigingsberichtente te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
+Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op de wiki op @DOKUWIKIURL@ en bezoekt u @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
--
Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/nl/subscr_single.txt b/inc/lang/nl/subscr_single.txt
index 3e74bce17..1cd0c85d4 100644
--- a/inc/lang/nl/subscr_single.txt
+++ b/inc/lang/nl/subscr_single.txt
@@ -1,6 +1,7 @@
Halllo!
-De pagina @PAGE@ in de @TITLE@ wiki is veranderd. Hier zijn de wijzigingen:
+De pagina @PAGE@ in de @TITLE@ wiki is veranderd.
+Hier zijn de wijzigingen:
--------------------------------------------------------
@DIFF@
@@ -12,7 +13,7 @@ Wijzigingssamenvatting: @SUMMARY@
Vorige revisie: @OLDPAGE@
Nieuwe revisie: @NEWPAGE@
-Om het verzenden van deze wijzigingsberichtente te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
+Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @NEWPAGE@. Vervolgens kunt u "Inschrijvingen wijzigen" gebruiken om inschrijvingen te stoppen.
--
Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/nl/uploadmail.txt b/inc/lang/nl/uploadmail.txt
index 1816400d7..59920ae3d 100644
--- a/inc/lang/nl/uploadmail.txt
+++ b/inc/lang/nl/uploadmail.txt
@@ -1,6 +1,7 @@
Er is een bestand geüpload naar uw DokuWiki. Hier zijn de details;
Bestand : @MEDIA@
+Oude revisie: @OLD@
Datum : @DATE@
Browser : @BROWSER@
IP-adres : @IPADDRESS@
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 97ef741ef..cc3d34aed 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -323,4 +323,3 @@ $lang['media_perm_read'] = 'Beklager, du har ikke tilgang til å lese file
$lang['media_perm_upload'] = 'Beklager, du har ikke tilgang til å laste opp filer.';
$lang['media_update'] = 'Last opp ny versjon';
$lang['media_restore'] = 'Gjenopprett denne versjonen';
-$lang['plugin_install_err'] = 'Tillegget ble feil installert. Skift navn på mappen \'%s\' til \'%s\'.';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 79d18bbf5..2f448d291 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -325,4 +325,3 @@ $lang['media_perm_read'] = 'Przepraszamy, nie masz wystarczających uprawn
$lang['media_perm_upload'] = 'Przepraszamy, nie masz wystarczających uprawnień do przesyłania plików.';
$lang['media_update'] = 'Prześlij nową wersję';
$lang['media_restore'] = 'Odtwórz tą wersję';
-$lang['plugin_install_err'] = 'Wtyczka zainstalowana nieprawidłowo. Zmień nazwę katalogu wtyczki \'%s\' na \'%s\'.';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index d6dc8f96b..b3d56bae7 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -54,11 +54,14 @@ $lang['btn_backtomedia'] = 'Voltar à seleção do arquivo de mídia';
$lang['btn_subscribe'] = 'Monitorar alterações';
$lang['btn_profile'] = 'Atualizar o perfil';
$lang['btn_reset'] = 'Limpar';
+$lang['btn_resendpwd'] = 'Definir a nova senha';
$lang['btn_draft'] = 'Editar o rascunho';
$lang['btn_recover'] = 'Recuperar o rascunho';
$lang['btn_draftdel'] = 'Excluir o rascunho';
$lang['btn_revert'] = 'Restaurar';
$lang['btn_register'] = 'Cadastre-se';
+$lang['btn_apply'] = 'Aplicar';
+$lang['btn_media'] = 'Gerenciador de mídias';
$lang['loggedinas'] = 'Identificado(a) como';
$lang['user'] = 'Nome de usuário';
$lang['pass'] = 'Senha';
@@ -88,6 +91,7 @@ $lang['profnoempty'] = 'Não são permitidos nomes ou endereços de e-
$lang['profchanged'] = 'O perfil do usuário foi atualizado com sucesso.';
$lang['pwdforget'] = 'Esqueceu sua senha? Solicite outra';
$lang['resendna'] = 'Esse wiki não tem suporte para o reenvio de senhas.';
+$lang['resendpwd'] = 'Definir a nova senha para';
$lang['resendpwdmissing'] = 'Desculpe, você deve preencher todos os campos.';
$lang['resendpwdnouser'] = 'Desculpe, não foi possível encontrar esse usuário no nosso banco de dados.';
$lang['resendpwdbadauth'] = 'Desculpe, esse código de autorização é inválido. Certifique-se de que você usou o link de confirmação inteiro.';
@@ -100,6 +104,7 @@ $lang['searchmedia_in'] = 'Buscar em %s';
$lang['txt_upload'] = 'Selecione o arquivo a ser enviado';
$lang['txt_filename'] = 'Enviar como (opcional)';
$lang['txt_overwrt'] = 'Substituir o arquivo existente';
+$lang['maxuploadsize'] = 'Tamanho máximo de %s por arquivo.';
$lang['lockedby'] = 'Atualmente bloqueada por';
$lang['lockexpire'] = 'O bloqueio expira em';
$lang['js']['willexpire'] = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
@@ -134,6 +139,17 @@ Entretanto, você ainda pode copiar e colar o atalho.';
$lang['js']['linkwiz'] = 'Link Wizard';
$lang['js']['linkto'] = 'Link para:';
$lang['js']['del_confirm'] = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
+$lang['js']['restore_confirm'] = 'Deseja realmente restaurar essa versão?';
+$lang['js']['media_diff'] = 'Ver as diferenças:';
+$lang['js']['media_diff_both'] = 'Lado a lado';
+$lang['js']['media_diff_opacity'] = 'Sobreposição';
+$lang['js']['media_diff_portions'] = 'Deslizamento';
+$lang['js']['media_select'] = 'Selecione os arquivos...';
+$lang['js']['media_upload_btn'] = 'Enviar';
+$lang['js']['media_done_btn'] = 'Concluído';
+$lang['js']['media_drop'] = 'Arraste os arquivos até aqui para enviar';
+$lang['js']['media_cancel'] = 'remover';
+$lang['js']['media_overwrt'] = 'Sobrescrever arquivos existentes';
$lang['rssfailed'] = 'Ocorreu um erro durante a atualização dessa fonte: ';
$lang['nothingfound'] = 'Não foi encontrado nada.';
$lang['mediaselect'] = 'Arquivos de mídia';
@@ -178,16 +194,26 @@ $lang['lastmod'] = 'Última modificação';
$lang['by'] = 'por';
$lang['deleted'] = 'removida';
$lang['created'] = 'criada';
-$lang['restored'] = 'revisão anterior restaurada';
+$lang['restored'] = 'a revisão anterior foi restaurada (%s)';
$lang['external_edit'] = 'edição externa';
$lang['summary'] = 'Resumo da edição';
$lang['noflash'] = 'O <a href="http://www.adobe.com/products/flashplayer/">plug-in Adobe Flash</a> é necessário para exibir este conteúdo.';
-$lang['download'] = 'Download Snippet';
+$lang['download'] = 'Baixar o snippet';
+$lang['tools'] = 'Ferramentas';
+$lang['user_tools'] = 'Ferramentas do usuário';
+$lang['site_tools'] = 'Ferramentas do site';
+$lang['page_tools'] = 'Ferramentas da página';
+$lang['skip_to_content'] = 'ir para o conteúdo';
+$lang['sidebar'] = 'Barra lateral';
$lang['mail_newpage'] = 'página adicionada:';
$lang['mail_changed'] = 'página modificada:';
$lang['mail_subscribe_list'] = 'páginas alteradas no espaço de nomes:';
$lang['mail_new_user'] = 'novo usuário:';
$lang['mail_upload'] = 'arquivo enviado:';
+$lang['changes_type'] = 'Ver as mudanças de';
+$lang['pages_changes'] = 'Páginas';
+$lang['media_changes'] = 'Arquivos de mídia';
+$lang['both_changes'] = 'Páginas e arquivos de mídia';
$lang['qb_bold'] = 'Texto em negrito';
$lang['qb_italic'] = 'Texto em itálico';
$lang['qb_underl'] = 'Texto sublinhado';
@@ -212,7 +238,7 @@ $lang['qb_media'] = 'Adicionar imagens e/ou outros arquivos';
$lang['qb_sig'] = 'Inserir assinatura';
$lang['qb_smileys'] = 'Carinhas';
$lang['qb_chars'] = 'Caracteres especiais';
-$lang['upperns'] = 'Pular para namespace acima';
+$lang['upperns'] = 'Pular para espaço de nomes acima';
$lang['admin_register'] = 'Adicionar novo usuário';
$lang['metaedit'] = 'Editar metadados';
$lang['metasaveerr'] = 'Não foi possível escrever os metadados';
@@ -228,6 +254,9 @@ $lang['img_copyr'] = 'Direitos autorais';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Câmera';
$lang['img_keywords'] = 'Palavras-chave';
+$lang['img_width'] = 'Largura';
+$lang['img_height'] = 'Altura';
+$lang['img_manager'] = 'Ver no gerenciador de mídias';
$lang['subscr_subscribe_success'] = 'Adicionado %s à lista de monitoramentos de %s';
$lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de monitoramentos de %s';
$lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento';
@@ -246,6 +275,7 @@ $lang['subscr_style_digest'] = 'um agrupamento de e-mails com as mudanças par
$lang['subscr_style_list'] = 'uma lista de páginas modificadas desde o último e-mail (a cada %.2f dias)';
$lang['authmodfailed'] = 'A configuração da autenticação de usuário está com problemas. Por favor, informe ao administrador do wiki.';
$lang['authtempfail'] = 'A autenticação de usuários está temporariamente desabilitada. Se essa situação persistir, por favor, informe ao administrador do Wiki.';
+$lang['authpwdexpire'] = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.';
$lang['i_chooselang'] = 'Selecione o seu idioma';
$lang['i_installer'] = 'Instalador do DokuWiki';
$lang['i_wikiname'] = 'Nome do Wiki';
@@ -278,3 +308,26 @@ $lang['hours'] = '%d horas atrás';
$lang['minutes'] = '%d minutos atrás';
$lang['seconds'] = '%d segundos atrás';
$lang['wordblock'] = 'Suas mudanças não foram salvas pois contem texto bloqueados (spam)';
+$lang['media_uploadtab'] = 'Enviar';
+$lang['media_searchtab'] = 'Pesquisar';
+$lang['media_file'] = 'Arquivo';
+$lang['media_viewtab'] = 'Ver';
+$lang['media_edittab'] = 'Editar';
+$lang['media_historytab'] = 'Histórico';
+$lang['media_list_thumbs'] = 'Miniaturas';
+$lang['media_list_rows'] = 'Linhas';
+$lang['media_sort_name'] = 'Nome';
+$lang['media_sort_date'] = 'Data';
+$lang['media_namespaces'] = 'Selecione o espaço de nomes';
+$lang['media_files'] = 'Arquivos em %s';
+$lang['media_upload'] = 'Enviar para %s';
+$lang['media_search'] = 'Pesquisar em %s';
+$lang['media_view'] = '%s';
+$lang['media_viewold'] = '%s em %s';
+$lang['media_edit'] = 'Editar %s';
+$lang['media_history'] = 'Histórico de %s';
+$lang['media_meta_edited'] = 'o metadado foi editado';
+$lang['media_perm_read'] = 'Desculpe, mas você não tem privilégios suficientes para ler arquivos.';
+$lang['media_perm_upload'] = 'Desculpe, mas você não tem privilégios suficientes para enviar arquivos.';
+$lang['media_update'] = 'Enviar uma nova versão';
+$lang['media_restore'] = 'Restaurar esta versão';
diff --git a/inc/lang/pt-br/mailwrap.html b/inc/lang/pt-br/mailwrap.html
new file mode 100644
index 000000000..80bea7a22
--- /dev/null
+++ b/inc/lang/pt-br/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/pt-br/resetpwd.txt b/inc/lang/pt-br/resetpwd.txt
new file mode 100644
index 000000000..febb1d6a0
--- /dev/null
+++ b/inc/lang/pt-br/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Definir uma nova senha ======
+
+Por favor, digite uma nova senha para sua conta neste wiki. \ No newline at end of file
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index a0b0f57e8..af388985c 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -317,4 +317,3 @@ $lang['js']['media_drop'] = 'Largue ficheiros aqui para enviar';
$lang['js']['media_cancel'] = 'remover';
$lang['js']['media_overwrt'] = 'Escrever por cima de ficheiros existentes';
-$lang['plugin_install_err'] = "Plugin instalado incorrectamente. Renomeie a pasta do plugin de '%s' para '%s'.";
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 41727e521..0c7e02605 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -320,4 +320,3 @@ $lang['media_perm_read'] = 'Ne pare rău, dar nu aveți suficiente dreptur
$lang['media_perm_upload'] = 'Ne pare rău, dar nu aveți suficiente drepturi pentru a putea încărca fișiere.';
$lang['media_update'] = 'Încarcă noua versiune';
$lang['media_restore'] = 'Restaurează această versiune';
-$lang['plugin_install_err'] = 'Modul instalat greșit. Redenumește directorul modulului \'%s\' în \'%s\'.';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 4c3d26b1d..5f428b36a 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -203,6 +203,7 @@ $lang['user_tools'] = 'Инструменты пользовател
$lang['site_tools'] = 'Инструменты сайта';
$lang['page_tools'] = 'Инструменты страницы';
$lang['skip_to_content'] = 'Перейти к содержанию';
+$lang['sidebar'] = 'Боковая колонна';
$lang['mail_newpage'] = 'страница добавлена:';
$lang['mail_changed'] = 'страница изменена:';
$lang['mail_subscribe_list'] = 'изменились страницы в пространстве имён:';
@@ -332,4 +333,3 @@ $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/sk/lang.php b/inc/lang/sk/lang.php
index 85e899b06..b8a947dc3 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -42,6 +42,7 @@ $lang['btn_backtomedia'] = 'Späť na výber súboru';
$lang['btn_subscribe'] = 'Sledovať zmeny';
$lang['btn_profile'] = 'Aktualizovať profil';
$lang['btn_reset'] = 'Zrušiť';
+$lang['btn_resendpwd'] = 'Nastaviť nové heslo';
$lang['btn_draft'] = 'Upraviť koncept';
$lang['btn_recover'] = 'Obnoviť koncept';
$lang['btn_draftdel'] = 'Zmazať koncept';
@@ -78,6 +79,7 @@ $lang['profnoempty'] = 'Prázdne meno alebo mailová adresa nie sú po
$lang['profchanged'] = 'Užívateľský účet úspešne zmenený.';
$lang['pwdforget'] = 'Zabudli ste heslo? Získajte nové!';
$lang['resendna'] = 'Táto wiki nepodporuje opätovné zasielanie hesla.';
+$lang['resendpwd'] = 'Nastaviť nové heslo pre';
$lang['resendpwdmissing'] = 'Prepáčte, musíte vyplniť všetky polia.';
$lang['resendpwdnouser'] = 'Prepáčte, nemôžeme nájsť zadaného užívateľa v databáze.';
$lang['resendpwdbadauth'] = 'Prepáčte, tento autorizačný kód nie je platný. Uistite sa, či ste použili celý autorizačný odkaz.';
@@ -90,6 +92,7 @@ $lang['searchmedia_in'] = 'Hľadať v %s';
$lang['txt_upload'] = 'Vyberte súbor ako prílohu';
$lang['txt_filename'] = 'Uložiť ako (voliteľné)';
$lang['txt_overwrt'] = 'Prepísať existujúci súbor';
+$lang['maxuploadsize'] = 'Obmedzenie max. %s na súbor.';
$lang['lockedby'] = 'Práve zamknuté:';
$lang['lockexpire'] = 'Zámok stratí platnosť:';
$lang['js']['willexpire'] = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
@@ -179,11 +182,17 @@ $lang['lastmod'] = 'Posledná úprava';
$lang['by'] = 'od';
$lang['deleted'] = 'odstránené';
$lang['created'] = 'vytvorené';
-$lang['restored'] = 'stará verzia bola obnovená';
+$lang['restored'] = 'stará verzia bola obnovená (%s)';
$lang['external_edit'] = 'externá úprava';
$lang['summary'] = 'Komentár k úpravám';
$lang['noflash'] = 'Pre zobrazenie tohto obsahu potrebujete <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
$lang['download'] = 'Stiahnuť';
+$lang['tools'] = 'Nástroje';
+$lang['user_tools'] = 'Nástroje používateľa';
+$lang['site_tools'] = 'Nástoje správy stránok';
+$lang['page_tools'] = 'Nástoje stránky';
+$lang['skip_to_content'] = 'skok na obsah';
+$lang['sidebar'] = 'Bočný panel';
$lang['mail_newpage'] = 'stránka pridaná:';
$lang['mail_changed'] = 'stránka zmenená:';
$lang['mail_subscribe_list'] = 'stránky zmenené v mennom priestore:';
@@ -254,6 +263,7 @@ $lang['subscr_style_digest'] = 'email so zhrnutím zmien pre každú stránku
$lang['subscr_style_list'] = 'zoznam zmenených stránok od posledného emailu (perióda %.2f dňa)';
$lang['authmodfailed'] = 'Užívateľská autentifikácia nie je možná. Prosím informujte správcu systému.';
$lang['authtempfail'] = 'Užívateľská autentifikácia je dočasne nedostupná. Ak táto situácia pretrváva, prosím informujte správcu systému.';
+$lang['authpwdexpire'] = 'Platnosť hesla vyprší za %d dní, mali by ste ho zmeniť čo najskôr.';
$lang['i_chooselang'] = 'Zvoľte váš jazyk';
$lang['i_installer'] = 'DokuWiki inštalátor';
$lang['i_wikiname'] = 'Názov Wiki';
@@ -308,4 +318,3 @@ $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['plugin_install_err'] = 'Plugin nebol nainštalovaný úspešne. Premenujte adresár s pluginom \'%s\' na \'%s\'.';
diff --git a/inc/lang/sk/mailwrap.html b/inc/lang/sk/mailwrap.html
new file mode 100644
index 000000000..2e42515fb
--- /dev/null
+++ b/inc/lang/sk/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>Táto správa bola zaslaná DokuWiki @DOKUWIKIURL@.</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/sk/resetpwd.txt b/inc/lang/sk/resetpwd.txt
new file mode 100644
index 000000000..a4df4a545
--- /dev/null
+++ b/inc/lang/sk/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Nastavenie nového hesla ======
+
+Prosím zadajte nové heslo vášho účtu v tejto wiki.
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index b34ab67e4..3a4dbd22e 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -311,4 +311,3 @@ $lang['media_perm_read'] = 'Ni ustreznih dovoljenj za branje datotek.';
$lang['media_perm_upload'] = 'Ni ustreznih dovoljenj za nalaganje datotek.';
$lang['media_update'] = 'Naloži novo različico';
$lang['media_restore'] = 'Obnovi to različico';
-$lang['plugin_install_err'] = 'Vstavek ni pravilno nameščen. Preimenujte mapo vstavka\'%s\' v \'%s\'.';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index c9179f6b3..99c4d47e4 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -263,6 +263,4 @@ $lang['media_perm_upload'] = 'Xin lỗi, bạn không đủ quyền để up
$lang['media_update'] = 'Tải lên phiên bản mới';
$lang['media_restore'] = 'Phục hồi phiên bản này';
-$lang['plugin_install_err'] = "Plugin không được cài đặt chính xác.Đổi tên thư mục plugin '%s' thành '%s'.";
-
//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/zh-tw/admin.txt b/inc/lang/zh-tw/admin.txt
index 3cc10335d..5916e7106 100644
--- a/inc/lang/zh-tw/admin.txt
+++ b/inc/lang/zh-tw/admin.txt
@@ -1,4 +1,3 @@
====== 管理選單 ======
-以下為 DokuWiki 的管理設定
-
+以下為 DokuWiki 的管理設定。 \ No newline at end of file
diff --git a/inc/lang/zh-tw/diff.txt b/inc/lang/zh-tw/diff.txt
index b2b662ec3..17fad7ba0 100644
--- a/inc/lang/zh-tw/diff.txt
+++ b/inc/lang/zh-tw/diff.txt
@@ -1,4 +1,3 @@
====== 差異處 ======
-這裡顯示二個版本的差異處。
-
+這裏顯示二個版本的差異處。 \ No newline at end of file
diff --git a/inc/lang/zh-tw/index.txt b/inc/lang/zh-tw/index.txt
index 11ec223d9..bba277041 100644
--- a/inc/lang/zh-tw/index.txt
+++ b/inc/lang/zh-tw/index.txt
@@ -1,3 +1,3 @@
====== 站台地圖 ======
-這個站台地圖列出了所有允許的頁面,依 [[doku>namespaces|命名空間]] 排序。
+這個站台地圖列出了所有允許的頁面,依 [[doku>namespaces|分類空間]] 排序。 \ No newline at end of file
diff --git a/inc/lang/zh-tw/install.html b/inc/lang/zh-tw/install.html
index f435efc21..2a8b1aac3 100644
--- a/inc/lang/zh-tw/install.html
+++ b/inc/lang/zh-tw/install.html
@@ -1,8 +1,8 @@
-<p>本頁面旨在幫助您完成第一次安装和配置 <a href="http://dokuwiki.org">Dokuwiki</a>。關於安裝工具的更多訊息請參閱 <a href="http://dokuwiki.org/installer">官方文檔頁面</a>。</p>
+<p>本頁面旨在幫助您完成第一次安装和設定 <a href="http://dokuwiki.org">Dokuwiki</a>。關於安裝工具的更多訊息請參閱 <a href="http://dokuwiki.org/installer">官方文檔頁面</a>。</p>
<p>DokuWiki 使用普通檔案儲存維基頁面以及與頁面相關的訊息(例如:圖像,搜尋索引,修訂記錄等)。為了正常運作,DokuWiki <strong>必須</strong> 擁有針對那些路徑和檔案的寫入權限。本安裝工具無法設定目錄權限,這通常要透過命令行、FTP 或您主機上的控制台(如cPanel)進行。</p>
-<p>本安裝工具將設定您的 DokuWiki 用於 <abbr title="訪問控制列表">ACL</abbr> 的配置檔,它能讓管理員登入並使用「管理」功能來安裝插件、管理用户、管理訪問權限和其他配置設定。它並不是 DokuWiki 正常運作所必須,但安裝之後將更方便管理。</p>
+<p>本安裝工具將設定您的 DokuWiki 用於 <abbr title="訪問控制列表">ACL</abbr> 的設定檔,它能讓管理員登入並使用「管理」功能來安裝插件、管理用户、管理訪問權限和其他設定設定。它並不是 DokuWiki 正常運作所必須,但安裝之後將更方便管理。</p>
<p>有經驗的用戶或有特殊需求的用戶請參閱更詳細的 <a href="http://dokuwiki.org/install">安裝指南</a>
-和 <a href="http://dokuwiki.org/config">配置設定</a>。</p> \ No newline at end of file
+和 <a href="http://dokuwiki.org/config">設定</a>。</p> \ No newline at end of file
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index bbbbb71a6..2cceb4012 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -10,6 +10,7 @@
* @author Cheng-Wei Chien <e.cwchien@gmail.com>
* @author Danny Lin
* @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -45,6 +46,7 @@ $lang['btn_backtomedia'] = '重新選擇圖檔';
$lang['btn_subscribe'] = '訂閱更動通知';
$lang['btn_profile'] = '更新個人資料';
$lang['btn_reset'] = '資料重設';
+$lang['btn_resendpwd'] = '設定新密碼';
$lang['btn_draft'] = '編輯草稿';
$lang['btn_recover'] = '復原草稿';
$lang['btn_draftdel'] = '捨棄草稿';
@@ -60,39 +62,41 @@ $lang['oldpass'] = '目前密碼';
$lang['passchk'] = '確認密碼';
$lang['remember'] = '記住帳號密碼';
$lang['fullname'] = '真實姓名';
-$lang['email'] = 'E-Mail';
+$lang['email'] = '電郵';
$lang['profile'] = '使用者個人資料';
-$lang['badlogin'] = '很抱歉,您的使用者名稱或密碼可能有錯誤';
+$lang['badlogin'] = '很抱歉,您的使用者名稱或密碼可能有錯誤。';
$lang['minoredit'] = '小修改';
$lang['draftdate'] = '草稿已自動存檔於';
$lang['nosecedit'] = '頁面在這之間已被修改,過時的區段資料已載入全頁取代。';
-$lang['regmissing'] = '很抱歉,所有欄位都要填寫';
-$lang['reguexists'] = '很抱歉,本帳號已被註冊';
+$lang['regmissing'] = '很抱歉,所有欄位都要填寫。';
+$lang['reguexists'] = '很抱歉,本帳號已被註冊。';
$lang['regsuccess'] = '使用者已建立,密碼已寄發至該 email。';
-$lang['regsuccess2'] = '使用者已建立';
+$lang['regsuccess2'] = '使用者已建立。';
$lang['regmailfail'] = '寄出密碼信似乎發生錯誤,請跟管理員聯絡!';
$lang['regbadmail'] = '您輸入的 email 似乎不對,如果您認為是正確的,請與管理員聯絡。';
$lang['regbadpass'] = '兩次輸入的密碼不一致,請再試一次。';
$lang['regpwmail'] = '您的 DokuWiki 帳號密碼';
$lang['reghere'] = '您還沒有帳號嗎?註冊一個吧。';
-$lang['profna'] = '本維基不開放修改個人資料';
-$lang['profnochange'] = '未做任何變更';
-$lang['profnoempty'] = '帳號或 email 地址不可空白!';
-$lang['profchanged'] = '個人資料已成功更新囉。';
+$lang['profna'] = '本維基不開放修改個人資料。';
+$lang['profnochange'] = '未做任何變更。';
+$lang['profnoempty'] = '帳號或電郵地址不可空白!';
+$lang['profchanged'] = '個人資料已成功更新。';
$lang['pwdforget'] = '忘記密碼了?索取新密碼!';
-$lang['resendna'] = '本維基不開放重寄密碼';
+$lang['resendna'] = '本維基不開放重寄密碼。';
+$lang['resendpwd'] = '設定新密碼供';
$lang['resendpwdmissing'] = '抱歉,您必須填寫所有欄位。';
-$lang['resendpwdnouser'] = '抱歉,資料庫內找不到這個使用者';
+$lang['resendpwdnouser'] = '抱歉,資料庫內找不到這個使用者。';
$lang['resendpwdbadauth'] = '抱歉,認證碼無效。請確認您使用了完整的確認連結。';
$lang['resendpwdconfirm'] = '確認連結已通過郵件發送給您了。';
$lang['resendpwdsuccess'] = '您的新密碼已寄出。';
$lang['license'] = '若未特別註明,此維基上的內容都是採用以下授權方式:';
$lang['licenseok'] = '注意:編輯此頁面表示您已同意以下的授權方式:';
$lang['searchmedia'] = '搜尋檔名:';
-$lang['searchmedia_in'] = '在 %s 裡搜尋';
+$lang['searchmedia_in'] = '在 %s 裏搜尋';
$lang['txt_upload'] = '請選擇要上傳的檔案';
$lang['txt_filename'] = '請輸入要存在維基內的檔案名稱 (非必要)';
$lang['txt_overwrt'] = '是否要覆蓋原有檔案';
+$lang['maxuploadsize'] = '每個上傳檔案不可大於 %s 。';
$lang['lockedby'] = '目前已被下列人員鎖定';
$lang['lockexpire'] = '預計解除鎖定於';
$lang['js']['willexpire'] = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突,請按「預覽」鍵重設鎖定計時。';
@@ -122,12 +126,12 @@ $lang['js']['mediaright'] = '圖像靠右對齊';
$lang['js']['mediacenter'] = '圖像置中對齊';
$lang['js']['medianoalign'] = '不對齊';
$lang['js']['nosmblinks'] = '只有在 Microsoft IE 下才能執行「連結到 Windows shares」。
-不過您仍可複製及貼上這個連結';
+不過您仍可複製及貼上這個連結。';
$lang['js']['linkwiz'] = '建立連結精靈';
$lang['js']['linkto'] = '連結至:';
$lang['js']['del_confirm'] = '確定刪除選取的項目?';
$lang['js']['restore_confirm'] = '確定還原到這個版本?';
-$lang['js']['media_diff'] = '檢視差異:';
+$lang['js']['media_diff'] = '檢視差異:';
$lang['js']['media_diff_both'] = '並排';
$lang['js']['media_diff_opacity'] = '重疊';
$lang['js']['media_diff_portions'] = '滑動';
@@ -145,21 +149,21 @@ $lang['uploadsucc'] = '上傳成功';
$lang['uploadfail'] = '上傳失敗。似乎是權限錯誤?';
$lang['uploadwrong'] = '拒絕上傳。這個副檔名被禁止了!';
$lang['uploadexist'] = '檔案已存在,未處理。';
-$lang['uploadbadcontent'] = '上傳檔案的內容不符合 %s 檔的副檔名';
+$lang['uploadbadcontent'] = '上傳檔案的內容不符合 %s 檔的副檔名。';
$lang['uploadspam'] = '這次的上傳被垃圾訊息黑名單阻檔了。';
$lang['uploadxss'] = '這次的上傳因可能的惡意的內容而被阻檔。';
$lang['uploadsize'] = '上傳的檔案太大了 (最大:%s)';
$lang['deletesucc'] = '檔案 "%s" 已刪除。';
$lang['deletefail'] = '檔案 "%s" 無法刪除,請檢查權限定。';
$lang['mediainuse'] = '檔案 "%s" 未刪除,因為它正被使用。';
-$lang['namespaces'] = '命名空間';
+$lang['namespaces'] = '分類空間';
$lang['mediafiles'] = '可用的檔案有';
-$lang['accessdenied'] = '您不被允許檢視此頁面';
-$lang['mediausage'] = '使用以下的語法來連結此檔案:';
+$lang['accessdenied'] = '您不可以檢視此頁面。';
+$lang['mediausage'] = '使用以下的語法來連結此檔案:';
$lang['mediaview'] = '檢視原始檔案';
$lang['mediaroot'] = 'root';
-$lang['mediaupload'] = '上傳檔案至目前的命名空間。要建立次級命名空間,將其名稱加在「上傳並重命名為」檔案名的前面,並用英文冒號隔開';
-$lang['mediaextchange'] = '檔案類型已由 .%s 變更為 .%s !';
+$lang['mediaupload'] = '上傳檔案至目前的分類空間。要建立子分類空間,將其名稱加在「上傳並重命名為」檔案名的前面,並用英文冒號隔開。';
+$lang['mediaextchange'] = '檔案類型已由 .%s 變更為 .%s !';
$lang['reference'] = '引用到本頁的,合計有';
$lang['ref_inuse'] = '此檔案無法刪除,因為它正被以下頁面使用:';
$lang['ref_hidden'] = '一些參考內容位於您沒有讀取權限的頁面中';
@@ -186,11 +190,17 @@ $lang['external_edit'] = '外部編輯';
$lang['summary'] = '編輯摘要';
$lang['noflash'] = '顯示此內容需要 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
$lang['download'] = '下載程式碼片段';
-$lang['mail_newpage'] = '增加的頁面:';
-$lang['mail_changed'] = '變更的頁面:';
-$lang['mail_subscribe_list'] = '命名空間中更動的頁面:';
-$lang['mail_new_user'] = '新使用者:';
-$lang['mail_upload'] = '已上傳檔案:';
+$lang['tools'] = '工具';
+$lang['user_tools'] = '用戶工具';
+$lang['site_tools'] = '網站工具';
+$lang['page_tools'] = '頁面工具';
+$lang['skip_to_content'] = '跳至內容';
+$lang['sidebar'] = '側欄';
+$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'] = '多媒體檔案';
@@ -219,7 +229,7 @@ $lang['qb_media'] = '加入圖片或檔案';
$lang['qb_sig'] = '插入簽名';
$lang['qb_smileys'] = '表情符號';
$lang['qb_chars'] = '特殊字元';
-$lang['upperns'] = '前往父層命名空間';
+$lang['upperns'] = '前往父分類空間';
$lang['admin_register'] = '新增使用者';
$lang['metaedit'] = '編輯後設資料';
$lang['metasaveerr'] = '後設資料寫入失敗';
@@ -245,7 +255,7 @@ $lang['subscr_unsubscribe_success'] = '已將 %s 移除自 %s 的訂閱列表';
$lang['subscr_unsubscribe_error'] = '將 %s 移除自 %s 的訂閱列表時發生錯誤';
$lang['subscr_already_subscribed'] = '%s 已經被 %s 訂閱了';
$lang['subscr_not_subscribed'] = '%s 尚未被 %s 訂閱';
-$lang['subscr_m_not_subscribed'] = '您尚未訂閱目前的頁面或命名空間。';
+$lang['subscr_m_not_subscribed'] = '您尚未訂閱目前的頁面或分類空間。';
$lang['subscr_m_new_header'] = '加入訂閱';
$lang['subscr_m_current_header'] = '目前訂閱';
$lang['subscr_m_unsubscribe'] = '取消訂閱';
@@ -256,6 +266,7 @@ $lang['subscr_style_digest'] = '對每個頁面發送更改的摘要信件 (
$lang['subscr_style_list'] = '自上次發信以來更改的頁面的列表 (每 %.2f 天)';
$lang['authmodfailed'] = '帳號認證的設定不正確,請通知該維基管理員。';
$lang['authtempfail'] = '帳號認證目前暫不提供,若本狀況持續發生的話,請通知該維基管理員。';
+$lang['authpwdexpire'] = '您的密碼將在 %d 天內到期,請馬上更換新密碼。';
$lang['i_chooselang'] = '選擇您的語系';
$lang['i_installer'] = 'DokuWiki 安裝工具';
$lang['i_wikiname'] = '維基名稱';
@@ -280,7 +291,7 @@ $lang['i_pol1'] = '公開的維基 (任何人可讀取,註冊
$lang['i_pol2'] = '封閉的維基 (只有註冊使用者可讀取、寫入、上傳)';
$lang['i_retry'] = '重試';
$lang['i_license'] = '請選擇您想要的內容發布許可協議:';
-$lang['recent_global'] = '您正在閱讀命名空間: <b>%s</b> 中的變更。您亦可觀看整個維基的<a href="%s">最近更新</a>。';
+$lang['recent_global'] = '您正在閱讀分類空間: <b>%s</b> 中的變更。您亦可觀看整個維基的<a href="%s">最近更新</a>。';
$lang['years'] = '%d 年前';
$lang['months'] = '%d 個月前';
$lang['weeks'] = '%d 週前';
@@ -299,7 +310,7 @@ $lang['media_list_thumbs'] = '縮圖';
$lang['media_list_rows'] = '列表';
$lang['media_sort_name'] = '名稱';
$lang['media_sort_date'] = '日期';
-$lang['media_namespaces'] = '選擇命名空間';
+$lang['media_namespaces'] = '選擇分類空間';
$lang['media_files'] = '在 %s 中的檔案';
$lang['media_upload'] = '上傳至 %s';
$lang['media_search'] = '在 %s 中搜尋';
@@ -308,8 +319,7 @@ $lang['media_viewold'] = '%s 在 %s';
$lang['media_edit'] = '編輯 %s';
$lang['media_history'] = '%s 的歷史紀錄';
$lang['media_meta_edited'] = '元資料已編輯';
-$lang['media_perm_read'] = '抱歉,您沒有足夠權限讀取檔案';
+$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/zh-tw/mailwrap.html b/inc/lang/zh-tw/mailwrap.html
new file mode 100644
index 000000000..9cd5faacd
--- /dev/null
+++ b/inc/lang/zh-tw/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>@TITLE@</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>這郵件由DokuWiki at @DOKUWIKIURL@. 生成</small>
+</body>
+</html> \ No newline at end of file
diff --git a/inc/lang/zh-tw/resetpwd.txt b/inc/lang/zh-tw/resetpwd.txt
new file mode 100644
index 000000000..f760335af
--- /dev/null
+++ b/inc/lang/zh-tw/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 設定新密碼 ======
+
+請為您的帳戶輸入新密碼。 \ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_digest.txt b/inc/lang/zh-tw/subscr_digest.txt
index a26e73050..a0f2be73e 100644
--- a/inc/lang/zh-tw/subscr_digest.txt
+++ b/inc/lang/zh-tw/subscr_digest.txt
@@ -12,8 +12,8 @@
要取消頁面提醒,請登入維基 @DOKUWIKIURL@
然後拜訪 @SUBSCRIBE@
-並取消訂閱頁面或命名空間的更改。
+並取消訂閱頁面或分類空間的更改。
--
本信件由以下 DokuWiki 站台產生:
-@DOKUWIKIURL@
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_form.txt b/inc/lang/zh-tw/subscr_form.txt
index 0ad675cc8..394d4cbad 100644
--- a/inc/lang/zh-tw/subscr_form.txt
+++ b/inc/lang/zh-tw/subscr_form.txt
@@ -1,3 +1,3 @@
====== 訂閱管理 ======
-這個頁面允許您管理在目前頁面和命名空間的訂閱。 \ No newline at end of file
+這個頁面允許您管理在目前頁面和分類空間的訂閱。 \ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_list.txt b/inc/lang/zh-tw/subscr_list.txt
index 2a1b26c6e..078eae63e 100644
--- a/inc/lang/zh-tw/subscr_list.txt
+++ b/inc/lang/zh-tw/subscr_list.txt
@@ -1,6 +1,6 @@
您好!
-維基 @TITLE@ 的 @PAGE@ 命名空間的頁面已更改。
+維基 @TITLE@ 的 @PAGE@ 分類空間的頁面已更改。
更改內容如下:
--------------------------------------------------------
@@ -9,8 +9,8 @@
要取消頁面提醒,請登入維基 @DOKUWIKIURL@
然後拜訪 @SUBSCRIBE@
-並取消訂閱頁面或命名空間的更改。
+並取消訂閱頁面或分類空間的更改。
--
本信件由以下 DokuWiki 站台產生:
-@DOKUWIKIURL@
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_single.txt b/inc/lang/zh-tw/subscr_single.txt
index f3c623c5c..5128140d0 100644
--- a/inc/lang/zh-tw/subscr_single.txt
+++ b/inc/lang/zh-tw/subscr_single.txt
@@ -15,8 +15,8 @@
要取消頁面提醒,請登入維基 @DOKUWIKIURL@
然後拜訪 @NEWPAGE@
-並取消訂閱頁面或命名空間的更改。
+並取消訂閱頁面或分類空間的更改。
--
本信件由以下 DokuWiki 站台產生:
-@DOKUWIKIURL@
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 9ea0f5e7f..b21a74ed5 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -190,7 +190,7 @@ $lang['lastmod'] = '最后更改';
$lang['by'] = '由';
$lang['deleted'] = '移除';
$lang['created'] = '创建';
-$lang['restored'] = '已恢复为旧版';
+$lang['restored'] = '已恢复为旧版 (%s)';
$lang['external_edit'] = '外部编辑';
$lang['summary'] = '编辑摘要';
$lang['noflash'] = '需要 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash 插件</a> 来播放本内容。 ';
@@ -200,6 +200,7 @@ $lang['user_tools'] = '用户工具';
$lang['site_tools'] = '站点工具';
$lang['page_tools'] = '页面工具';
$lang['skip_to_content'] = '跳至内容';
+$lang['sidebar'] = '侧边栏';
$lang['mail_newpage'] = '添加页面:';
$lang['mail_changed'] = '更改页面:';
$lang['mail_subscribe_list'] = '命名空间中改变的页面:';
@@ -329,4 +330,3 @@ $lang['media_perm_read'] = '抱歉,您没有足够权限读取这些文
$lang['media_perm_upload'] = '抱歉,您没有足够权限来上传文件。';
$lang['media_update'] = '上传新版本';
$lang['media_restore'] = '恢复这个版本';
-$lang['plugin_install_err'] = '插件安装不正确。重命名插件目录“%s”为“%s”。';