summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/auth/ldap.class.php8
-rw-r--r--inc/common.php2
-rw-r--r--inc/feedcreator.class.php8
-rw-r--r--inc/indexer.php45
-rw-r--r--inc/init.php41
-rw-r--r--inc/lang/ar/subscribermail.txt17
-rw-r--r--inc/lang/az/lang.php2
-rwxr-xr-xinc/lang/az/subscribermail.txt19
-rw-r--r--inc/lang/bg/subscribermail.txt16
-rw-r--r--inc/lang/ca-valencia/subscribermail.txt23
-rw-r--r--inc/lang/ca/subscribermail.txt15
-rw-r--r--inc/lang/cs/subscribermail.txt23
-rw-r--r--inc/lang/da/lang.php14
-rw-r--r--inc/lang/da/subscr_single.txt23
-rw-r--r--inc/lang/da/subscribermail.txt17
-rw-r--r--inc/lang/de-informal/subscribermail.txt23
-rw-r--r--inc/lang/el/subscribermail.txt24
-rw-r--r--inc/lang/eo/subscribermail.txt23
-rw-r--r--inc/lang/es/subscribermail.txt23
-rw-r--r--inc/lang/et/subscribermail.txt17
-rw-r--r--inc/lang/eu/subscribermail.txt13
-rw-r--r--inc/lang/fa/subscribermail.txt21
-rw-r--r--inc/lang/fi/lang.php2
-rw-r--r--inc/lang/fi/stopwords.txt2
-rw-r--r--inc/lang/fi/subscr_list.txt2
-rw-r--r--inc/lang/fi/subscribermail.txt23
-rw-r--r--inc/lang/fo/subscribermail.txt17
-rw-r--r--inc/lang/fr/subscribermail.txt17
-rw-r--r--inc/lang/gl/subscribermail.txt19
-rw-r--r--inc/lang/he/subscribermail.txt17
-rw-r--r--inc/lang/hi/lang.php5
-rw-r--r--inc/lang/hr/subscribermail.txt16
-rw-r--r--inc/lang/hu/subscribermail.txt18
-rw-r--r--inc/lang/id/subscribermail.txt17
-rw-r--r--inc/lang/is/subscribermail.txt23
-rw-r--r--inc/lang/it/subscribermail.txt18
-rw-r--r--inc/lang/ja/lang.php72
-rw-r--r--inc/lang/ja/subscr_digest.txt21
-rw-r--r--inc/lang/ja/subscr_form.txt3
-rw-r--r--inc/lang/ja/subscr_list.txt19
-rw-r--r--inc/lang/ja/subscr_single.txt24
-rw-r--r--inc/lang/ja/subscribermail.txt16
-rw-r--r--inc/lang/ko/subscribermail.txt15
-rw-r--r--inc/lang/ku/subscribermail.txt17
-rw-r--r--inc/lang/la/admin.txt3
-rw-r--r--inc/lang/la/adminplugins.txt1
-rw-r--r--inc/lang/la/backlinks.txt3
-rw-r--r--inc/lang/la/conflict.txt5
-rw-r--r--inc/lang/la/denied.txt3
-rw-r--r--inc/lang/la/diff.txt3
-rw-r--r--inc/lang/la/draft.txt5
-rw-r--r--inc/lang/la/edit.txt1
-rw-r--r--inc/lang/la/editrev.txt2
-rw-r--r--inc/lang/la/index.txt3
-rw-r--r--inc/lang/la/lang.php282
-rw-r--r--inc/lang/la/locked.txt3
-rw-r--r--inc/lang/la/login.txt3
-rw-r--r--inc/lang/la/mailtext.txt16
-rw-r--r--inc/lang/la/newpage.txt3
-rw-r--r--inc/lang/la/norev.txt3
-rw-r--r--inc/lang/la/password.txt10
-rw-r--r--inc/lang/la/preview.txt3
-rw-r--r--inc/lang/la/pwconfirm.txt14
-rw-r--r--inc/lang/la/read.txt1
-rw-r--r--inc/lang/la/recent.txt3
-rw-r--r--inc/lang/la/register.txt3
-rw-r--r--inc/lang/la/registermail.txt14
-rw-r--r--inc/lang/la/resendpwd.txt3
-rw-r--r--inc/lang/la/revisions.txt3
-rw-r--r--inc/lang/la/searchpage.txt5
-rw-r--r--inc/lang/la/showrev.txt2
-rw-r--r--inc/lang/la/stopwords.txt37
-rw-r--r--inc/lang/la/subscr_digest.txt20
-rw-r--r--inc/lang/la/subscr_form.txt3
-rw-r--r--inc/lang/la/subscr_list.txt17
-rw-r--r--inc/lang/la/subscr_single.txt23
-rw-r--r--inc/lang/la/updateprofile.txt3
-rw-r--r--inc/lang/la/uploadmail.txt14
-rw-r--r--inc/lang/lt/subscribermail.txt17
-rw-r--r--inc/lang/lv/subscribermail.txt23
-rw-r--r--inc/lang/mr/subscribermail.txt21
-rw-r--r--inc/lang/ne/subscribermail.txt19
-rw-r--r--inc/lang/nl/subscribermail.txt16
-rw-r--r--inc/lang/no/subscribermail.txt16
-rw-r--r--inc/lang/pl/subscribermail.txt17
-rw-r--r--inc/lang/pt-br/lang.php2
-rw-r--r--inc/lang/pt-br/subscribermail.txt24
-rw-r--r--inc/lang/pt/admin.txt4
-rw-r--r--inc/lang/pt/denied.txt4
-rw-r--r--inc/lang/pt/editrev.txt6
-rw-r--r--inc/lang/pt/index.txt5
-rw-r--r--inc/lang/pt/lang.php80
-rw-r--r--inc/lang/pt/locked.txt4
-rw-r--r--inc/lang/pt/login.txt6
-rw-r--r--inc/lang/pt/newpage.txt6
-rw-r--r--inc/lang/pt/password.txt8
-rw-r--r--inc/lang/pt/preview.txt6
-rw-r--r--inc/lang/pt/read.txt4
-rw-r--r--inc/lang/pt/recent.txt4
-rw-r--r--inc/lang/pt/register.txt8
-rw-r--r--inc/lang/pt/revisions.txt6
-rw-r--r--inc/lang/pt/searchpage.txt4
-rw-r--r--inc/lang/pt/showrev.txt4
-rw-r--r--inc/lang/pt/subscr_digest.txt20
-rw-r--r--inc/lang/pt/subscr_form.txt3
-rw-r--r--inc/lang/pt/subscr_list.txt17
-rw-r--r--inc/lang/pt/subscr_single.txt23
-rw-r--r--inc/lang/pt/subscribermail.txt15
-rw-r--r--inc/lang/pt/uploadmail.txt3
-rw-r--r--inc/lang/ro/subscribermail.txt17
-rw-r--r--inc/lang/ru/subscribermail.txt17
-rw-r--r--inc/lang/sk/subscribermail.txt18
-rw-r--r--inc/lang/sr/subscribermail.txt17
-rw-r--r--inc/lang/sv/subscribermail.txt24
-rw-r--r--inc/lang/th/subscribermail.txt22
-rw-r--r--inc/lang/tr/subscribermail.txt18
-rw-r--r--inc/lang/uk/subscribermail.txt22
-rw-r--r--inc/lang/zh-tw/subscribermail.txt16
-rw-r--r--inc/lang/zh/lang.php74
-rw-r--r--inc/lang/zh/subscr_digest.txt19
-rw-r--r--inc/lang/zh/subscr_form.txt3
-rw-r--r--inc/lang/zh/subscr_list.txt16
-rw-r--r--inc/lang/zh/subscr_single.txt22
-rw-r--r--inc/lang/zh/subscribermail.txt19
-rw-r--r--inc/parser/parser.php4
-rw-r--r--inc/parser/renderer.php4
-rw-r--r--inc/parser/xhtml.php15
-rw-r--r--inc/subscription.php33
128 files changed, 998 insertions, 1094 deletions
diff --git a/inc/auth/ldap.class.php b/inc/auth/ldap.class.php
index 5cc186ce2..7f1eec187 100644
--- a/inc/auth/ldap.class.php
+++ b/inc/auth/ldap.class.php
@@ -222,12 +222,12 @@ class auth_ldap extends auth_basic {
$base = $this->_makeFilter($this->cnf['grouptree'], $user_result);
$filter = $this->_makeFilter($this->cnf['groupfilter'], $user_result);
$sr = $this->_ldapsearch($this->con, $base, $filter, $this->cnf['groupscope'], array($this->cnf['groupkey']));
+ if($this->cnf['debug']){
+ msg('LDAP group search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+ msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__);
+ }
if(!$sr){
msg("LDAP: Reading group memberships failed",-1);
- if($this->cnf['debug']){
- msg('LDAP group search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
- msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__);
- }
return false;
}
$result = ldap_get_entries($this->con, $sr);
diff --git a/inc/common.php b/inc/common.php
index 6af7f49de..3e760419f 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -843,7 +843,7 @@ function parsePageTemplate(&$data) {
// replace placeholders
$file = noNS($id);
- $page = strtr($file,'_',' ');
+ $page = strtr($file, $conf['sepchar'], ' ');
$tpl = str_replace(array(
'@ID@',
diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php
index 68b9bdd2b..8141d867c 100644
--- a/inc/feedcreator.class.php
+++ b/inc/feedcreator.class.php
@@ -50,11 +50,11 @@
* added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
* changed default content-type to application/xml
* added character encoding setting
- * fixed numerous smaller bugs (thanks to Sren Fuhrmann of golem.de)
+ * fixed numerous smaller bugs (thanks to Sören Fuhrmann of golem.de)
* improved changing ATOM versions handling (thanks to August Trometer)
- * improved the UniversalFeedCreator's useCached method (thanks to Sren Fuhrmann of golem.de)
- * added charset output in HTTP headers (thanks to Sren Fuhrmann of golem.de)
- * added Slashdot namespace to RSS 1.0 (thanks to Sren Fuhrmann of golem.de)
+ * improved the UniversalFeedCreator's useCached method (thanks to Sören Fuhrmann of golem.de)
+ * added charset output in HTTP headers (thanks to Sören Fuhrmann of golem.de)
+ * added Slashdot namespace to RSS 1.0 (thanks to Sören Fuhrmann of golem.de)
*
* See www.bitfolge.de for additional changelog info
*/
diff --git a/inc/indexer.php b/inc/indexer.php
index 01ba76b08..f5330040a 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -701,49 +701,4 @@ function idx_tokenizer($string,&$stopwords,$wc=false){
return $words;
}
-/**
- * Create a pagewords index from the existing index.
- *
- * @author Tom N Harris <tnharris@whoopdedo.org>
- */
-function idx_upgradePageWords(){
- global $conf;
- $page_idx = idx_getIndex('page','');
- if (empty($page_idx)) return;
- $pagewords = array();
- $len = count($page_idx);
- for ($n=0;$n<$len;$n++){
- $pagewords[] = array();
- }
- unset($page_idx);
-
- $n=0;
- foreach (idx_indexLengths($n) as $wlen) {
- $lines = idx_getIndex('i',$wlen);
- $len = count($lines);
- for ($wid=0;$wid<$len;$wid++) {
- $wkey = "$wlen*$wid";
- foreach (explode(':',trim($lines[$wid])) as $part) {
- if($part == '') continue;
- list($doc,$cnt) = explode('*',$part);
- $pagewords[(int)$doc][] = $wkey;
- }
- }
- }
-
- $fn = $conf['indexdir'].'/pageword';
- $fh = @fopen($fn.'.tmp','w');
- if (!$fh){
- trigger_error("Failed to write word index", E_USER_ERROR);
- return false;
- }
- foreach ($pagewords as $line){
- fwrite($fh, join(':',$line)."\n");
- }
- fclose($fh);
- if($conf['fperm']) chmod($fn.'.tmp', $conf['fperm']);
- io_rename($fn.'.tmp', $fn.'.idx');
- return true;
-}
-
//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/inc/init.php b/inc/init.php
index b53167e3c..bf7815178 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -200,10 +200,6 @@ init_creationmodes();
init_paths();
init_files();
-// automatic upgrade to script versions of certain files
-scriptify(DOKU_CONF.'users.auth');
-scriptify(DOKU_CONF.'acl.auth');
-
// setup plugin controller class (can be overwritten in preload.php)
$plugin_types = array('admin','syntax','action','renderer', 'helper');
global $plugin_controller_class, $plugin_controller;
@@ -463,43 +459,6 @@ function is_ssl(){
}
/**
- * Append a PHP extension to a given file and adds an exit call
- *
- * This is used to migrate some old configfiles. An added PHP extension
- * ensures the contents are not shown to webusers even if .htaccess files
- * do not work
- *
- * @author Jan Decaluwe <jan@jandecaluwe.com>
- */
-function scriptify($file) {
- // checks
- if (!is_readable($file)) {
- return;
- }
- $fn = $file.'.php';
- if (@file_exists($fn)) {
- return;
- }
- $fh = fopen($fn, 'w');
- if (!$fh) {
- nice_die($fn.' is not writable. Check your permission settings!');
- }
- // write php exit hack first
- fwrite($fh, "# $fn\n");
- fwrite($fh, '# <?php exit()?>'."\n");
- fwrite($fh, "# Don't modify the lines above\n");
- fwrite($fh, "#\n");
- // copy existing lines
- $lines = file($file);
- foreach ($lines as $line){
- fwrite($fh, $line);
- }
- fclose($fh);
- //try to rename the old file
- io_rename($file,"$file.old");
-}
-
-/**
* print a nice message even if no styles are loaded yet.
*/
function nice_die($msg){
diff --git a/inc/lang/ar/subscribermail.txt b/inc/lang/ar/subscribermail.txt
deleted file mode 100644
index c9894570e..000000000
--- a/inc/lang/ar/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-أهلاً!
-
-الصفحة @PAGE@ فى @TITLE@ ويكي تم تعديلها.
-ها هى التعديلات:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-لإلغاء إشتراكك فى تلك الصفحة أدخل على الويكي على العنوان
-@DOKUWIKIURL@ ثم أذهب الى
-@NEWPAGE@
-و أختار 'إلغاء أشتراكك'.
-
---
-تم ارسال هذه الرسالة من دوكيويكي
-@DOKUWIKIURL@
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 8d96f08cc..ca826c8e0 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -5,7 +5,7 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Pasha L. Topchiyev <pasha@itopchiyev.com>
*/
-$lang['encoding'] = ' utf-8';
+$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
$lang['doublequoteopening'] = '«';
$lang['doublequoteclosing'] = '»';
diff --git a/inc/lang/az/subscribermail.txt b/inc/lang/az/subscribermail.txt
deleted file mode 100755
index a18525da6..000000000
--- a/inc/lang/az/subscribermail.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Salam!
-
-@TITLE@ adı wiki-də @PAGE@ adlı səhifə dəyişdirilmişdi.
-Dəyişiklər aşağıda göstərilib:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Bu səhifənin dəyişiklərindən imtina etmək üçün,
-@DOKUWIKIURL@ adresində yerləşən wiki-yə daxil
-olun, @NEWPAGE@ səhifəsinə keçin
-və 'Abunəlikdən çıx' düyməsini sıxın.
-
-
---
-Bu məktub DokuWiki tərəfindən yaradıldı.
-DokuWiki aşağıdakı adresdə yerləşir:
-@DOKUWIKIURL@
diff --git a/inc/lang/bg/subscribermail.txt b/inc/lang/bg/subscribermail.txt
deleted file mode 100644
index 51d4f005a..000000000
--- a/inc/lang/bg/subscribermail.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Привет!
-
-Страницата @PAGE@ в @TITLE@ уиките бе променена.
-Ето промените:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-За да се отпишете от тази страница, влезте в уикито на
-@DOKUWIKIURL@ тогава отидете на
-@NEWPAGE@
-и изберете 'Отписване от промените'.
-
---
-Това писмо е генерирано от DokuWiki на адрес @DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ca-valencia/subscribermail.txt b/inc/lang/ca-valencia/subscribermail.txt
deleted file mode 100644
index 43299b598..000000000
--- a/inc/lang/ca-valencia/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-¡Hola!
-
-La pàgina @PAGE@ del wiki @TITLE@ ha canviat.
-Estos són els canvis:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Data: @DATE@
-Usuari: @USER@
-Resum: @SUMMARY@
-Revisió anterior: @OLDPAGE@
-Nova revisió: @NEWPAGE@
-
-Per a cancelar les notificacions de pàgina, inicie sessió en el wiki en
-@DOKUWIKIURL@, visite
-@NEWPAGE@
-i desubscriga's dels canvis de la pàgina o de l'espai de noms.
-
---
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca/subscribermail.txt b/inc/lang/ca/subscribermail.txt
deleted file mode 100644
index 5558d2ff5..000000000
--- a/inc/lang/ca/subscribermail.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-La pàgina @PAGE@ del wiki @TITLE@ ha estat modificada.
-Heus ací els canvis:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Per cancel·lar la subscripció a aquesta pàgina, entre al wiki en
-@DOKUWIKIURL@, aneu a
-@NEWPAGE@
-i trieu 'Cancel·la subscripció'.
-
---
-Missatge generat per DokuWiki en
-@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/subscribermail.txt b/inc/lang/cs/subscribermail.txt
deleted file mode 100644
index 6ef6411d0..000000000
--- a/inc/lang/cs/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Dobrý den,
-
-Stránka @PAGE@ ve wiki @TITLE@ se změnila.
-Tady jsou detaily:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Datum: @DATE@
-Uživatel: @USER@
-Souhrn úpravy: @SUMMARY@
-Původní revize: @OLDPAGE@
-Nová revize: @NEWPAGE@
-
-
-Pro odhlášení z odběru změn pro tuto stránku se přihlašte do wiki
-@DOKUWIKIURL@ a vstupte na stránku
-@NEWPAGE@, kde stisknete tlačítko "Neodebírat změny mailem".
-
---
-Tato zpráva byla vygenerována systémem DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 574917082..47b42be9d 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -14,7 +14,7 @@
* @author rasmus@kinnerup.com
* @author Michael Pedersen subben@gmail.com
*/
-$lang['encoding'] = 'ISO 8859-1 ';
+$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
$lang['doublequoteopening'] = '„';
$lang['doublequoteclosing'] = '“';
@@ -108,6 +108,7 @@ $lang['js']['mediatitle'] = 'Link indstillinger';
$lang['js']['mediadisplay'] = 'Link type';
$lang['js']['mediaalign'] = 'Juster';
$lang['js']['mediasize'] = 'Billede størrelse';
+$lang['js']['mediatarget'] = 'Link mål';
$lang['js']['mediaclose'] = 'Luk';
$lang['js']['mediainsert'] = 'Indsæt';
$lang['js']['mediadisplayimg'] = 'Vis billedet';
@@ -116,6 +117,7 @@ $lang['js']['mediasmall'] = 'Lille version';
$lang['js']['mediamedium'] = 'Medium version';
$lang['js']['medialarge'] = 'Stor version';
$lang['js']['mediaoriginal'] = 'Original version';
+$lang['js']['medialnk'] = 'Link til detajle side';
$lang['js']['mediadirect'] = 'Direkte link til originalen';
$lang['js']['medianolnk'] = 'Intet link';
$lang['js']['medianolink'] = 'Link ikke billedet';
@@ -146,6 +148,7 @@ $lang['deletefail'] = '"%s" kunne ikke slettes - check rettighederne.
$lang['mediainuse'] = 'Filen "%s" er ikke slettet - den er stadig i brug.';
$lang['namespaces'] = 'Navnerum';
$lang['mediafiles'] = 'Tilgængelige filer i';
+$lang['accessdenied'] = 'Du har ikke tilladelse til at se denne side';
$lang['mediausage'] = 'Brug den følgende syntaks til at henvise til denne fil:';
$lang['mediaview'] = 'Vis oprindelig fil';
$lang['mediaroot'] = 'rod';
@@ -161,6 +164,7 @@ $lang['current'] = 'nuværende';
$lang['yours'] = 'Din version';
$lang['diff'] = 'Vis forskelle i forhold til den nuværende udgave';
$lang['diff2'] = 'Vis forskelle i forhold til de valgte revisioner';
+$lang['difflink'] = 'Link til denne sammenlinings vising';
$lang['line'] = 'Linje';
$lang['breadcrumb'] = 'Sti';
$lang['youarehere'] = 'Du er her';
@@ -220,8 +224,16 @@ $lang['img_camera'] = 'Kamera';
$lang['img_keywords'] = 'Emneord';
$lang['subscr_subscribe_success'] = 'Tilføjede %s til abonnement listen for %s';
$lang['subscr_subscribe_error'] = 'Fejl ved tilføjelse af %s til abonnement listen for %s';
+$lang['subscr_subscribe_noaddress'] = 'Der er ikke nogen addresse forbundet til din bruger, så du kan ikke blive tilføjet til abonnement listen';
$lang['subscr_unsubscribe_success'] = 'Fjernede %s fra abonnement listen for %s';
$lang['subscr_unsubscribe_error'] = 'Fejl ved fjernelse af %s fra abonnement listen for %s';
+$lang['subscr_already_subscribed'] = '%s har allerede et abonnement for listen %s';
+$lang['subscr_not_subscribed'] = '%s har ikke et abonnement for listen %s';
+$lang['subscr_m_not_subscribed'] = 'Du har ikke et abonnement til denne side eller navnerum';
+$lang['subscr_m_new_header'] = 'Tilføj abonnement';
+$lang['subscr_m_current_header'] = 'Nuværende abonnementer';
+$lang['subscr_m_unsubscribe'] = 'Fjern abonnement';
+$lang['subscr_m_subscribe'] = 'Abonér';
$lang['subscr_m_receive'] = 'Modtag';
$lang['subscr_style_every'] = 'email på hver ændring';
$lang['subscr_style_list'] = 'list af ændrede sider siden sidste email (hver %.2f dage)';
diff --git a/inc/lang/da/subscr_single.txt b/inc/lang/da/subscr_single.txt
new file mode 100644
index 000000000..64b14588c
--- /dev/null
+++ b/inc/lang/da/subscr_single.txt
@@ -0,0 +1,23 @@
+Hej!
+
+Siden @PAGE@ i wikien @TITLE@ er blevet ændret.
+Her er ændringerne:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Bruger : @USER@
+Summering: @SUMMARY@
+Gammel Revision: @OLDPAGE@
+Ny Revision: @NEWPAGE@
+
+For at slå side notifikationer fra, skal du logge ind på
+@DOKUWIKIURL@ og besøge
+@NEWPAGE@
+og slå abonnoment for side / navnerum ændringer fra.
+
+--
+Denne email blev generet af DokuWiki på
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/da/subscribermail.txt b/inc/lang/da/subscribermail.txt
deleted file mode 100644
index e89dd3c46..000000000
--- a/inc/lang/da/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Hej!
-
-Siden @PAGE@ i @TITLE@ wikien er blevet ændret.
-Her er detaljerne:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-For at afmelde abonnement på denne side log ind på wikien på
-@DOKUWIKIURL@ , besøg
-@NEWPAGE@
-og vælg 'Fjern abonnement på ændringer'.
-
---
-Denne e-mail blev genereret af DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/de-informal/subscribermail.txt b/inc/lang/de-informal/subscribermail.txt
deleted file mode 100644
index 952ac911e..000000000
--- a/inc/lang/de-informal/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hallo!
-
-Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
-Das sind die Änderungen:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Datum : @DATE@
-Benutzer : @USER@
-Übersicht: @SUMMARY@
-Alte Revision: @OLDPAGE@
-Neue Revision: @NEWPAGE@
-
-Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
-@DOKUWIKIURL@, besuche dann
-@NEWPAGE@
-und klicke auf die Taste 'Änderungen abbestellen'.
-
---
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/el/subscribermail.txt b/inc/lang/el/subscribermail.txt
deleted file mode 100644
index 2963ef348..000000000
--- a/inc/lang/el/subscribermail.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Γειa σας!
-
-Η σελίδα @PAGE@ στο wiki @TITLE@ τροποποιήθηκε.
-Αυτές είναι οι διαφορές σε σχέση με την προηγούμενη έκδοση:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Ημερομηνία: @DATE@
-Χρήστης: @USER@
-Περίληψη τροποποίησης: @SUMMARY@
-Παλιά έκδοση: @OLDPAGE@
-Νέα έκδοση: @NEWPAGE@
-
-Για να πάψετε να λαμβάνετε τέτοια ενημερωτικά e-mails,
-επισκεφτείτε το wiki στο
-@DOKUWIKIURL@ δείτε την σελίδα
-@NEWPAGE@
-και επιλέξτε 'Διαγραφή από λήψη ενημερώσεων'.
-
---
-Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
-@DOKUWIKIURL@
diff --git a/inc/lang/eo/subscribermail.txt b/inc/lang/eo/subscribermail.txt
deleted file mode 100644
index 074a99351..000000000
--- a/inc/lang/eo/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Saluton!
-
-La retpaĝo @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
-Jen la ŝanĝoj:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Dato : @DATE@
-Uzanto : @USER@
-Modifa rezumo: @SUMMARY@
-Malnova revizio: @OLDPAGE@
-Nova revizio: @NEWPAGE@
-
-Por nuligi la avizojn pri paĝoŝanĝoj, ensalutu en la vikio ĉe
-@DOKUWIKIURL@ kaj aliru
-@NEWPAGE@
-kaj malaliĝu al avizoj pri paĝaj kaj/aŭ nomspacaj ŝanĝoj.
-
---
-Tiu ĉi mesaĝo estis kreita de DokuWiki ĉe
-@DOKUWIKIURL@
diff --git a/inc/lang/es/subscribermail.txt b/inc/lang/es/subscribermail.txt
deleted file mode 100644
index 05be8557a..000000000
--- a/inc/lang/es/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-¡Hola!
-
-La página @PAGE@ en el wiki @TITLE@ ha cambiado.
-Los cambios son los siguientes:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Fecha : @DATE@
-Usuario : @USER@
-Resumen de la edición: @SUMMARY@
-Revisión vieja: @OLDPAGE@
-Revisión nueva: @NEWPAGE@
-
-Para cacelar las notificaciones, ingresa al wiki
-en @DOKUWIKIURL@ y luego visita la página
-@NEWPAGE@
-y elige 'Cancelar suscripción'.
-
---
-Este mail fue generado por DokuWiki en
-@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/et/subscribermail.txt b/inc/lang/et/subscribermail.txt
deleted file mode 100644
index 76ce2845f..000000000
--- a/inc/lang/et/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Tere!
-
-Lehekülg @PAGE@ on muutunud (@TITLE@).
-Siin on muudatused:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Selle lehe jälgimisest loobumiseks logi wikisse sisse
-@DOKUWIKIURL@ ja siis külasta
-@NEWPAGE@
-ning vali sealt 'Lõpeta jälgimine'.
-
---
-See meil on saadetud DokuWiki poolt
-@DOKUWIKIURL@
diff --git a/inc/lang/eu/subscribermail.txt b/inc/lang/eu/subscribermail.txt
deleted file mode 100644
index 9e5503a8b..000000000
--- a/inc/lang/eu/subscribermail.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Kaixo!
-
-@PAGE@ orria @TITLE@ wikian aldatua izan da.
-Hona hemen aldaketak:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Orri jakinarazpenak ezeztatzeko, hasi saioa @DOKUWIKIURL@ wikian, bisitatu @NEWPAGE@ eta orriaren eta/edo izen-espazioaren harpidetza utzi.
-
---
-Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da. \ No newline at end of file
diff --git a/inc/lang/fa/subscribermail.txt b/inc/lang/fa/subscribermail.txt
deleted file mode 100644
index 140f2e3e0..000000000
--- a/inc/lang/fa/subscribermail.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-درود!
-
-صفحه‌ی @PAGE@ با عنوان @TITLE@ تغییر کرد.
-تغییرات عبارتند از:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-تاریخ: @DATE@
-کاربر: @USER@
-خلاصه‌ی ویرایش: @SUMMARY@
-نگارش پیشین: @OLDPAGE@
-نگارش تازه: @NEWPAGE@
-
-برای لغو دریافت پیام‌های آگاهی دهنده، وارد ویکی به آدرس
-@DOKUWIKIURL@ شده و سپس به صفحه‌ی @NEWPAGE@ بروید
-و از عضویت صفحه یا فضای‌نام خارج شوید.
-
---
-این ایمیل توسط DokuWiki به آدرس @DOKUWIKIURL@ ایجاد شده است. \ No newline at end of file
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index e91a1d497..2b1ddfa6f 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -270,7 +270,7 @@ $lang['mu_fail'] = 'epäonnistui';
$lang['mu_authfail'] = 'istunto on vanhentunut';
$lang['mu_progress'] = '@PCT@% lähetetty';
$lang['mu_filetypes'] = 'Sallitut tyypit';
-$lang['mu_info'] = 'tiedstoa ladattu.';
+$lang['mu_info'] = 'tiedostoa ladattu.';
$lang['mu_lasterr'] = 'Edellinen virhe:';
$lang['recent_global'] = 'Seuraat tällä hetkellä muutoksia nimiavaruuden <b>%s</b> sisällä. Voit myös <a href="%s">katsoa muutoksia koko wikissä</a>';
$lang['years'] = '%d vuotta sitten';
diff --git a/inc/lang/fi/stopwords.txt b/inc/lang/fi/stopwords.txt
index f92fe70cc..82d3daa44 100644
--- a/inc/lang/fi/stopwords.txt
+++ b/inc/lang/fi/stopwords.txt
@@ -1,7 +1,7 @@
# Tämä on lista sanoista, jotka indeksoija ohittaa. Yksi sana riviä kohti
# Kun muokkaat sivua, varmista että käytät UNIX rivinvaihtoa (yksi newline)
# Ei tarvitse lisätä alle kolmen merkin sanoja. NE ohitetaan automaattisesti.
-# Jos wikissäsin muita kieliä, lisää sanoja listaan esim sivulta http://www.ranks.nl/stopwords/
+# Jos wikissäsin muita kieliä, lisää sanoja listaan esimerkiksi sivulta http://www.ranks.nl/stopwords/
www
eli
tai
diff --git a/inc/lang/fi/subscr_list.txt b/inc/lang/fi/subscr_list.txt
index 47ee1b155..cd39014e8 100644
--- a/inc/lang/fi/subscr_list.txt
+++ b/inc/lang/fi/subscr_list.txt
@@ -7,7 +7,7 @@ Tässä ovat muuttuneet sivut:
@DIFF@
--------------------------------------------------------
-Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+Peruuttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
@DOKUWIKIURL@ , jonka jälkeen katso
@SUBSCRIBE@
ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
diff --git a/inc/lang/fi/subscribermail.txt b/inc/lang/fi/subscribermail.txt
deleted file mode 100644
index d1c5d9138..000000000
--- a/inc/lang/fi/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hei!
-
-Sivua @PAGE@ wiki-sivustolla @TITLE@ on muokattu.
-Tässä muutokset:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Päivä : @DATE@
-Käyttäjä : @USER@
-Yhteenveto: @SUMMARY@
-Vanha revisio: @OLDPAGE@
-Uusi revisio: @NEWPAGE@
-
-Poistaaksesi sivun seurannan, kirjaudu wikiin osoitteessa
-@DOKUWIKIURL@ ja siirry sivulle
-@NEWPAGE@
-ja valitse 'Lopeta sivun ja/tai nimiavaruuden tarkkailu'.
-
---
-Tämän viestin generoi DokuWiki osoitteessa
-@DOKUWIKIURL@
diff --git a/inc/lang/fo/subscribermail.txt b/inc/lang/fo/subscribermail.txt
deleted file mode 100644
index 4dca0cda5..000000000
--- a/inc/lang/fo/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Hey!
-
-Síðan @PAGE@ á @TITLE@ wikiuni er blivin broytt.
-Her eru ein lýsing:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Fyri at avmelda broytinga upplýsingar fyri hesa síðu rita inn á wikiuna á
-@DOKUWIKIURL@ , vitja
-@NEWPAGE@
-og vel 'Strika til melda broytingar'.
-
---
-Hesin t-postur var skaptur av DokuWiki á:
-@DOKUWIKIURL@
diff --git a/inc/lang/fr/subscribermail.txt b/inc/lang/fr/subscribermail.txt
deleted file mode 100644
index 514f9cf5d..000000000
--- a/inc/lang/fr/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Bonjour !
-
-La page @PAGE@ dans le wiki @TITLE@ a changé.
-Voici les modifications :
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Pour vous désabonner de cette page, connectez vous via
-@DOKUWIKIURL@ et visualisez la page
-@NEWPAGE@
-puis choisissez 'Ne pas notifier les modifications'.
-
---
-Ce message a été généré par Dokuwiki
-@DOKUWIKIURL@
diff --git a/inc/lang/gl/subscribermail.txt b/inc/lang/gl/subscribermail.txt
deleted file mode 100644
index 0b1c3a662..000000000
--- a/inc/lang/gl/subscribermail.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Ola!
-
-A páxina @PAGE@ na wiki @TITLE@ foi mudada.
-Aquí van as modificacións:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Para desubscribirte deste rexistro de cambios de páxina
-na wiki en
-@DOKUWIKIURL@
-fai unha visita a
-@NEWPAGE@
-e selecciona 'Non avisar dos cambios'.
-
---
-Este correo foi xerado polo DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/he/subscribermail.txt b/inc/lang/he/subscribermail.txt
deleted file mode 100644
index 7b05c4f47..000000000
--- a/inc/lang/he/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-שלום!
-
-הדף @PAGE@ בויקי @TITLE@ השתנה.
-הנה השינויים:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-כדי להפסיק את ההרשמה לדף זה יש להכנס לויקי ב-
-@DOKUWIKIURL@ לבקר בדף
-@NEWPAGE@
-ולבחור 'הפסק לעקוב'.
-
---
-דוא"ל זה נוצר על ידי DokuWiki ב-
-@DOKUWIKIURL@
diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php
index 044d7d5a4..b8af3becd 100644
--- a/inc/lang/hi/lang.php
+++ b/inc/lang/hi/lang.php
@@ -9,6 +9,7 @@
*
* @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesHi.php?view=co
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -41,6 +42,8 @@ $lang['btn_delete'] = 'मिटाना';
$lang['btn_back'] = 'पीछे';
$lang['btn_backlink'] = 'पिछली कड़ियाँ';
$lang['btn_backtomedia'] = 'मीडिया फाइल चयन पर पीछे जायें';
+$lang['btn_subscribe'] = 'सदस्यता प्रबंधन';
+$lang['btn_profile'] = 'परिचय संपादित करें';
$lang['user'] = 'उपयोगकर्ता का नाम';
$lang['pass'] = 'गुप्त शब्द';
$lang['newpass'] = 'नव गुप्त शब्द';
@@ -64,10 +67,10 @@ $lang['txt_filename'] = 'के रूप में अपलोड क
$lang['txt_overwrt'] = 'अधिलेखित उपस्थित फ़ाइल';
$lang['lockedby'] = 'इस समय तक बंद';
$lang['lockexpire'] = 'बंद समाप्त होगा';
+$lang['js']['hidedetails'] = 'विवरण छिपाएँ';
$lang['nothingfound'] = 'कुच्छ नहीं मिला |';
$lang['uploadexist'] = 'फ़ाइल पहले से उपस्थित है. कुछ भी नहीं किया |';
$lang['mediafiles'] = 'उपलब्ध फाइलों में';
-$lang['js']['hidedetails'] = 'विवरण छिपाएँ';
$lang['mediaview'] = 'मूल फ़ाइल देखें';
$lang['reference'] = 'संदर्भ के लिए';
$lang['ref_hidden'] = 'कुच्छ संदर्भ उन पन्नो पर हैं जिनको पड़ने की आपको अनुमति नहीं है|';
diff --git a/inc/lang/hr/subscribermail.txt b/inc/lang/hr/subscribermail.txt
deleted file mode 100644
index c55b4a288..000000000
--- a/inc/lang/hr/subscribermail.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Pozdrav!
-
-Stranica @PAGE@ na @TITLE@ je promijenjena.
-Slijede promjene:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Ukoliko se želite odjaviti s ove pretplate - prijavite se na:
-@DOKUWIKIURL@ zatim odite na
-@NEWPAGE@
-i odaberite 'Odjava'.
-
---
-@DOKUWIKIURL@
diff --git a/inc/lang/hu/subscribermail.txt b/inc/lang/hu/subscribermail.txt
deleted file mode 100644
index a5e8c96d1..000000000
--- a/inc/lang/hu/subscribermail.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Szia!
-
-A(z) @PAGE@ oldal a(z) @TITLE@ wikiben megváltozott.
-Itt vannak a változások:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Ha le szeretnél iratkozni ennek az oldalnak a változás-követéséről,
-lépj be a wikibe ezen a címen:
-@DOKUWIKIURL@, majd keresd meg a(z)
-@NEWPAGE@ oldalt
-és válaszd a 'Oldalváltozások-hírlevél leiratkozás' gombot.
-
---
-Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki alkalmazás generálta.
-
diff --git a/inc/lang/id/subscribermail.txt b/inc/lang/id/subscribermail.txt
deleted file mode 100644
index dc04df29a..000000000
--- a/inc/lang/id/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Halo Dunia!
-
-Halaman @PAGE@ di @TITLE@ wiki telah berubah.
-Perubahannya adalah sebagai berikut:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Untuk unsubscribe dari halaman ini, silahkan login ke wiki di
-@DOKUWIKIURL@ lalu buka
-@NEWPAGE@
-dan pilih 'Unsubscribe Changes'.
-
---
-Email ini telah digenerate oleh DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/is/subscribermail.txt b/inc/lang/is/subscribermail.txt
deleted file mode 100644
index 57e5faf86..000000000
--- a/inc/lang/is/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hæ
-
-@PAGE@ síðan í @TITLE@ hefur breyst.
-Hér eru breytingarnar:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Dagsetning : @DATE@
-Notandi : @USER@
-Samantekt : @SUMMARY@
-Eldri útgáfa: @OLDPAGE@
-Ný útgáfa: @NEWPAGE@
-
-Ef þú vilt ekki lengur fá tilkynningar um breytingar á síðum, skráðu þig þá inn á
-@DOKUWIKIURL@, heimsóttu síðan
-@NEWPAGE@
-og afskráðu þig af tilkynningum fyrir síður og/ eða rými fyrir heiti.
-
---
-Pósturinn var myndaður af DokuWiki að
-@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/it/subscribermail.txt b/inc/lang/it/subscribermail.txt
deleted file mode 100644
index a211ef2e5..000000000
--- a/inc/lang/it/subscribermail.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Ciao!
-
-La pagina @PAGE@ di @TITLE@ wiki è stata aggiornata.
-Qui sotto sono elencate le modifiche apportate:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Per cancellare la tua sottoscrizione alla lista di controllo
-per questa pagina collegati al wiki
-@DOKUWIKIURL@ poi spostati su
-@NEWPAGE@
-e seleziona 'Cancella sottoscrizione'.
-
---
-Questa email è stata generata da DokuWiki su
-@DOKUWIKIURL@
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index ad76e5bf0..d9c02764a 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -40,9 +40,6 @@ $lang['btn_back'] = '戻る';
$lang['btn_backlink'] = 'バックリンク';
$lang['btn_backtomedia'] = 'メディアファイル選択に戻る';
$lang['btn_subscribe'] = '変更履歴配信の登録';
-$lang['btn_unsubscribe'] = '変更履歴配信の解除';
-$lang['btn_subscribens'] = '名前空間変更配信の登録';
-$lang['btn_unsubscribens'] = '名前空間変更配信の解除';
$lang['btn_profile'] = 'ユーザー情報の更新';
$lang['btn_reset'] = 'リセット';
$lang['btn_resendpwd'] = 'パスワード再発行';
@@ -96,8 +93,38 @@ $lang['txt_overwrt'] = '既存のファイルを上書き';
$lang['lockedby'] = 'この文書は次のユーザによってロックされています';
$lang['lockexpire'] = 'ロック期限:';
$lang['willexpire'] = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
-$lang['js']['notsavedyet'] = "変更は保存されません。このまま処理を続けてよろしいですか?";
-$lang['rssfailed'] = 'RSSの取り出しに失敗しました:';
+$lang['js']['notsavedyet'] = '変更は保存されません。このまま処理を続けてよろしいですか?';
+$lang['js']['searchmedia'] = 'ファイル検索';
+$lang['js']['keepopen'] = '選択中はウィンドウを閉じない';
+$lang['js']['hidedetails'] = '詳細を非表示';
+$lang['js']['mediatitle'] = 'リンク設定';
+$lang['js']['mediadisplay'] = 'リンクタイプ';
+$lang['js']['mediaalign'] = '位置';
+$lang['js']['mediasize'] = 'イメージサイズ';
+$lang['js']['mediatarget'] = 'リンク先';
+$lang['js']['mediaclose'] = '閉じる';
+$lang['js']['mediainsert'] = '挿入';
+$lang['js']['mediadisplayimg'] = 'イメージを表示';
+$lang['js']['mediadisplaylnk'] = 'リンクのみ表示';
+$lang['js']['mediasmall'] = '小さいサイズ';
+$lang['js']['mediamedium'] = '通常サイズ';
+$lang['js']['medialarge'] = '大きいサイズ';
+$lang['js']['mediaoriginal'] = 'オリジナルのサイズ';
+$lang['js']['medialnk'] = '詳細ページへのリンク';
+$lang['js']['mediadirect'] = 'オリジナルへの直リンク';
+$lang['js']['medianolnk'] = 'リンク無し';
+$lang['js']['medianolink'] = 'イメージをリンクしない';
+$lang['js']['medialeft'] = 'イメージを左に寄せる';
+$lang['js']['mediaright'] = 'イメージを右に寄せる';
+$lang['js']['mediacenter'] = 'イメージを中央に寄せる';
+$lang['js']['medianoalign'] = '位置を設定しない';
+$lang['js']['nosmblinks'] = 'ウィンドウズの共有フォルダへリンクは Microsoft Internet Explorer でのみ可能となります。
+当然、カットアンドペーストが使用できます。';
+$lang['js']['linkwiz'] = 'リンクウィザード';
+$lang['js']['linkto'] = 'リンク先:';
+$lang['js']['del_confirm'] = '選択した項目を本当に削除しますか?';
+$lang['js']['mu_btn'] = '複数のファイルを一度にアップロード';
+$lang['rssfailed'] = 'RSSの取得に失敗しました:';
$lang['nothingfound'] = '該当文書はありませんでした。';
$lang['mediaselect'] = 'メディアファイルを選択';
$lang['fileupload'] = 'メディアファイルをアップロード';
@@ -114,15 +141,7 @@ $lang['deletefail'] = 'ファイル "%s" が削除できません。
$lang['mediainuse'] = 'ファイル "%s" は使用中のため、削除されませんでした。';
$lang['namespaces'] = '名前空間';
$lang['mediafiles'] = '有効なファイル:';
-$lang['js']['searchmedia'] = 'ファイル検索';
-$lang['js']['keepopen'] = '選択中はウィンドウを閉じない';
-$lang['js']['hidedetails'] = '詳細を非表示';
-$lang['js']['nosmblinks'] = 'ウィンドウズの共有フォルダへリンクは Microsoft Internet Explorer でのみ可能となります。
-当然、カットアンドペーストが使用できます。';
-$lang['js']['linkwiz'] = 'リンクウィザード';
-$lang['js']['linkto'] = 'リンク先:';
-$lang['js']['del_confirm'] = '選択した項目を本当に削除しますか?';
-$lang['js']['mu_btn'] = '複数のファイルを一度にアップロード';
+$lang['accessdenied'] = 'このページを閲覧する権限がありません。';
$lang['mediausage'] = 'このファイルを使用するためには次の文法を使用する:';
$lang['mediaview'] = 'オリジナルファイルを閲覧';
$lang['mediaroot'] = 'ルート';
@@ -138,6 +157,7 @@ $lang['current'] = '現在';
$lang['yours'] = 'あなたのバージョン';
$lang['diff'] = '現在のリビジョンとの差分を表示';
$lang['diff2'] = '選択したリビジョン間の差分を表示';
+$lang['difflink'] = 'この比較画面にリンクする';
$lang['line'] = 'ライン';
$lang['breadcrumb'] = 'トレース';
$lang['youarehere'] = '現在位置';
@@ -152,6 +172,7 @@ $lang['noflash'] = 'この内容を表示するためには <a hre
$lang['download'] = 'この部分をダウンロード';
$lang['mail_newpage'] = '文書の追加:';
$lang['mail_changed'] = '文書の変更:';
+$lang['mail_subscribe_list'] = '名前空間内でページが変更:';
$lang['mail_new_user'] = '新規ユーザー:';
$lang['mail_upload'] = 'ファイルのアップロード:';
$lang['qb_bold'] = '太字';
@@ -194,11 +215,22 @@ $lang['img_copyr'] = '著作権';
$lang['img_format'] = 'フォーマット';
$lang['img_camera'] = '使用カメラ';
$lang['img_keywords'] = 'キーワード';
-$lang['subscribe_success'] = '変更履歴配信の登録が完了しました。';
-$lang['subscribe_error'] = '変更履歴配信の登録に失敗しました。';
-$lang['subscribe_noaddress'] = 'ログインしていないため、変更履歴配信に登録することはできません。';
-$lang['unsubscribe_success'] = '変更履歴配信の解除が完了しました。';
-$lang['unsubscribe_error'] = '変更履歴配信の解除に失敗しました。';
+$lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。';
+$lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。';
+$lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。';
+$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_new_header'] = '購読を追加';
+$lang['subscr_m_current_header'] = '現在の購読リスト';
+$lang['subscr_m_unsubscribe'] = '購読を解除';
+$lang['subscr_m_subscribe'] = '購読';
+$lang['subscr_m_receive'] = '受信';
+$lang['subscr_style_every'] = '全ての変更にメールを送信';
+$lang['subscr_style_digest'] = 'それぞれのページへの変更の要約をメールする(%.2f 日毎)';
+$lang['subscr_style_list'] = '前回のメールから変更されたページをリスト(%.2f 日毎)';
$lang['authmodfailed'] = 'ユーザー認証の設定が正しくありません。Wikiの管理者に連絡して下さい。';
$lang['authtempfail'] = 'ユーザー認証が一時的に使用できなくなっています。この状態が続いているようであれば、Wikiの管理者に連絡して下さい。';
$lang['i_chooselang'] = '使用言語を選択してください';
@@ -224,6 +256,7 @@ $lang['i_pol0'] = 'オープン Wiki(全ての人に、閲覧
$lang['i_pol1'] = 'パブリック Wiki(閲覧は全ての人が可能、書き込み・アップロードは登録ユーザーのみ)';
$lang['i_pol2'] = 'クローズド Wiki (登録ユーザーにのみ使用を許可)';
$lang['i_retry'] = '再試行';
+$lang['i_license'] = 'あなたが作成したコンテンツが属するライセンスを選択してください:';
$lang['mu_intro'] = '複数のファイルを一度にアップロードできます。ブラウズボタンをクリックしてファイルを追加してください。追加したら、アップロードボタンをクリックしてください。';
$lang['mu_gridname'] = 'ファイル名';
$lang['mu_gridsize'] = 'サイズ';
@@ -247,3 +280,4 @@ $lang['days'] = '%d日前';
$lang['hours'] = '%d時間前';
$lang['minutes'] = '%d分前';
$lang['seconds'] = '%d秒前';
+$lang['wordblock'] = 'スパムと認識されるテキストが含まれているため、変更は保存されませんでした。';
diff --git a/inc/lang/ja/subscr_digest.txt b/inc/lang/ja/subscr_digest.txt
new file mode 100644
index 000000000..ff5fc8d47
--- /dev/null
+++ b/inc/lang/ja/subscr_digest.txt
@@ -0,0 +1,21 @@
+こんにちは。
+
+@TITLE@ 内のページ @PAGE@ は変更されました。
+変更点は以下の通りです:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+古いリビジョン: @OLDPAGE@
+新しいリビジョン: @NEWPAGE@
+
+この通知を解除するには次のウィキへログインし
+@DOKUWIKIURL@
+その後、
+@SUBSCRIBE@
+ページと名前空間の変更に対する購読を解除してください。
+
+--
+このメールは次の DokuWiki によって生成されました:
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ja/subscr_form.txt b/inc/lang/ja/subscr_form.txt
new file mode 100644
index 000000000..5767189fd
--- /dev/null
+++ b/inc/lang/ja/subscr_form.txt
@@ -0,0 +1,3 @@
+====== 購読管理 ======
+
+このページで、現在のページと名前空間に対する購読を管理することができます。 \ No newline at end of file
diff --git a/inc/lang/ja/subscr_list.txt b/inc/lang/ja/subscr_list.txt
new file mode 100644
index 000000000..0d225af58
--- /dev/null
+++ b/inc/lang/ja/subscr_list.txt
@@ -0,0 +1,19 @@
+こんにちは。
+
+@TITLE@ の 名前空間 @PAGE@ にあるページが変更されました。
+変更点は以下の通りです:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+
+この通知を解除するには次のウィキへログインし
+@DOKUWIKIURL@
+その後、
+@SUBSCRIBE@
+ページと名前空間の変更に対する購読を解除してください。
+
+--
+このメールは次の DokuWiki によって生成されました:
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ja/subscr_single.txt b/inc/lang/ja/subscr_single.txt
new file mode 100644
index 000000000..b02352238
--- /dev/null
+++ b/inc/lang/ja/subscr_single.txt
@@ -0,0 +1,24 @@
+こんにちは。
+
+@TITLE@ のウィキにあるページ @PAGE@ が変更されました。
+変更点は以下の通りです:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+日付 : @DATE@
+ユーザー : @USER@
+変更概要: @SUMMARY@
+古いリビジョン: @OLDPAGE@
+新しいリビジョン: @NEWPAGE@
+
+この通知を解除するには次のウィキへログインし
+@DOKUWIKIURL@
+その後、
+@SUBSCRIBE@
+ページと名前空間の変更に対する購読を解除してください。
+
+--
+このメールは次の DokuWiki によって生成されました:
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ja/subscribermail.txt b/inc/lang/ja/subscribermail.txt
deleted file mode 100644
index d18ffe36d..000000000
--- a/inc/lang/ja/subscribermail.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-こんにちは
-
-@TITLE@ 内のページ @PAGE@ は変更されました。
-変更内容は以下の通りです。
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-ページ変更履歴配信サービスの解除は、
-@DOKUWIKIURL@ の @NEWPAGE@
-にある'変更履歴配信の解除'で行うことができます。
-
---
-このメールは次のDokuWikiより自動的に送信されています。
-@DOKUWIKIURL@
diff --git a/inc/lang/ko/subscribermail.txt b/inc/lang/ko/subscribermail.txt
deleted file mode 100644
index 9bd0d9011..000000000
--- a/inc/lang/ko/subscribermail.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-안녕하세요!
-
-@TITLE@ 위키의 @PAGE@ 페이지가 변경됬습니다.
-
-변경 내용은 아래와 같습니다.
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-@DOKUWIKIURL@의 이 페이지 구독신청을 해지하려면 @NEWPAGE@를 방문하여
-'구독신청 해지'를 선택하세요.
-
---
-
-@DOKUWIKIURL@의 DokuWiki가 자동으로 만들어낸 메일입니다.
diff --git a/inc/lang/ku/subscribermail.txt b/inc/lang/ku/subscribermail.txt
deleted file mode 100644
index 0c8c2637f..000000000
--- a/inc/lang/ku/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Hello!
-
-The page @PAGE@ in the @TITLE@ wiki changed.
-Here are the changes:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-To unsubscribe from this page log into the wiki at
-@DOKUWIKIURL@ then visit
-@NEWPAGE@
-and choose 'Unsubscribe Changes'.
-
---
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/la/admin.txt b/inc/lang/la/admin.txt
new file mode 100644
index 000000000..a8e380280
--- /dev/null
+++ b/inc/lang/la/admin.txt
@@ -0,0 +1,3 @@
+====== Administratio ======
+
+In hac pagina administratio uicis est. \ No newline at end of file
diff --git a/inc/lang/la/adminplugins.txt b/inc/lang/la/adminplugins.txt
new file mode 100644
index 000000000..9f2ec47aa
--- /dev/null
+++ b/inc/lang/la/adminplugins.txt
@@ -0,0 +1 @@
+===== Addenda alia ===== \ No newline at end of file
diff --git a/inc/lang/la/backlinks.txt b/inc/lang/la/backlinks.txt
new file mode 100644
index 000000000..b3c0d131c
--- /dev/null
+++ b/inc/lang/la/backlinks.txt
@@ -0,0 +1,3 @@
+====== Nexa ======
+
+Index paginarum, quae ad hanc paginam connexae sunt.
diff --git a/inc/lang/la/conflict.txt b/inc/lang/la/conflict.txt
new file mode 100644
index 000000000..3d1f66ab6
--- /dev/null
+++ b/inc/lang/la/conflict.txt
@@ -0,0 +1,5 @@
+====== Recentior uersio est ======
+
+Recentior uersio est: nam dum hanc paginam recensibas, aliquis paginam mutauit.
+
+Discrimina uides et uersionem seruandam eligis. Alia uersio delebitur. \ No newline at end of file
diff --git a/inc/lang/la/denied.txt b/inc/lang/la/denied.txt
new file mode 100644
index 000000000..fdb62f53e
--- /dev/null
+++ b/inc/lang/la/denied.txt
@@ -0,0 +1,3 @@
+====== Ad hanc paginam accedere non potes ======
+
+Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas \ No newline at end of file
diff --git a/inc/lang/la/diff.txt b/inc/lang/la/diff.txt
new file mode 100644
index 000000000..ead382715
--- /dev/null
+++ b/inc/lang/la/diff.txt
@@ -0,0 +1,3 @@
+====== Discrimina ======
+
+Discrimina inter duas paginas ostendere \ No newline at end of file
diff --git a/inc/lang/la/draft.txt b/inc/lang/la/draft.txt
new file mode 100644
index 000000000..23bb20fe2
--- /dev/null
+++ b/inc/lang/la/draft.txt
@@ -0,0 +1,5 @@
+====== Propositum inuentum ======
+
+Tua extrema recensio non perfecta est. Vicis propositum in itinere seruauit, sic his seruatis uteris.
+
+Statuas si //restituere// uis, //delere// seruata aut //delere// omnes. \ No newline at end of file
diff --git a/inc/lang/la/edit.txt b/inc/lang/la/edit.txt
new file mode 100644
index 000000000..342b30726
--- /dev/null
+++ b/inc/lang/la/edit.txt
@@ -0,0 +1 @@
+Paginam recensere et "Serua" premere. Vide [[wiki:syntax]] ut uicis stilus uidere possis. Hanc paginam recenses, solum si hanc auges. Prima uestigia apud hunc nexum [[playground:playground|playground]] uidere possis. \ No newline at end of file
diff --git a/inc/lang/la/editrev.txt b/inc/lang/la/editrev.txt
new file mode 100644
index 000000000..bac047d31
--- /dev/null
+++ b/inc/lang/la/editrev.txt
@@ -0,0 +1,2 @@
+**Vetus uersio a te restituta est** Si hanc uersionem seruabis, nouam creabis.
+---- \ No newline at end of file
diff --git a/inc/lang/la/index.txt b/inc/lang/la/index.txt
new file mode 100644
index 000000000..eb6f06f79
--- /dev/null
+++ b/inc/lang/la/index.txt
@@ -0,0 +1,3 @@
+====== Forma Situs ======
+
+Haec forma situs ordinata a(b) [[doku>namespaces|namespaces]]. \ No newline at end of file
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
new file mode 100644
index 000000000..49ae67c31
--- /dev/null
+++ b/inc/lang/la/lang.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * la language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesLa.php?view=co
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['doublequoteopening'] = '"';
+$lang['doublequoteclosing'] = '"';
+$lang['singlequoteopening'] = '`';
+$lang['singlequoteclosing'] = '\'';
+$lang['apostrophe'] = '´';
+$lang['btn_edit'] = 'Recensere hanc paginam';
+$lang['btn_source'] = 'Fontem uidere';
+$lang['btn_show'] = 'Ostendere paginam';
+$lang['btn_create'] = 'Facere paginam';
+$lang['btn_search'] = 'Quaerere';
+$lang['btn_save'] = 'Seruare paginam';
+$lang['btn_preview'] = 'Praeuidere';
+$lang['btn_top'] = 'I ad summa';
+$lang['btn_newer'] = '<< recentiores';
+$lang['btn_older'] = 'minus recentiores >>';
+$lang['btn_revs'] = 'Veteres renouationes';
+$lang['btn_recent'] = 'Nuper mutata';
+$lang['btn_upload'] = 'Onerare';
+$lang['btn_cancel'] = 'Abrogare';
+$lang['btn_index'] = 'Index';
+$lang['btn_secedit'] = 'Recensere';
+$lang['btn_login'] = 'Conuentum aperire';
+$lang['btn_logout'] = 'Conuentum concludere';
+$lang['btn_admin'] = 'Rector';
+$lang['btn_update'] = 'Nouare';
+$lang['btn_delete'] = 'Delere';
+$lang['btn_back'] = 'Redire';
+$lang['btn_backlink'] = 'Nexus ad paginam';
+$lang['btn_backtomedia'] = 'Ad medias redire';
+$lang['btn_subscribe'] = 'Custodire';
+$lang['btn_profile'] = 'Tabellam nouare';
+$lang['btn_reset'] = 'Abrogare';
+$lang['btn_resendpwd'] = 'Tesseram nouam cursu interretiali petere';
+$lang['btn_draft'] = 'Propositum recensere';
+$lang['btn_recover'] = 'Propositum reficere';
+$lang['btn_draftdel'] = 'Propositum delere';
+$lang['btn_revert'] = 'Reficere';
+$lang['loggedinas'] = 'Nomen sodalis:';
+$lang['user'] = 'Nomen sodalis:';
+$lang['pass'] = 'Tessera tua';
+$lang['newpass'] = 'Tessera noua';
+$lang['oldpass'] = 'Tessera uetus:';
+$lang['passchk'] = 'Tesseram tuam adfirmare';
+$lang['remember'] = 'Tesseram meam sodalitatis memento';
+$lang['fullname'] = 'Nomen tuum uerum:';
+$lang['email'] = 'Cursus interretialis:';
+$lang['register'] = 'Te adscribere';
+$lang['profile'] = 'Tabella Sodalis';
+$lang['badlogin'] = 'Error in ineundo est.';
+$lang['minoredit'] = 'Haec est recensio minor';
+$lang['draftdate'] = 'Propositum seruatur die:';
+$lang['nosecedit'] = 'Pagina interea mutatur, pars rerum exiit.';
+$lang['regmissing'] = 'Omnes campi complendi sunt.';
+$lang['reguexists'] = 'Nomen Sodalis ab aliquo iam elegitur.';
+$lang['regsuccess'] = 'Adscriptio feliciter perficitur et tessera cursu interretiali mittitur';
+$lang['regsuccess2'] = 'Adscriptio perficitur';
+$lang['regmailfail'] = 'Error in litteras mittendo est. Rectorem conueni!';
+$lang['regbadmail'] = 'Cursus interretialis non legitimus: si errorem putes, Rectorem conueni.';
+$lang['regbadpass'] = 'Tesserae quas scripsisti inter se non congruont.';
+$lang['regpwmail'] = 'Tessera Dokuuicis tuam';
+$lang['reghere'] = 'Non iam adscriptus\a esne? Te adscribe';
+$lang['profna'] = 'Tabellam tuam mutare non potes.';
+$lang['profnochange'] = 'Si res non mutare uis, nihil agere';
+$lang['profnoempty'] = 'Omnes campi complendi sunt.';
+$lang['profchanged'] = 'Tabella Sodalis feliciter nouatur';
+$lang['pwdforget'] = 'Tesseram amisistine? Nouam petere';
+$lang['resendna'] = 'Tesseram non mutare potest.';
+$lang['resendpwd'] = 'Tesseram mitte';
+$lang['resendpwdmissing'] = 'Omnes campi complendi sunt.';
+$lang['resendpwdnouser'] = 'In tabellis Sodalium nomen non inuentum est.';
+$lang['resendpwdbadauth'] = 'Tesseram non legitima est.';
+$lang['resendpwdconfirm'] = 'Confirmatio cursu interretiali mittitur.';
+$lang['resendpwdsuccess'] = 'Tessera noua cursu interretiali mittitur.';
+$lang['license'] = 'Praeter ubi adnotatum, omnia scripta Corporis Gentis Latinae cum his facultatibus:';
+$lang['licenseok'] = 'Caue: si paginam recenseas, has facultates confirmas:';
+$lang['searchmedia'] = 'Quaere titulum:';
+$lang['searchmedia_in'] = 'Quaere "%s":';
+$lang['txt_upload'] = 'Eligere documenta oneranda:';
+$lang['txt_filename'] = 'Onerare (optio):';
+$lang['txt_overwrt'] = 'Documento ueteri imponere:';
+$lang['lockedby'] = 'Nunc hoc intercludit';
+$lang['lockexpire'] = 'Hoc aperiuit';
+$lang['willexpire'] = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
+$lang['js']['notsavedyet'] = 'Res non seruatae amissurae sunt.';
+$lang['js']['searchmedia'] = 'Quaere inter documenta';
+$lang['js']['keepopen'] = 'Fenestram apertam tene';
+$lang['js']['hidedetails'] = 'Singulas res abscondere';
+$lang['js']['mediatitle'] = 'Optiones connectendi';
+$lang['js']['mediadisplay'] = 'Exemplar connectendi';
+$lang['js']['mediaalign'] = 'Collocatio';
+$lang['js']['mediasize'] = 'Amplitudo imaginis';
+$lang['js']['mediatarget'] = 'Signum connectere';
+$lang['js']['mediaclose'] = 'Claudere';
+$lang['js']['mediainsert'] = 'Insere';
+$lang['js']['mediadisplayimg'] = 'Imaginem ostendere';
+$lang['js']['mediadisplaylnk'] = 'Solum nexum ostendere';
+$lang['js']['mediasmall'] = 'Forma minor';
+$lang['js']['mediamedium'] = 'Forma media';
+$lang['js']['medialarge'] = 'Forma maior';
+$lang['js']['mediaoriginal'] = 'Forma primigenia';
+$lang['js']['medialnk'] = 'Singulis rebus paginae nexum';
+$lang['js']['mediadirect'] = 'Primigeniae formae nexum';
+$lang['js']['medianolnk'] = 'Connectio deest';
+$lang['js']['medianolink'] = 'Imaginem non connectere';
+$lang['js']['medialeft'] = 'Imaginem ad sinistram collocare';
+$lang['js']['mediaright'] = 'Imaginem ad dextram collocare';
+$lang['js']['mediacenter'] = 'Imaginem in mediam collocare';
+$lang['js']['medianoalign'] = 'Collocationem remouere';
+$lang['js']['nosmblinks'] = 'Windows nexa solum cum Microsoft Internet Explorer ostendi possunt.
+Adhuc transcribere nexum potes.';
+$lang['js']['linkwiz'] = 'Connectendi ductor';
+$lang['js']['linkto'] = 'Nexum:';
+$lang['js']['del_confirm'] = 'Delere electas res uin?';
+$lang['js']['mu_btn'] = 'Plura documenta uno tempore onerare';
+$lang['rssfailed'] = 'Error in restituendo ';
+$lang['nothingfound'] = 'Nihil inuentum est.';
+$lang['mediaselect'] = 'Documenta uisiua:';
+$lang['fileupload'] = 'Documentum uisiuom onerare';
+$lang['uploadsucc'] = 'Oneratum perfectum';
+$lang['uploadfail'] = 'Error onerandi.';
+$lang['uploadwrong'] = 'Onerare non potest. Genus documenti non legitimum!';
+$lang['uploadexist'] = 'Documentum iam est.';
+$lang['uploadbadcontent'] = 'Documentum oneratum cum genere documenti non congruit.';
+$lang['uploadspam'] = 'Onerare non potest: nam in indice perscriptionis documentum est.';
+$lang['uploadxss'] = 'Onerare non potest: nam forsitan malum scriptum in documento est.';
+$lang['uploadsize'] = 'Documentum onerandum ponderosius est. (Maxime "%s")';
+$lang['deletesucc'] = 'Documentum "%s" deletum est.';
+$lang['deletefail'] = '"%s" non deletur: uide facultates.';
+$lang['mediainuse'] = 'documentum "%s" non deletur, nam aliquis hoc utitur.';
+$lang['namespaces'] = 'Spatium nominis';
+$lang['mediafiles'] = 'Documentum liberum in:';
+$lang['accessdenied'] = 'Non uidere documentum potes.';
+$lang['mediausage'] = 'Hac forma uteris ut documentum referas:';
+$lang['mediaview'] = 'Vide documentum primigenium';
+$lang['mediaroot'] = 'scrinium';
+$lang['mediaupload'] = 'Spatium nominis hic oneras. Si nouom spatium nominis creare uis, ante "Onerare ut" nomen documenti diuisum a duabus punctis ponas.';
+$lang['mediaextchange'] = 'Genus documenti mutatum a(b) ".%s" ad ".%s"!';
+$lang['reference'] = 'Referre:';
+$lang['ref_inuse'] = 'Documentum non deleri potest, nam in his paginis apertum est:';
+$lang['ref_hidden'] = 'Aliquae mentiones ad paginas, ad quas ire non potes, habent';
+$lang['hits'] = 'Ictus';
+$lang['quickhits'] = 'Spatium nominis conguens';
+$lang['toc'] = 'Index';
+$lang['current'] = 'nouos\a\um';
+$lang['yours'] = 'Tua forma';
+$lang['diff'] = 'Discrimina inter formas ostendere';
+$lang['diff2'] = 'Discrimina inter electas recensiones ostendere';
+$lang['difflink'] = 'Nexum ad comparandum';
+$lang['line'] = 'Linea';
+$lang['breadcrumb'] = 'Vestigium';
+$lang['youarehere'] = 'Hic es';
+$lang['lastmod'] = 'Extrema mutatio';
+$lang['by'] = 'a(b)';
+$lang['deleted'] = 'deletur';
+$lang['created'] = 'creatur';
+$lang['restored'] = 'Recensio uetus restituta';
+$lang['external_edit'] = 'Externe recensere';
+$lang['summary'] = 'Indicem recensere';
+$lang['noflash'] = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> necessarium est.';
+$lang['download'] = 'Snippet cape';
+$lang['mail_newpage'] = 'Pagina addita:';
+$lang['mail_changed'] = 'Pagina mutata:';
+$lang['mail_subscribe_list'] = 'Pagina in spatio nominis mutata:';
+$lang['mail_new_user'] = 'Nouos Sodalis:';
+$lang['mail_upload'] = 'Documentum oneratum:';
+$lang['qb_bold'] = 'Litterae pingues';
+$lang['qb_italic'] = 'Litterae italicae';
+$lang['qb_underl'] = 'Litterae sullineatae';
+$lang['qb_code'] = 'Codex scripti';
+$lang['qb_strike'] = 'Litterae illineatae';
+$lang['qb_h1'] = 'Caput I';
+$lang['qb_h2'] = 'Caput II';
+$lang['qb_h3'] = 'Caput III';
+$lang['qb_h4'] = 'Caput IV';
+$lang['qb_h5'] = 'Caput V';
+$lang['qb_h'] = 'Caput';
+$lang['qb_hs'] = 'Caput eligere';
+$lang['qb_hplus'] = 'Caput maius';
+$lang['qb_hminus'] = 'Caput minus';
+$lang['qb_hequal'] = 'Caput eiusdem gradus';
+$lang['qb_link'] = 'Nexus internus';
+$lang['qb_extlink'] = 'Nexus externus (memento praefigere http://)';
+$lang['qb_hr'] = 'Linea directa (noli saepe uti)';
+$lang['qb_ol'] = 'Index ordinatus rerum';
+$lang['qb_ul'] = 'Index non ordinatus rerum';
+$lang['qb_media'] = 'Imagines et documenta addere';
+$lang['qb_sig'] = 'Subscriptio tua cum indicatione temporis';
+$lang['qb_smileys'] = 'Facies';
+$lang['qb_chars'] = 'Signa singularia';
+$lang['upperns'] = 'I ad anterius spatium nominis';
+$lang['admin_register'] = 'Nouom Sodalem creare';
+$lang['metaedit'] = 'Res codicis mutare';
+$lang['metasaveerr'] = 'Res codicis non scribitur.';
+$lang['metasaveok'] = 'Res codicis seruatae.';
+$lang['img_backto'] = 'Redere ad';
+$lang['img_title'] = 'Titulus';
+$lang['img_caption'] = 'Descriptio';
+$lang['img_date'] = 'Dies';
+$lang['img_fname'] = 'Titulus documenti';
+$lang['img_fsize'] = 'Pondus';
+$lang['img_artist'] = 'Imaginum exprimitor\trix';
+$lang['img_copyr'] = 'Iura exemplarium';
+$lang['img_format'] = 'Forma';
+$lang['img_camera'] = 'Cella';
+$lang['img_keywords'] = 'Verba claues';
+$lang['subscr_subscribe_success'] = '%s additur indici subscriptionis quod %s';
+$lang['subscr_subscribe_error'] = '%s non additur indici subscriptionis quod %s';
+$lang['subscr_subscribe_noaddress'] = 'Cursus interretialis tuus deest, sic in indice subscriptionis non scribi potes';
+$lang['subscr_unsubscribe_success'] = 'A subscriptione %s deletur quod %s';
+$lang['subscr_unsubscribe_error'] = 'Error delendi %s a subscriptione quod %s';
+$lang['subscr_already_subscribed'] = '%s iam subscriptus\a est in %s';
+$lang['subscr_not_subscribed'] = '%s non subscriptus\a est in %n';
+$lang['subscr_m_not_subscribed'] = 'Non hanc paginam uel spatium nominis subscribere potes.';
+$lang['subscr_m_new_header'] = 'Subscriptionem addere';
+$lang['subscr_m_current_header'] = 'haec subscriptio:';
+$lang['subscr_m_unsubscribe'] = 'Delere';
+$lang['subscr_m_subscribe'] = 'Subscribere';
+$lang['subscr_m_receive'] = 'Accipere';
+$lang['subscr_style_every'] = 'Cursus mutationibus omnibus';
+$lang['subscr_style_digest'] = 'Accipere litteras in mutando paginam (%.2f dies)';
+$lang['subscr_style_list'] = 'Index mutatarum paginarum ab extremis litteris (%.2f dies)';
+$lang['authmodfailed'] = 'Confirmatio infeliciter facta est. Rectorem conuenis.';
+$lang['authtempfail'] = 'Confirmare non potes. Rectorem conuenis.';
+$lang['i_chooselang'] = 'Linguam eligere';
+$lang['i_installer'] = 'Docuuicis creator';
+$lang['i_wikiname'] = 'Nomen Vicis';
+$lang['i_enableacl'] = 'AAA aptum facias (consulatum est)';
+$lang['i_superuser'] = 'Magister\stra';
+$lang['i_problems'] = 'Creator hos errores habes. Continuare potes postquam omnia soluentur.';
+$lang['i_modified'] = 'Hoc scriptum solum cum noua uersione Dokuuicis est. Hoc rursum capere in pagina, in qua haec machina capta est, potes aut i ad <a href="http://dokuwiki.org/install">Dokuuicis installation instructions</a>';
+$lang['i_funcna'] = 'PHP functio <code>%s</code> inepta est.';
+$lang['i_phpver'] = 'Versio tua PHP <code>%s</code> minor quam illa necessaria <code>%s</code>.';
+$lang['i_permfail'] = '<code>%s</code> non a uice scribitur. Facultates inspicere.';
+$lang['i_confexists'] = '<code>%s</code> iam est.';
+$lang['i_writeerr'] = '<code>%s</code> non creari potest. Manu illum creas.';
+$lang['i_badhash'] = 'Ignotum uel mutatum dokuwiki.php (<code>%s</code>)';
+$lang['i_badval'] = '<code>%s</code> non legitimum uel uacuom';
+$lang['i_success'] = 'Administratio feliciter perficitur. Delere install.php documentum potes. I ad <a href="doku.php">hanc paginam</a> ut continues.';
+$lang['i_failure'] = 'Aliqui errores dum documenta administrantur sunt. Manu onerare omnes potes priusquam <a href="doku.php">tuo nouo uice</a> uteris.';
+$lang['i_policy'] = 'AAA ratio prima';
+$lang['i_pol0'] = 'Vicem aperire (omnes legere, scribere, onerare possunt)';
+$lang['i_pol1'] = 'Publicus uicis (omnes legere, Sodales scribere et onerare possunt)';
+$lang['i_pol2'] = 'Clausus uicis (Soli Sodales legere scribere et onerare poccunt)';
+$lang['i_retry'] = 'Rursum temptas';
+$lang['i_license'] = 'Elige facultatem sub qua tuus uicis est:';
+$lang['mu_intro'] = 'Plura documenta uno tempore onerare potes.';
+$lang['mu_gridname'] = 'Documenti nomen';
+$lang['mu_gridsize'] = 'Pondus';
+$lang['mu_gridstat'] = 'Status';
+$lang['mu_namespace'] = 'Spatium nominis';
+$lang['mu_browse'] = 'Euoluere';
+$lang['mu_toobig'] = 'Ponderosius';
+$lang['mu_ready'] = 'Aptus ad onerandum';
+$lang['mu_done'] = 'Perfectum';
+$lang['mu_fail'] = 'Error';
+$lang['mu_authfail'] = 'Sessio exit';
+$lang['mu_progress'] = '@PCT@% oneratum';
+$lang['mu_filetypes'] = 'Genera documenti apta facere';
+$lang['mu_info'] = 'Documenta onerare';
+$lang['mu_lasterr'] = 'Extremus error:';
+$lang['recent_global'] = 'Mutatione in hoc spatio nominis uides. Recentiores mutationes quoque uidere <a href="%s">potes</a>';
+$lang['years'] = 'ab annis %d';
+$lang['months'] = 'a mensibus %d';
+$lang['weeks'] = 'a septimanis %d';
+$lang['days'] = 'a diebus %d';
+$lang['hours'] = 'a horis %d';
+$lang['minutes'] = 'a minutis %d';
+$lang['seconds'] = 'a secundis %d';
+$lang['wordblock'] = 'Mutationes non seruantur, eo quod mala uerba contenit';
diff --git a/inc/lang/la/locked.txt b/inc/lang/la/locked.txt
new file mode 100644
index 000000000..65446df30
--- /dev/null
+++ b/inc/lang/la/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina inclusa ======
+
+Haec pagina inclusa est: nullam mutationem facere potest. \ No newline at end of file
diff --git a/inc/lang/la/login.txt b/inc/lang/la/login.txt
new file mode 100644
index 000000000..25d4cd170
--- /dev/null
+++ b/inc/lang/la/login.txt
@@ -0,0 +1,3 @@
+====== Aditus ======
+
+Nomen Sodalis et tesseram scribere debes ut in conuentum inire uelis. \ No newline at end of file
diff --git a/inc/lang/la/mailtext.txt b/inc/lang/la/mailtext.txt
new file mode 100644
index 000000000..2d2504c8c
--- /dev/null
+++ b/inc/lang/la/mailtext.txt
@@ -0,0 +1,16 @@
+Pagina in uice addita uel mutata. Hae singulae res sunt:
+
+Dies : @DATE@
+IP-Numerus : @IPADDRESS@
+Hospes situs : @HOSTNAME@
+Vetus recensio: @OLDPAGE@
+Noua recensio: @NEWPAGE@
+Summa recensere: @SUMMARY@
+Sodalis : @USER@
+
+@DIFF@
+
+
+--
+Hic cursus generatus a(b)
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/newpage.txt b/inc/lang/la/newpage.txt
new file mode 100644
index 000000000..13cfff7d6
--- /dev/null
+++ b/inc/lang/la/newpage.txt
@@ -0,0 +1,3 @@
+====== Hoc argumentum deest ======
+
+Nexum, quod pressisti, ad argumentum nullum fert. Si facultatem habes, creare nouam paginam potes. \ No newline at end of file
diff --git a/inc/lang/la/norev.txt b/inc/lang/la/norev.txt
new file mode 100644
index 000000000..872eb8070
--- /dev/null
+++ b/inc/lang/la/norev.txt
@@ -0,0 +1,3 @@
+====== Versio non reperta ======
+
+Haec uersio non reperta est. Aliam uersionem quaeris. \ No newline at end of file
diff --git a/inc/lang/la/password.txt b/inc/lang/la/password.txt
new file mode 100644
index 000000000..f49f4b85d
--- /dev/null
+++ b/inc/lang/la/password.txt
@@ -0,0 +1,10 @@
+Aue @FULLNAME@!
+
+Hae res @TITLE@, i ad paginam: @DOKUWIKIURL@
+
+Sodalis nomen : @LOGIN@
+Tessera : @PASSWORD@
+
+--
+Hic cursus generatus a(b)
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/preview.txt b/inc/lang/la/preview.txt
new file mode 100644
index 000000000..7e5a1377e
--- /dev/null
+++ b/inc/lang/la/preview.txt
@@ -0,0 +1,3 @@
+====== Praeuisio ======
+
+In hac pagina scriptum praeuidere potes. Memento hunc non seruatum iam esse. \ No newline at end of file
diff --git a/inc/lang/la/pwconfirm.txt b/inc/lang/la/pwconfirm.txt
new file mode 100644
index 000000000..32e351a9c
--- /dev/null
+++ b/inc/lang/la/pwconfirm.txt
@@ -0,0 +1,14 @@
+Aue, @FULLNAME@!
+
+Aliquis tesseram nouam @TITLE@
+ut ineas in @DOKUWIKIURL@
+
+Si nouam tesseram non petiuisti, hoc nuntium ignorat.
+
+Ut hoc nuntium petiuisti, premendo hunc nexum confirmas.
+
+@CONFIRM@
+
+--
+Hic cursus generatus a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/read.txt b/inc/lang/la/read.txt
new file mode 100644
index 000000000..b1710f2e6
--- /dev/null
+++ b/inc/lang/la/read.txt
@@ -0,0 +1 @@
+Hanc paginam solum legere potes. Fontem uidere, sed non mutare potes. \ No newline at end of file
diff --git a/inc/lang/la/recent.txt b/inc/lang/la/recent.txt
new file mode 100644
index 000000000..d8e721cbf
--- /dev/null
+++ b/inc/lang/la/recent.txt
@@ -0,0 +1,3 @@
+====== Recentes Mutationes ======
+
+Hae paginae mutatae sunt in recentibus temporibus \ No newline at end of file
diff --git a/inc/lang/la/register.txt b/inc/lang/la/register.txt
new file mode 100644
index 000000000..71ca8dd0f
--- /dev/null
+++ b/inc/lang/la/register.txt
@@ -0,0 +1,3 @@
+====== Nouom\am Sodalem Adscribere ======
+
+Nomen Sodalis legitimus esse debes: [[doku>pagename|pagename]]. \ No newline at end of file
diff --git a/inc/lang/la/registermail.txt b/inc/lang/la/registermail.txt
new file mode 100644
index 000000000..73901950e
--- /dev/null
+++ b/inc/lang/la/registermail.txt
@@ -0,0 +1,14 @@
+Nouos\a Sodalis est. Hae suae res:
+
+Sodalis nomen : @NEWUSER@
+Nomen uerum : @NEWNAME@
+Cursus interretialis : @NEWEMAIL@
+
+Dies : @DATE@
+Machina interretis : @BROWSER@
+IP-numerus : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+--
+Hic cursus generatus a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/resendpwd.txt b/inc/lang/la/resendpwd.txt
new file mode 100644
index 000000000..5a4972fca
--- /dev/null
+++ b/inc/lang/la/resendpwd.txt
@@ -0,0 +1,3 @@
+====== ouam Tesseram mittere ======
+
+Inserere nomen Sodalis priusquam tesseram petere. Confirmatio mittibitur. \ No newline at end of file
diff --git a/inc/lang/la/revisions.txt b/inc/lang/la/revisions.txt
new file mode 100644
index 000000000..38b9bae0e
--- /dev/null
+++ b/inc/lang/la/revisions.txt
@@ -0,0 +1,3 @@
+====== Veteres recensiones ======
+
+In hac pagina ueteres recensiones paginae sunt: ut unam ex his restituas, illam eligis et deinde "Recensere paginam" premis et serua. \ No newline at end of file
diff --git a/inc/lang/la/searchpage.txt b/inc/lang/la/searchpage.txt
new file mode 100644
index 000000000..8e929110d
--- /dev/null
+++ b/inc/lang/la/searchpage.txt
@@ -0,0 +1,5 @@
+====== Quaerere ======
+
+Responsiones in hac pagina uidere potes.
+
+===== Responsiones ===== \ No newline at end of file
diff --git a/inc/lang/la/showrev.txt b/inc/lang/la/showrev.txt
new file mode 100644
index 000000000..c5019d798
--- /dev/null
+++ b/inc/lang/la/showrev.txt
@@ -0,0 +1,2 @@
+**Haec uetus uersio documenti est!**
+---- \ No newline at end of file
diff --git a/inc/lang/la/stopwords.txt b/inc/lang/la/stopwords.txt
new file mode 100644
index 000000000..f063ba775
--- /dev/null
+++ b/inc/lang/la/stopwords.txt
@@ -0,0 +1,37 @@
+apud
+sunt
+etsi
+atque
+et
+tu
+tuus
+eius
+eorum
+infra
+ad
+in
+inter
+si
+in
+a
+ab
+de
+ut
+super
+aut
+uel
+illud
+illa
+ille
+ad
+fuit
+quid
+quod
+ubi
+hoc
+ex
+e
+cum
+haec
+hic
+www \ No newline at end of file
diff --git a/inc/lang/la/subscr_digest.txt b/inc/lang/la/subscr_digest.txt
new file mode 100644
index 000000000..a64a2c61b
--- /dev/null
+++ b/inc/lang/la/subscr_digest.txt
@@ -0,0 +1,20 @@
+Aue!
+
+Pagina @PAGE@ in @TITLE@ uici mutata.
+Haec mutationes sunt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vetus recensio: @OLDPAGE@
+Noua recensio: @NEWPAGE@
+
+Ut paginae adnotationes deleas, in uicem ineas in
+@DOKUWIKIURL@, deinde uideas
+@NEWPAGE@
+et paginarum spatiorum nominis optiones mutasa.
+
+--
+Hic cursus a uicis generatus
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/subscr_form.txt b/inc/lang/la/subscr_form.txt
new file mode 100644
index 000000000..82b0a692e
--- /dev/null
+++ b/inc/lang/la/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Inscriptionis Administratio ======
+
+In hac pagina inscriptiones paginae et spatio nominis sunt. \ No newline at end of file
diff --git a/inc/lang/la/subscr_list.txt b/inc/lang/la/subscr_list.txt
new file mode 100644
index 000000000..87ce97215
--- /dev/null
+++ b/inc/lang/la/subscr_list.txt
@@ -0,0 +1,17 @@
+Aue!
+
+Paginae in spatio nominis @PAGE@ @TITLE@ uicis mutatae.
+Hae mutationes sunt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ut adnotationes deleas, preme hic
+@DOKUWIKIURL@ then visit
+@SUBSCRIBE@
+et paginarum spatiorum nominis mutationes tollis.
+
+--
+Hic cursus generatus a(b)
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/subscr_single.txt b/inc/lang/la/subscr_single.txt
new file mode 100644
index 000000000..e21af04bb
--- /dev/null
+++ b/inc/lang/la/subscr_single.txt
@@ -0,0 +1,23 @@
+Aue!
+
+Pagina "@PAGE@" in titulo "@TITlE@" mutata.
+Hae mutationes sunt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dies : @DATE@
+Sodalis : @USER@
+Summa recensita: @SUMMARY@
+Vetus recensio: @OLDPAGE@
+Noua recensio: @NEWPAGE@
+
+Ut paginae adnotationes deleas, in uicem ineas in
+@DOKUWIKIURL@, deinde uideas
+@NEWPAGE@
+et paginarum spatiorum nominis optiones mutasa.
+
+--
+Hic cursus a uicis generatus
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/la/updateprofile.txt b/inc/lang/la/updateprofile.txt
new file mode 100644
index 000000000..565f81a3e
--- /dev/null
+++ b/inc/lang/la/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Nouare Sodalis tabellas ======
+
+Solum in campis, quos mutare uis, scribis. Nomen Sodalis non mutare potes. \ No newline at end of file
diff --git a/inc/lang/la/uploadmail.txt b/inc/lang/la/uploadmail.txt
new file mode 100644
index 000000000..044297973
--- /dev/null
+++ b/inc/lang/la/uploadmail.txt
@@ -0,0 +1,14 @@
+Documentum nouatum est. Hae mutatione sunt:
+
+Documentum : @MEDIA@
+Dies : @DATE@
+Machina interretis : @BROWSER@
+IP-Numerus : @IPADDRESS@
+Hospes situs : @HOSTNAME@
+Pondus : @SIZE@
+MIME Genus : @MIME@
+Sodalis : @USER@
+
+--
+Hic cursu generatus a(b)
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lt/subscribermail.txt b/inc/lang/lt/subscribermail.txt
deleted file mode 100644
index 8f101bcd7..000000000
--- a/inc/lang/lt/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Sveiki!
-
-Pranešame, kad Wiki tinklalapyje @TITLE@ pakeistas puslapis @PAGE@.
-Štai pakeitimai:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Norėdami nutraukti šią prenumeratą, apsilankykite
-@DOKUWIKIURL@, tada atverkite
-@NEWPAGE@
-ir išsirinkite 'Atsisakyti keitimų prenumeratos'.
-
---
-Šis laiškas sugeneruotas DokuWiki (@DOKUWIKIURL@).
-
diff --git a/inc/lang/lv/subscribermail.txt b/inc/lang/lv/subscribermail.txt
deleted file mode 100644
index 1395009f0..000000000
--- a/inc/lang/lv/subscribermail.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Sveiki!
-
-@TITLE@ wiki ir mainījusies lapa @PAGE@ .
-
-Atšķirības ir:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Datums : @DATE@
-Lietotājs : @USER@
-Izmaiņu anotācija: @SUMMARY@
-Vecā versijan: @OLDPAGE@
-Jaunā versija: @NEWPAGE@
-
-Lai atteiktos no šīm vēstulēm, ielogojies wiki sistēmā
-@DOKUWIKIURL@, tad apmeklē @NEWPAGE@
-uz izvēlies 'Atteikties no izmaiņu paziņojumiem'.
-
---
-Vestuli izveidoja
-@DOKUWIKIURL@
diff --git a/inc/lang/mr/subscribermail.txt b/inc/lang/mr/subscribermail.txt
deleted file mode 100644
index 8cbb3164e..000000000
--- a/inc/lang/mr/subscribermail.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-नमस्कार !
-
-@TITLE@ विकी मधलं @PAGE@ हे पान बदललं आहे.
-खाली त्यातील बदल दाखवले आहेत:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-दिनांक : @DATE@
-सदस्य : @USER@
-संपादन सारांश : @SUMMARY@
-जुनी आवृत्ती : @OLDPAGE@
-नवीन आवृत्ती : @NEWPAGE@
-
-पानाच्या बदलाविषयिच्या सूचना तुम्हाला नको असतील तर
-@DOKUWIKIURL@ या विकी वर लॉगिन करा आणि
-@NEWPAGE@ पानावर जा व त्या पान/नेमस्पेस विषयीच्या सूचना बंद ( unsubscribe ) करा.
-
---
-हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे. \ No newline at end of file
diff --git a/inc/lang/ne/subscribermail.txt b/inc/lang/ne/subscribermail.txt
deleted file mode 100644
index 413c79c67..000000000
--- a/inc/lang/ne/subscribermail.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-नमस्कार !
-@TITLE@ शिर्षक रहेको यो पृष्ठ @PAGE@ परिवर्तन भएको छ ।
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-मिति : @DATE@
-प्रयोगकर्ता : @USER@
-सम्पादन सारांस: @SUMMARY@
-पुरानो संस्करण : @OLDPAGE@
-नविन संस्करण: @NEWPAGE@
-
-यस्ता जानकारीहरु रद्द गर्नको लागि
-@DOKUWIKIURL@ मा प्रवेश गरी
-@NEWPAGE@ अवलोकन पश्चात
-पृष्ठ या नेमस्पेस परिवर्तन जानकारी ग्राह्यता बदर गर्नुहो
-
---
-यो पत्र DokuWiki ले
-@DOKUWIKIURL@ मा स्वत: बनाएको हो । \ No newline at end of file
diff --git a/inc/lang/nl/subscribermail.txt b/inc/lang/nl/subscribermail.txt
deleted file mode 100644
index 5b092a9a6..000000000
--- a/inc/lang/nl/subscribermail.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Hallo!
-
-De pagina @PAGE@ op de @TITLE@ wiki is gewijzigd.
-Hier zijn de aanpassingen:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Om deze berichten niet meer te ontvangen van @DOKUWIKIURL@ , ga naar
-@NEWPAGE@
-en kies 'Opzeggen wijzigingen'.
-
---
-Dit bericht is gegenereerd door DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/no/subscribermail.txt b/inc/lang/no/subscribermail.txt
deleted file mode 100644
index 999f75787..000000000
--- a/inc/lang/no/subscribermail.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Hei!
-
-Siden @PAGE@ i @TITLE@-wikien har blitt endret.
-Her er endringene:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-For å avslutte abonnering på denne siden logg inn
-på wikien på @DOKUWIKIURL@, besøk deretter @NEWPAGE@
-og velg 'Ikke abonner på endringer'.
-
---
-Denne mailen ble generert av DokuWiki på
-@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pl/subscribermail.txt b/inc/lang/pl/subscribermail.txt
deleted file mode 100644
index 76300177e..000000000
--- a/inc/lang/pl/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Witaj!
-
-Strona @PAGE@ w wiki @TITLE@ została zmieniona.
-Szczegóły:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Aby zaprzestać subskrypcji zmian tej strony zaloguj się na
-@DOKUWIKIURL@ a następnie przejdź do strony
-@NEWPAGE@
-i wybierz 'zaprzestań subskrypcji zmian'.
-
---
-List został wygenerowany przez DokuWiki pod adresem
-@DOKUWIKIURL@
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 6bbd4c520..fb05361f0 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -19,7 +19,7 @@
* @author Sergio Motta sergio@cisne.com.br
* @author Isaias Masiero Filho <masiero@masiero.org>
*/
-$lang['encoding'] = 'utf-8<';
+$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
$lang['doublequoteopening'] = '“';
$lang['doublequoteclosing'] = '”';
diff --git a/inc/lang/pt-br/subscribermail.txt b/inc/lang/pt-br/subscribermail.txt
deleted file mode 100644
index 157196c15..000000000
--- a/inc/lang/pt-br/subscribermail.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Olá!
-
-A página @PAGE@, no wiki @TITLE@ foi modificada.
-Aqui estão as mudanças:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Data : @DATE@
-Usuário : @USER@
-Resumo da edição: @SUMMARY@
-Revisão antiga: @OLDPAGE@
-Revisão nova: @NEWPAGE@
-
-Para cancelar as notificações dessa página, identifique-se em
-@DOKUWIKIURL@, vá até
-@NEWPAGE@
-e cancele o monitoramento das alterações da página e/ou do
-espaço de nomes.
-
---
-Essa mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
diff --git a/inc/lang/pt/admin.txt b/inc/lang/pt/admin.txt
index fccd9ca33..366792a9b 100644
--- a/inc/lang/pt/admin.txt
+++ b/inc/lang/pt/admin.txt
@@ -1,5 +1,3 @@
====== Administração ======
-Esta é a lista de tarefas de Administração permitidas pelo DokuWiki.
-
-----
+Abaixo pode encontrar uma lista de tarefas de administrativas permitidas pelo DokuWiki. \ No newline at end of file
diff --git a/inc/lang/pt/denied.txt b/inc/lang/pt/denied.txt
index 71355b01f..eb2614387 100644
--- a/inc/lang/pt/denied.txt
+++ b/inc/lang/pt/denied.txt
@@ -1,5 +1,3 @@
====== Permissão Negada ======
-Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de entrar em sessão?
-
-----
+Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de iniciar sessão? \ No newline at end of file
diff --git a/inc/lang/pt/editrev.txt b/inc/lang/pt/editrev.txt
index 9845a6915..2c7697b52 100644
--- a/inc/lang/pt/editrev.txt
+++ b/inc/lang/pt/editrev.txt
@@ -1,5 +1 @@
-**Atenção**: Carregou uma revisão antiga do documento!
-
-Se gravar esta revisão irá criar uma nova versão actual do documento com este conteúdo, que substituirá a versão actual.
-
-----
+**Carregou uma revisão antiga do documento!** Se a gravar irá criar uma nova versão do documento com este conteúdo, que substituirá a versão actual. \ No newline at end of file
diff --git a/inc/lang/pt/index.txt b/inc/lang/pt/index.txt
index f490b7a5c..46a807d2d 100644
--- a/inc/lang/pt/index.txt
+++ b/inc/lang/pt/index.txt
@@ -1,6 +1,3 @@
====== Índice ======
-Este índice mostra todos os documentos disponíveis neste site Wiki, [[doku>namespaces | agrupados]] por assunto.
-
-----
-
+Este índice mostra todas as páginas disponíveis, agrupadas por [[doku>namespaces|espaço de nome]]. \ No newline at end of file
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index d0861f3ef..4c0ec02d2 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -41,15 +41,13 @@ $lang['btn_back'] = 'Voltar';
$lang['btn_backlink'] = 'Backlinks';
$lang['btn_backtomedia'] = 'Voltar à Selecção de Media';
$lang['btn_subscribe'] = 'Subscrever Alterações';
-$lang['btn_unsubscribe'] = 'Não Subscrever Alterações';
-$lang['btn_subscribens'] = 'Subscrever Mudanças de Espaço de Nome';
-$lang['btn_unsubscribens'] = 'Cancelar Subscrição de Mudanças de Espaço de Nome';
$lang['btn_profile'] = 'Actualizar Perfil';
$lang['btn_reset'] = 'Limpar';
$lang['btn_resendpwd'] = 'Enviar nova senha';
$lang['btn_draft'] = 'Editar rascunho';
$lang['btn_recover'] = 'Recuperar rascunho';
$lang['btn_draftdel'] = 'Apagar rascunho';
+$lang['btn_revert'] = 'Restaurar';
$lang['loggedinas'] = 'Está em sessão como';
$lang['user'] = 'Utilizador';
$lang['pass'] = 'Senha';
@@ -88,13 +86,46 @@ $lang['resendpwdconfirm'] = 'O link de confirmação foi enviado por e-mail
$lang['resendpwdsuccess'] = 'A nova senha foi enviada por e-mail.';
$lang['license'] = 'Excepto menção em contrário, o conteúdo neste wiki está sob a seguinte licença:';
$lang['licenseok'] = 'Nota: Ao editar esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
+$lang['searchmedia'] = 'Procurar nome de ficheiro:';
+$lang['searchmedia_in'] = 'Procurar em %s';
$lang['txt_upload'] = 'Escolha ficheiro para carregar';
$lang['txt_filename'] = 'Carregar como (opcional)';
$lang['txt_overwrt'] = 'Escrever por cima do ficheiro já existente';
$lang['lockedby'] = 'Bloqueado por';
$lang['lockexpire'] = 'Expira em';
$lang['willexpire'] = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
-$lang['js']['notsavedyet'] = "Existem alterações não gravadas, que serão perdidas se continuar.\nDeseja realmente continuar?";
+$lang['js']['notsavedyet'] = 'Existem alterações não gravadas, que serão perdidas se continuar.
+Deseja realmente continuar?';
+$lang['js']['searchmedia'] = 'Procurar por ficheiros';
+$lang['js']['keepopen'] = 'Mantenha a janela aberta durante a selecção';
+$lang['js']['hidedetails'] = 'Esconder Detalhes';
+$lang['js']['mediatitle'] = 'Propriedades de ligação';
+$lang['js']['mediadisplay'] = 'Tipo de ligação';
+$lang['js']['mediaalign'] = 'Alinhamento';
+$lang['js']['mediasize'] = 'Tamanho da imagem';
+$lang['js']['mediatarget'] = 'Alvo da ligação';
+$lang['js']['mediaclose'] = 'Fechar';
+$lang['js']['mediainsert'] = 'Inserir';
+$lang['js']['mediadisplayimg'] = 'Mostrar a imagem';
+$lang['js']['mediadisplaylnk'] = 'Mostrar apenas a ligação';
+$lang['js']['mediasmall'] = 'Versão pequena';
+$lang['js']['mediamedium'] = 'Versão média';
+$lang['js']['medialarge'] = 'Versão grande';
+$lang['js']['mediaoriginal'] = 'Versão original';
+$lang['js']['medialnk'] = 'Ligação para a página de detalhe';
+$lang['js']['mediadirect'] = 'Ligação directa para o original';
+$lang['js']['medianolnk'] = 'Nenhuma ligação';
+$lang['js']['medianolink'] = 'Não ligar à imagem';
+$lang['js']['medialeft'] = 'Alinhar a imagem à esquerda.';
+$lang['js']['mediaright'] = 'Alinhar a imagem à direita.';
+$lang['js']['mediacenter'] = 'Alinhar a imagem ao centro.';
+$lang['js']['medianoalign'] = 'Não usar alinhamento algum.';
+$lang['js']['nosmblinks'] = 'Ligação a pastas Windows partilhadas apenas funciona com o Microsoft Internet Explorer.
+Pode no entanto copiar e colar o link.';
+$lang['js']['linkwiz'] = 'Assistente de Criação de Ligação';
+$lang['js']['linkto'] = 'Ligação para:';
+$lang['js']['del_confirm'] = 'Remover esta entrada?';
+$lang['js']['mu_btn'] = 'Enviar múltiplos ficheiros de uma vez';
$lang['rssfailed'] = 'Ocorreu um erro neste canal RSS: ';
$lang['nothingfound'] = 'Nada foi encontrado.';
$lang['mediaselect'] = 'Selecção de ficheiros';
@@ -112,14 +143,7 @@ $lang['deletefail'] = 'O ficheiro "%s" não pode ser removido, por fa
$lang['mediainuse'] = 'O ficheiro "%s" não foi removido porque está ainda a ser usado.';
$lang['namespaces'] = 'Grupos';
$lang['mediafiles'] = 'Ficheiros disponíveis em';
-$lang['js']['keepopen'] = 'Mantenha a janela aberta durante a selecção';
-$lang['js']['hidedetails'] = 'Esconder Detalhes';
-$lang['js']['nosmblinks'] = 'Ligação a pastas Windows partilhadas apenas funciona com o Microsoft Internet Explorer.
-Pode no entanto copiar e colar o link.';
-$lang['js']['linkwiz'] = 'Assistente de Criação de Ligação';
-$lang['js']['linkto'] = 'Ligação para:';
-$lang['js']['del_confirm'] = 'Remover esta entrada?';
-$lang['js']['mu_btn'] = 'Enviar múltiplos ficheiros de uma vez';
+$lang['accessdenied'] = 'Não tem permissão para ver esta página.';
$lang['mediausage'] = 'Use a seguinte sintaxe para referenciar este ficheiro:';
$lang['mediaview'] = 'Ver ficheiro original';
$lang['mediaroot'] = 'root';
@@ -135,6 +159,7 @@ $lang['current'] = 'Actual';
$lang['yours'] = 'A sua versão';
$lang['diff'] = 'mostrar diferenças com a versão actual';
$lang['diff2'] = 'mostrar diferenças entre versões escolhidas';
+$lang['difflink'] = 'Ligação para esta vista de comparação';
$lang['line'] = 'Linha';
$lang['breadcrumb'] = 'Está em';
$lang['youarehere'] = 'Está aqui';
@@ -149,6 +174,7 @@ $lang['noflash'] = 'O <a href="http://www.adobe.com/products/flash
$lang['download'] = 'Descarregar Snippet';
$lang['mail_newpage'] = 'documento adicionado:';
$lang['mail_changed'] = 'documento modificado:';
+$lang['mail_subscribe_list'] = 'páginas alteradas no espaço de nome:';
$lang['mail_new_user'] = 'Novo utilizador:';
$lang['mail_upload'] = 'Ficheiro carregado:';
$lang['qb_bold'] = 'Texto com Ênfase';
@@ -191,11 +217,22 @@ $lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Câmara';
$lang['img_keywords'] = 'Palavras-Chave';
-$lang['subscribe_success'] = '%s adicionado à lista de subscritores de %s';
-$lang['subscribe_error'] = 'Erro ao adicionar %s à lista de subscritores de %s';
-$lang['subscribe_noaddress'] = 'Não existe nenhum endereço associado ao seu perfil, por isso não pode ser adicionado à lista de subscritores.';
-$lang['unsubscribe_success'] = '%s removido da lista de subscritores de %s';
-$lang['unsubscribe_error'] = 'Erro ao remover %s da lista de subscritores de %s';
+$lang['subscr_subscribe_success'] = 'Adicionado %s à lista de subscrição para %s';
+$lang['subscr_subscribe_error'] = 'Erro ao adicionar %s à lista de subscrição para %s';
+$lang['subscr_subscribe_noaddress'] = 'Não existe endereço algum associado com o seu nome de utilizador, não pode ser adicionado à lista de subscrição';
+$lang['subscr_unsubscribe_success'] = 'Removido %s da lista de subscrição para %s';
+$lang['subscr_unsubscribe_error'] = 'Erro ao remover %s da lista de subscrição para %s';
+$lang['subscr_already_subscribed'] = '%s já está subscrito em %s';
+$lang['subscr_not_subscribed'] = '%s não está subscrito em %s';
+$lang['subscr_m_not_subscribed'] = 'Não está subscrito à página ou espaço de nome corrente.';
+$lang['subscr_m_new_header'] = 'Adicionar subscrição';
+$lang['subscr_m_current_header'] = 'Subscrições correntes';
+$lang['subscr_m_unsubscribe'] = 'Des-subscrever';
+$lang['subscr_m_subscribe'] = 'Subscrever';
+$lang['subscr_m_receive'] = 'Receber';
+$lang['subscr_style_every'] = 'email em qualquer alteração';
+$lang['subscr_style_digest'] = '"digest email" de alterações em cada página (cada %.2f dias)';
+$lang['subscr_style_list'] = 'lista de páginas alteradas desde o último email (cada %.2f dias)';
$lang['authmodfailed'] = 'Configuração de autenticação errada. Por favor, informe o Wiki Admin.';
$lang['authtempfail'] = 'Autenticação temporariamente indisponível. Se a situação persistir, por favor informe o Wiki Admin.';
$lang['i_chooselang'] = 'Escolha a linguagem';
@@ -219,6 +256,7 @@ $lang['i_pol0'] = 'Wiki Aberto (ler, escrever e carregar para tod
$lang['i_pol1'] = 'Wiki Público (ler para todos, escrever e carregar para utilizadores inscritos)';
$lang['i_pol2'] = 'Wiki Fechado (ler, escrever e carregar somente para utilizadores inscritos)';
$lang['i_retry'] = 'Repetir';
+$lang['i_license'] = 'Por favor escolha a licença sob a qual quer colocar o seu conteúdo:';
$lang['mu_intro'] = 'Aqui podes enviar múltiplos ficheiros de uma vez. Clique no botão de navegação para adicioná-los na fila. Premir upload quando pronto.';
$lang['mu_gridname'] = 'Nome do ficheiro';
$lang['mu_gridsize'] = 'Tamanho';
@@ -235,3 +273,11 @@ $lang['mu_filetypes'] = 'Tipos de Ficheiros Permitidos';
$lang['mu_info'] = 'Ficheiros carregados.';
$lang['mu_lasterr'] = 'Último erro:';
$lang['recent_global'] = 'Você está a observar as alterações dentro do espaço de nomes <b>%s</b>. Também é possível ver as <a href="%s">modificações recentes no wiki inteiro</a>.';
+$lang['years'] = '%d anos atrás';
+$lang['months'] = '%d meses atrás';
+$lang['weeks'] = '%d semanas atrás';
+$lang['days'] = '%d dias atrás';
+$lang['hours'] = '%d horas atrás';
+$lang['minutes'] = '%d minutos atrás';
+$lang['seconds'] = '%d segundos atrás';
+$lang['wordblock'] = 'A sua alteração não foi guardada porque contém texto bloqueado (spam).';
diff --git a/inc/lang/pt/locked.txt b/inc/lang/pt/locked.txt
index b9df29cb5..a4bb4d606 100644
--- a/inc/lang/pt/locked.txt
+++ b/inc/lang/pt/locked.txt
@@ -1,5 +1,3 @@
====== Página em Edição ======
-Esta página está bloqueada por outro utilizador, que se encontra a editá-la neste momento.\\ Terá que aguardar que o utilizador termine a edição e grava as alterações ou então que temporizador de bloqueio expire.
-
-----
+Esta página está bloqueada por outro utilizador, que se encontra a editá-la neste momento. Terá que aguardar que o utilizador termine a edição ou que o bloqueio expire. \ No newline at end of file
diff --git a/inc/lang/pt/login.txt b/inc/lang/pt/login.txt
index e8000bbab..42c2a983c 100644
--- a/inc/lang/pt/login.txt
+++ b/inc/lang/pt/login.txt
@@ -1,7 +1,3 @@
====== Entrar ======
-Não está actualmente em sessão!\\ Introduza os seus dados de utilizador para entrar em sessão.
-
-**Nota**: Precisa de ter //cookies// activos no seu navegador.
-
-----
+Não está actualmente em sessão! Introduza as suas credenciais de autenticação abaixo para para entrar em sessão. Precisa de ter cookies activos no seu navegador. \ No newline at end of file
diff --git a/inc/lang/pt/newpage.txt b/inc/lang/pt/newpage.txt
index 4db706be1..2d9c95599 100644
--- a/inc/lang/pt/newpage.txt
+++ b/inc/lang/pt/newpage.txt
@@ -1,7 +1,3 @@
====== Documento Inexistente ======
-Acaba de tentar aceder a um documento que ainda não existe.
-
-Pode criar o conteúdo deste novo documento após clicar no botão <Criar página>.
-
-----
+Seguiu uma ligação para um documento que ainda não existe. Pode criá-lo usando o botão "Criar página", se as permissões lho permitirem. \ No newline at end of file
diff --git a/inc/lang/pt/password.txt b/inc/lang/pt/password.txt
index f0b46e038..70ecf91eb 100644
--- a/inc/lang/pt/password.txt
+++ b/inc/lang/pt/password.txt
@@ -1,12 +1,10 @@
Olá, @FULLNAME@!
-Efectuou a inscrição no WikiSite @TITLE@, em @DOKUWIKIURL@
-
-Aqui estão as suas credenciais de autenticação:
+Aqui estão as suas credenciais de autenticação para @TITLE@, em @DOKUWIKIURL@
Utilizador : @LOGIN@
Senha : @PASSWORD@
----
-
-Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@
+Esta mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pt/preview.txt b/inc/lang/pt/preview.txt
index 077665881..1a8dab0b8 100644
--- a/inc/lang/pt/preview.txt
+++ b/inc/lang/pt/preview.txt
@@ -1,7 +1,3 @@
====== Previsão ======
-Esta é a previsão de como irá ficar o conteúdo do documento se clicar no botão <Gravar>.
-
-**Atenção**: O documento ainda não se encontra gravado.\\ É necessário clicar no botão <Gravar> para efectivar as modificações que tenha realizado.
-
-----
+Esta é uma previsão de como ficará o conteúdo. Lembre-se: ainda **não está gravado**! \ No newline at end of file
diff --git a/inc/lang/pt/read.txt b/inc/lang/pt/read.txt
index 92be189f3..177b1e81d 100644
--- a/inc/lang/pt/read.txt
+++ b/inc/lang/pt/read.txt
@@ -1,3 +1 @@
-**Atenção**: Este documento é apenas de leitura.\\ Pode ver o documento em bruto mas não pode gravar qualquer alteração.\\ \\ Informe-se com o administrador deste Wiki se achar que isto não está correcto.
-
-----
+Esta página é apenas de leitura. Pode ver a fonte, mas não alterá-la. Informe-se com o administrador deste Wiki se achar que isto não está correcto. \ No newline at end of file
diff --git a/inc/lang/pt/recent.txt b/inc/lang/pt/recent.txt
index 339041468..3957df484 100644
--- a/inc/lang/pt/recent.txt
+++ b/inc/lang/pt/recent.txt
@@ -1,5 +1,3 @@
====== Alterações Recentes ======
-Os seguintes documentos foram alterados recentemente.
-
-----
+Os seguintes documentos foram alterados recentemente. \ No newline at end of file
diff --git a/inc/lang/pt/register.txt b/inc/lang/pt/register.txt
index c647a4615..228cb9979 100644
--- a/inc/lang/pt/register.txt
+++ b/inc/lang/pt/register.txt
@@ -1,7 +1,3 @@
-====== Inscrição ======
+====== Inscrição como novo utilizador ======
-Por favor, preencha todos os campos com a informação correspondente, para poder criar uma nova conta neste SiteWiki.
-
-**Nota**: O nome de utilizador deve cumprir as mesmas regras de nomeação de documentos Wiki válidos.\\ **Atenção**: Verifique que o endereço de correio electrónico que preencheu é válido, pois a sua senha será enviada por e-mail.
-
-----
+Preencha toda a informação abaixo para criar uma nova conta nesta wiki. Assegure que providencia um **endereço de email válido** - se não lhe for pedido que introduza uma nova palavra chave aqui, ser-lhe-á enviada uma para esse endereço. O nome de utilizador deve ser um [[doku>pagename|nome de página]] válido. \ No newline at end of file
diff --git a/inc/lang/pt/revisions.txt b/inc/lang/pt/revisions.txt
index 213022f91..0a0d35950 100644
--- a/inc/lang/pt/revisions.txt
+++ b/inc/lang/pt/revisions.txt
@@ -1,5 +1,3 @@
-====== Revisões ======
+====== Revisões antigas ======
-Estas são as revisões ao documento corrente.\\ Para reverter o documento para uma destas revisões: * Escolha a revisão do documento da lista abaixo; * Clique depois no botão <Editar página>; * Faça as alterações que veja necessárias - opcional; * Grava a revisão antiga como sendo a revisão actual do documento. Após a gravação, o documento da versão actual será substituído pelo documento da revisão escolhida.
-
-----
+Estas são as revisões antigas do documento corrente. Para reverter para uma destas revisões, escolha-a abaixo, clique no botão "Editar página" e grave. \ No newline at end of file
diff --git a/inc/lang/pt/searchpage.txt b/inc/lang/pt/searchpage.txt
index 49a0b16ea..2239330dd 100644
--- a/inc/lang/pt/searchpage.txt
+++ b/inc/lang/pt/searchpage.txt
@@ -1,7 +1,5 @@
====== Pesquisa ======
-Os resultados da sua pesquisa encontram-se mais abaixo.
-
-Se não encontrou o que procurava, pode criar uma nova página com o nome da sua pesquisa, usando o botão <Editar página>.
+Pode encontrar os resultados da sua pesquisa abaixo. Se não encontrou o que procurava pode criar uma nova página com o nome da sua pesquisa, usando o botão apropriado.
===== Resultados =====
diff --git a/inc/lang/pt/showrev.txt b/inc/lang/pt/showrev.txt
index e8ad7f47a..25d617fa3 100644
--- a/inc/lang/pt/showrev.txt
+++ b/inc/lang/pt/showrev.txt
@@ -1,3 +1 @@
-**Atenção**: Esta é uma versão antiga do documento!
-
-----
+**Esta é uma versão antiga do documento!** \ No newline at end of file
diff --git a/inc/lang/pt/subscr_digest.txt b/inc/lang/pt/subscr_digest.txt
new file mode 100644
index 000000000..3f8a814c6
--- /dev/null
+++ b/inc/lang/pt/subscr_digest.txt
@@ -0,0 +1,20 @@
+Olá!
+
+A página @PAGE@ na wiki @TITLE@ mudou.
+Eis as mudanças:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Revisão Antiga: @OLDPAGE@
+Revisão Nova: @NEWPAGE@
+
+Para cancelar as notificações de página, inicie sessão na wiki em
+@DOKUWIKIURL@, visite
+@SUBSCRIBE@
+e des-subscreva as alterações à página e/ou nome espaço de nome.
+
+--
+Este email foi gerado por DokuWiki em
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pt/subscr_form.txt b/inc/lang/pt/subscr_form.txt
new file mode 100644
index 000000000..9bb7b6b45
--- /dev/null
+++ b/inc/lang/pt/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gestão de Subscrição ======
+
+Esta página permite-lhe gerir as suas subscrições para a página e espaço de nomes correntes. \ No newline at end of file
diff --git a/inc/lang/pt/subscr_list.txt b/inc/lang/pt/subscr_list.txt
new file mode 100644
index 000000000..65325b9ea
--- /dev/null
+++ b/inc/lang/pt/subscr_list.txt
@@ -0,0 +1,17 @@
+Olá!
+
+Páginas no espaço de nome @PAGE@ da wiki @TITLE@ mudaram.
+Eis as páginas alteradas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para cancelar as notificações de páginas, inicie sessão na wiki em
+@DOKUWIKIURL@, visite
+@SUBSCRIBE@
+e des-subscreva às alterações da página e/ou espaço de nome.
+
+--
+Este email foi gerado por DokuWiki em
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pt/subscr_single.txt b/inc/lang/pt/subscr_single.txt
new file mode 100644
index 000000000..1187b5911
--- /dev/null
+++ b/inc/lang/pt/subscr_single.txt
@@ -0,0 +1,23 @@
+Olá!
+
+A página @PAGE@ no wiki @TITLE@ mudou.
+Eis as alterações:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Utilizador : @USER@
+Sumário de Edição: @SUMMARY@
+Revisão Antiga: @OLDPAGE@
+Revisão Nova: @NEWPAGE@
+
+Para cancelar as notificações de página, inicie sessão no wiki em
+@DOKUWIKIURL@, visite
+@NEWPAGE@
+e des-subscreva às alterações de página e/ou espaço de nome.
+
+--
+Este email foi gerado automaticamente por DokuWiki em
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pt/subscribermail.txt b/inc/lang/pt/subscribermail.txt
deleted file mode 100644
index 3a9e40d20..000000000
--- a/inc/lang/pt/subscribermail.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Olá,
-
-A página @PAGE@ em @TITLE@ foi alterda.
-Aqui estão as diferenças:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Para receber mais notificações desta página alterada, por favor, entre no Wiki em @DOKUWIKIURL@ e aceda a @NEWPAGE@ para depois poder clicar no botão [ Não Subscrever ].
-
-
-----
-
-Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pt/uploadmail.txt b/inc/lang/pt/uploadmail.txt
index 249d66234..597ba4a01 100644
--- a/inc/lang/pt/uploadmail.txt
+++ b/inc/lang/pt/uploadmail.txt
@@ -11,4 +11,5 @@ Utilizador : @USER@
----
-Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@ \ No newline at end of file
+Esta mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ro/subscribermail.txt b/inc/lang/ro/subscribermail.txt
deleted file mode 100644
index 23374dc6f..000000000
--- a/inc/lang/ro/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Bună!
-
-Pagina @PAGE@ din @TITLE@ wiki a fost modificată.
-Iată modificările:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Pentru a vă dezabona, logaţi-vă la wiki la
-@DOKUWIKIURL@, apoi vizitaţi
-@NEWPAGE@
-şi alegeţi 'Anulează modificările'.
-
---
-Acest mail a fost generat automat de către DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ru/subscribermail.txt b/inc/lang/ru/subscribermail.txt
deleted file mode 100644
index 1a846ac32..000000000
--- a/inc/lang/ru/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Здравствуйте!
-
-Страница @PAGE@ в вики @TITLE@ была изменена.
-Ниже представлены изменения:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Чтобы отписаться от изменений этой страницы,
-войдите под своим именем в Вики по адресу
-@DOKUWIKIURL@, перейдите на страницу
-@NEWPAGE@ и нажмите 'Отписаться'.
-
---
-Это сообщение было сгенерировано DokuWiki по адресу
-@DOKUWIKIURL@
diff --git a/inc/lang/sk/subscribermail.txt b/inc/lang/sk/subscribermail.txt
deleted file mode 100644
index 47505bc1c..000000000
--- a/inc/lang/sk/subscribermail.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Zdravím!
-
-Stránka @PAGE@ v @TITLE@ wiki bola zmenená.
-Tu sú zmeny:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Pre odhlásenie sa z tejto stránky choďte na
-@DOKUWIKIURL@, potom navštívte
-@NEWPAGE@
-a zvoľte 'Neposielať zmeny'.
-
---
-Tento mail bol vygenerovaný DokuWiki na
-@DOKUWIKIURL@
-
diff --git a/inc/lang/sr/subscribermail.txt b/inc/lang/sr/subscribermail.txt
deleted file mode 100644
index fd3de7d38..000000000
--- a/inc/lang/sr/subscribermail.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Здраво!
-
-Измењена је страница @PAGE@ на @TITLE@ викију.
-Ево измена:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Да се одјавите са ове странице, пријавите се на вики на
-@DOKUWIKIURL@ и онда посетите
-@NEWPAGE@
-и изаберите 'Одјави се са измена'.
-
---
-Ову поруку је генерисао DokuWiki на
-@DOKUWIKIURL@
diff --git a/inc/lang/sv/subscribermail.txt b/inc/lang/sv/subscribermail.txt
deleted file mode 100644
index 147585caf..000000000
--- a/inc/lang/sv/subscribermail.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Hej!
-
-Sidan @PAGE@ i wikin @TITLE@ har ändrats.
-Här är ändringarna:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Datum : @DATE@
-Användare : @USER@
-Kommentar : @SUMMARY@
-Gammal sida : @OLDPAGE@
-Ny sida : @NEWPAGE@
-
-För att säga upp prenumerationen på den här sidan,
-logga in i wikin på
-@DOKUWIKIURL@ och gå till
-@NEWPAGE@
-där du väljer 'Säg upp prenumeration på ändringar'.
-
---
-Detta meddelande har skapats av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/th/subscribermail.txt b/inc/lang/th/subscribermail.txt
deleted file mode 100644
index 8f65b1061..000000000
--- a/inc/lang/th/subscribermail.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-สวัสดี!
-
-เพจ @PAGE@ ในวิกิ @TITLE@ ถูกแก้ไข และนี่คือรายการเปลี่ยนแปลง:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-วันที่ : @DATE@
-ผู้ใช้: @USER@
-สรุปการแก้ไข: @SUMMARY@
-ฉบับเก่า: @OLDPAGE@
-ฉบับใหม่: @NEWPAGE@
-
-เพื่อยกเลิกการแจ้งเตือนในเพจนี้, ให้ล็อกอินเข้าไปยังวิกิที่
-@DOKUWIKIURL@ แล้วเข้าไปที่ยัง
-@NEWPAGE@
-และยกเลิกการลงทะเบียนเฝ้าดูการเปลี่ยนแปลงของเพจ หรือ เนมสเปซ นั้นๆ
-
---
-จดหมายนี้ถูกสร้างขึ้นโดย โดกุวิกิที่
-@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/tr/subscribermail.txt b/inc/lang/tr/subscribermail.txt
deleted file mode 100644
index a37a8cf41..000000000
--- a/inc/lang/tr/subscribermail.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Merhaba!
-
-
-
-@TITLE@ wikisindeki @PAGE@ sayfası değiştirildi.
-Değişiklikler aşağıdadır:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Bu sayfaya abonelikten çıkmak için
-@DOKUWIKIURL@ adresindeki wikiye gir, ardından
-@NEWPAGE@
-sayfasına git ve 'Sayfa Değişikliklerini Bildirme' butonuna tıkla.
-
---
-Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
diff --git a/inc/lang/uk/subscribermail.txt b/inc/lang/uk/subscribermail.txt
deleted file mode 100644
index 8d4dfebb4..000000000
--- a/inc/lang/uk/subscribermail.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Доброго дня!
-
-Сторінка @PAGE@ в вікі @TITLE@ змінилася.
-Перегляньте зміни:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Дата: @DATE@
-Користувач : @USER@
-Підсумок змін: @SUMMARY@
-Стара ревізія: @OLDPAGE@
-Нова ревізця: @NEWPAGE@
-
-Щоб відписатися від цих повідомлень, увійдіть в вікі за адресою
-@DOKUWIKIURL@, відвідайте @NEWPAGE@
-та оберіть 'Відписатися'
-
---
-Це повідомлення створене ДокуВікі з
-@DOKUWIKIURL@
diff --git a/inc/lang/zh-tw/subscribermail.txt b/inc/lang/zh-tw/subscribermail.txt
deleted file mode 100644
index 3ccb80091..000000000
--- a/inc/lang/zh-tw/subscribermail.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-哈囉,您好!
-
-在 @TITLE@ 的 @PAGE@ 頁面已經有了變更囉,以下是變動幅度紀錄:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-若要取消本頁的變動訂閱通知,請先登入
-@DOKUWIKIURL@ ,然後進入
-@NEWPAGE@
-並選擇 『退訂更動通知』,謝謝 ^_^
-
---
-本信是由 DokuWiki 系統自動產生
-@DOKUWIKIURL@
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 2de962ce9..9488cffe1 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -9,6 +9,7 @@
* @author Simon zhan <simonzhan@21cn.com>
* @author mr.jinyi@gmail.com
* @author ben <ben@livetom.com>
+ * @author lainme <lainme993@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -42,9 +43,6 @@ $lang['btn_back'] = '返回';
$lang['btn_backlink'] = '反向链接';
$lang['btn_backtomedia'] = '返回到媒体文件选择工具';
$lang['btn_subscribe'] = '订阅本页更改';
-$lang['btn_unsubscribe'] = '退订本页更改';
-$lang['btn_subscribens'] = '订阅命名空间更改';
-$lang['btn_unsubscribens'] = '退订命名空间更改';
$lang['btn_profile'] = '更新个人信息';
$lang['btn_reset'] = '重设';
$lang['btn_resendpwd'] = '发送新密码';
@@ -98,7 +96,38 @@ $lang['txt_overwrt'] = '覆盖已存在的同名文件';
$lang['lockedby'] = '目前已被下列人员锁定';
$lang['lockexpire'] = '预计锁定解除于';
$lang['willexpire'] = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突,请使用预览按钮重设计时器。';
-$lang['js']['notsavedyet'] = "未保存的更改将丢失。\n真的要继续?";
+$lang['js']['notsavedyet'] = '未保存的更改将丢失。
+真的要继续?';
+$lang['js']['searchmedia'] = '查找文件';
+$lang['js']['keepopen'] = '选中后不自动关闭窗口';
+$lang['js']['hidedetails'] = '隐藏详细信息';
+$lang['js']['mediatitle'] = '链接设置';
+$lang['js']['mediadisplay'] = '链接类型';
+$lang['js']['mediaalign'] = '对齐';
+$lang['js']['mediasize'] = '图片大小';
+$lang['js']['mediatarget'] = '链接目标';
+$lang['js']['mediaclose'] = '关闭';
+$lang['js']['mediainsert'] = '插入';
+$lang['js']['mediadisplayimg'] = '显示图片。';
+$lang['js']['mediadisplaylnk'] = '仅显示链接。';
+$lang['js']['mediasmall'] = '小尺寸';
+$lang['js']['mediamedium'] = '中等尺寸';
+$lang['js']['medialarge'] = '大尺寸';
+$lang['js']['mediaoriginal'] = '原始版本';
+$lang['js']['medialnk'] = '到详细页面的链接';
+$lang['js']['mediadirect'] = '到原始文件的直接链接';
+$lang['js']['medianolnk'] = '没有链接';
+$lang['js']['medianolink'] = '不要链接图片';
+$lang['js']['medialeft'] = '左对齐图片。';
+$lang['js']['mediaright'] = '右对齐图片。';
+$lang['js']['mediacenter'] = '居中对齐图片。';
+$lang['js']['medianoalign'] = '不使用对齐。';
+$lang['js']['nosmblinks'] = '连接到 Windows 共享功能只有在 IE 浏览器中才能正常使用。
+但您仍能复制并粘贴该链接。';
+$lang['js']['linkwiz'] = '链接向导';
+$lang['js']['linkto'] = '链接到:';
+$lang['js']['del_confirm'] = '真的要删除选中的项目吗?';
+$lang['js']['mu_btn'] = '一次上传了多个文件';
$lang['rssfailed'] = '获取该 RSS 信息时产生错误:';
$lang['nothingfound'] = '什么都没有找到。';
$lang['mediaselect'] = '媒体文件';
@@ -116,15 +145,7 @@ $lang['deletefail'] = '无法删除“%s”- 请检查权限。';
$lang['mediainuse'] = '文件“%s”无法删除 - 它正被使用中。';
$lang['namespaces'] = '命名空间';
$lang['mediafiles'] = '可用的文件';
-$lang['js']['searchmedia'] = '查找文件';
-$lang['js']['keepopen'] = '选中后不自动关闭窗口';
-$lang['js']['hidedetails'] = '隐藏详细信息';
-$lang['js']['nosmblinks'] = '连接到 Windows 共享功能只有在 IE 浏览器中才能正常使用。
-但您仍能复制并粘贴该链接。';
-$lang['js']['linkwiz'] = '链接向导';
-$lang['js']['linkto'] = '链接到:';
-$lang['js']['del_confirm'] = '真的要删除选中的项目吗?';
-$lang['js']['mu_btn'] = '一次上传了多个文件';
+$lang['accessdenied'] = '您没有权限浏览此页面。';
$lang['mediausage'] = '使用下列字符链接到该文件:';
$lang['mediaview'] = '查看该文件';
$lang['mediaroot'] = '根目录';
@@ -140,6 +161,7 @@ $lang['current'] = '当前版本';
$lang['yours'] = '您的版本';
$lang['diff'] = '显示与当前版本的差别';
$lang['diff2'] = '显示跟目前版本的差异';
+$lang['difflink'] = '到此差别页面的链接';
$lang['line'] = '行';
$lang['breadcrumb'] = '您的足迹';
$lang['youarehere'] = '您在这里';
@@ -151,8 +173,10 @@ $lang['restored'] = '已恢复为旧版';
$lang['external_edit'] = '外部编辑';
$lang['summary'] = '编辑摘要';
$lang['noflash'] = '需要 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash 插件</a> 来播放本内容。 ';
+$lang['download'] = '下载片段';
$lang['mail_newpage'] = '添加页面:';
$lang['mail_changed'] = '更改页面:';
+$lang['mail_subscribe_list'] = '命名空间中改变的页面:';
$lang['mail_new_user'] = '新用户:';
$lang['mail_upload'] = '已上传的文件:';
$lang['qb_bold'] = '粗体';
@@ -195,11 +219,22 @@ $lang['img_copyr'] = '版权';
$lang['img_format'] = '格式';
$lang['img_camera'] = '相机';
$lang['img_keywords'] = '关键字';
-$lang['subscribe_success'] = '已将 %s 成功添加到 %s 的订阅列表';
-$lang['subscribe_error'] = '无法将 %s 添加到 %s 的订阅列表';
-$lang['subscribe_noaddress'] = '您的登录信息中不包含电子邮件地址,您无法加入订阅列表';
-$lang['unsubscribe_success'] = '已将 %s 从 %s 的订阅列表中成功删除';
-$lang['unsubscribe_error'] = '无法将 %s 从 %s 的订阅列表中删除';
+$lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
+$lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
+$lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址,您无法被添加到订阅列表';
+$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_new_header'] = '添加订阅';
+$lang['subscr_m_current_header'] = '当前订阅';
+$lang['subscr_m_unsubscribe'] = '退订';
+$lang['subscr_m_subscribe'] = '订阅';
+$lang['subscr_m_receive'] = '接收';
+$lang['subscr_style_every'] = '对每次更改发送邮件';
+$lang['subscr_style_digest'] = '对每个页面发送更改的摘要邮件(每 %.2f 天)';
+$lang['subscr_style_list'] = '自上封邮件以来更改的页面的列表(每 %.2f 天)';
$lang['authmodfailed'] = '错误的用户认证设置。请通知维基管理员。';
$lang['authtempfail'] = '用户认证暂时无法使用。如果该状态一直存在,请通知维基管理员。';
$lang['i_chooselang'] = '选择您的语言';
@@ -227,6 +262,7 @@ $lang['i_pol0'] = '开放的维基(任何人都有读、写、
$lang['i_pol1'] = '公共的维基(任何人都有读的权限,只有注册用户才有写和上传的权限)';
$lang['i_pol2'] = '关闭的维基(只有注册用户才有读、写、上传的权限)';
$lang['i_retry'] = '重试';
+$lang['i_license'] = '请选择您希望的内容发布许可协议:';
$lang['mu_intro'] = '您可以在此一次上传多个文件。点按浏览按钮添加文件到上传队列中,先好后按上传钮。';
$lang['mu_gridname'] = '文件名';
$lang['mu_gridsize'] = '大小';
@@ -241,6 +277,7 @@ $lang['mu_authfail'] = '会话过期';
$lang['mu_progress'] = '@PCT@% 上传完成';
$lang['mu_filetypes'] = '允许的文件类型';
$lang['mu_info'] = '文件已上传。';
+$lang['mu_lasterr'] = '最后一个错误:';
$lang['recent_global'] = '您当前看到的是<b>%s</b> 名称空间的变动。你还可以在<a href="%s">查看整个维基的近期变动</a>。';
$lang['years'] = '%d年前';
$lang['months'] = '%d月前';
@@ -249,3 +286,4 @@ $lang['days'] = '%d天前';
$lang['hours'] = '%d小时前';
$lang['minutes'] = '%d分钟前';
$lang['seconds'] = '%d秒前';
+$lang['wordblock'] = '您的更改没有被保存,因为它包含被屏蔽的文字(垃圾信息)。';
diff --git a/inc/lang/zh/subscr_digest.txt b/inc/lang/zh/subscr_digest.txt
new file mode 100644
index 000000000..3c73ff4c5
--- /dev/null
+++ b/inc/lang/zh/subscr_digest.txt
@@ -0,0 +1,19 @@
+您好!
+
+@TITLE@ 维基中的页面 @PAGE@ 已经更改。
+这里是更改的内容:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+旧版本:@OLDPAGE@
+新版本:@NEWPAGE@
+
+要取消页面提醒,从 @DOKUWIKIURL@ 登录维基,然后浏览
+@SUBSCRIBE@
+并退订页面以及/或者命名空间的更改。
+
+--
+本邮件由以下 DokuWiki 产生
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/zh/subscr_form.txt b/inc/lang/zh/subscr_form.txt
new file mode 100644
index 000000000..65bfd4041
--- /dev/null
+++ b/inc/lang/zh/subscr_form.txt
@@ -0,0 +1,3 @@
+====== 订阅管理 ======
+
+这个页面允许您管理在当前页面和命名空间的订阅。 \ No newline at end of file
diff --git a/inc/lang/zh/subscr_list.txt b/inc/lang/zh/subscr_list.txt
new file mode 100644
index 000000000..1fc1e213c
--- /dev/null
+++ b/inc/lang/zh/subscr_list.txt
@@ -0,0 +1,16 @@
+您好!
+
+@TITLE@ 维基中的命名空间 @PAGE@ 的页面已经更改。
+这里是更改的页面:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+要取消页面提醒,从 @DOKUWIKIURL@ 登录维基,然后浏览
+@SUBSCRIBE@
+并退订页面以及/或者命名空间的更改。
+
+--
+本邮件由以下 DokuWiki 产生
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/zh/subscr_single.txt b/inc/lang/zh/subscr_single.txt
new file mode 100644
index 000000000..7da57d570
--- /dev/null
+++ b/inc/lang/zh/subscr_single.txt
@@ -0,0 +1,22 @@
+您好!
+
+@TITLE@ 维基中的页面 @PAGE@ 已经更改。
+这里是更改的内容:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+时间:@DATE@
+用户:@USER@
+编辑摘要:@SUMMARY@
+旧版本:@OLDPAGE@
+新版本:@NEWPAGE@
+
+要取消页面提醒,从 @DOKUWIKIURL@ 登录维基,然后浏览
+@SUBSCRIBE@
+并退订页面以及/或者命名空间的更改。
+
+--
+本邮件由以下 DokuWiki 产生
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/zh/subscribermail.txt b/inc/lang/zh/subscribermail.txt
deleted file mode 100644
index 1a0a0aa16..000000000
--- a/inc/lang/zh/subscribermail.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-您好!
-
-@TITLE@ 中的 @PAGE@ 页面已更改。
-下面是更改的详细情况:
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-要退订本页,请登录维基
-@DOKUWIKIURL@ 然后访问
-@NEWPAGE@
-并选择'退订更改'。
-
---
-本邮件由 DokuWiki 自动创建
-@DOKUWIKIURL@
-
-
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 435b8aa46..20f0e6ca3 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -298,6 +298,10 @@ class Doku_Parser_Mode_hr extends Doku_Parser_Mode {
}
//-------------------------------------------------------------------
+/**
+ * This class sets the markup for bold (=strong),
+ * italic (=emphasis), underline etc.
+ */
class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
var $type;
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index b54ccf050..a178b2457 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -239,9 +239,9 @@ class Doku_Renderer extends DokuWiki_Plugin {
$src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL
) {}
- function table_open($maxcols = NULL, $numrows = NULL, $pos){}
+ function table_open($maxcols = null, $numrows = null, $pos = null){}
- function table_close($pos){}
+ function table_close($pos = null){}
function tablerow_open(){}
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5a3d945d1..37900b2c3 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -902,16 +902,23 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
// $numrows not yet implemented
- function table_open($maxcols = NULL, $numrows = NULL, $pos){
+ function table_open($maxcols = null, $numrows = null, $pos = null){
global $lang;
// initialize the row counter used for classes
$this->_counter['row_counter'] = 0;
- $this->doc .= '<div class="table ' . $this->startSectionEdit($pos, 'table') . '"><table class="inline">'.DOKU_LF;
+ $class = 'table';
+ if ($pos !== null) {
+ $class .= ' ' . $this->startSectionEdit($pos, 'table');
+ }
+ $this->doc .= '<div class="' . $class . '"><table class="inline">' .
+ DOKU_LF;
}
- function table_close($pos){
+ function table_close($pos = null){
$this->doc .= '</table></div>'.DOKU_LF;
- $this->finishSectionEdit($pos);
+ if ($pos !== null) {
+ $this->finishSectionEdit($pos);
+ }
}
function tablerow_open(){
diff --git a/inc/subscription.php b/inc/subscription.php
index 52091bafe..08d4cb241 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -44,9 +44,26 @@ function subscription_filename($id) {
*
* @author Adrian Lang <lang@cosmocode.de>
*/
+function subscription_lock_filename ($id){
+ global $conf;
+ return $conf['lockdir'].'/_subscr_' . $id . '.lock';
+}
+
function subscription_lock($id) {
- $lockf = subscription_filename($id) . '.lock';
- return !file_exists($lockf) && touch($lockf);
+ // FIXME merge this with the indexer lock generation, abstract out
+ global $conf;
+ $lock = subscription_lock_filename($id);
+ while(!@mkdir($lock,$conf['dmode'])){
+ usleep(50);
+ if(time()-@filemtime($lock) > 60*5){
+ // looks like a stale lock - remove it
+ @rmdir($lock);
+ }else{
+ return false;
+ }
+ }
+ if($conf['dperm']) chmod($lock, $conf['dperm']);
+ return true;
}
/**
@@ -58,8 +75,8 @@ function subscription_lock($id) {
* @author Adrian Lang <lang@cosmocode.de>
*/
function subscription_unlock($id) {
- $lockf = subscription_filename($id) . '.lock';
- return file_exists($lockf) && unlink($lockf);
+ $lockf = subscription_lock_filename($id);
+ return @rmdir($lockf);
}
/**
@@ -98,7 +115,7 @@ function subscription_set($user, $page, $style, $data = null,
// io_deleteFromFile does not return false if no line matched.
return io_deleteFromFile($file,
- subscription_regex(array('user' => $user)),
+ subscription_regex(array('user' => auth_nameencode($user))),
true);
}
@@ -158,6 +175,10 @@ function subscription_find($page, $pre) {
// This is an old subscription file.
$subscription = trim($subscription) . " every\n";
}
+
+ list($user, $rest) = explode(' ', $subscription, 2);
+ $subscription = rawurldecode($user) . " " . $rest;
+
if (preg_match(subscription_regex($pre), $subscription,
$line_matches) === 0) {
continue;
@@ -251,7 +272,7 @@ function subscription_addresslist(&$data){
$self = $data['self'];
$addresslist = $data['addresslist'];
- if (!$conf['subscribers']) {
+ if (!$conf['subscribers'] || $auth === null) {
return '';
}
$pres = array('style' => 'every', 'escaped' => true);