summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/indexer.php9
-rw-r--r--lib/exe/js.php4
-rw-r--r--lib/plugins/acl/lang/hi/lang.php1
-rw-r--r--lib/plugins/acl/lang/la/help.txt11
-rw-r--r--lib/plugins/acl/lang/la/lang.php33
-rw-r--r--lib/plugins/acl/lang/zh/lang.php1
-rw-r--r--lib/plugins/config/admin.php4
-rw-r--r--lib/plugins/config/lang/da/lang.php3
-rw-r--r--lib/plugins/config/lang/de-informal/lang.php8
-rw-r--r--lib/plugins/config/lang/de/lang.php2
-rw-r--r--lib/plugins/config/lang/eu/lang.php4
-rw-r--r--lib/plugins/config/lang/fi/lang.php4
-rw-r--r--lib/plugins/config/lang/hi/lang.php2
-rw-r--r--lib/plugins/config/lang/ja/lang.php4
-rw-r--r--lib/plugins/config/lang/la/intro.txt7
-rw-r--r--lib/plugins/config/lang/la/lang.php180
-rw-r--r--lib/plugins/config/lang/pt/lang.php4
-rw-r--r--lib/plugins/config/lang/zh/lang.php7
-rw-r--r--lib/plugins/plugin/classes/ap_manage.class.php2
-rw-r--r--lib/plugins/plugin/lang/hi/lang.php6
-rw-r--r--lib/plugins/plugin/lang/la/admin_plugin.txt3
-rw-r--r--lib/plugins/plugin/lang/la/lang.php49
-rw-r--r--lib/plugins/plugin/lang/zh/lang.php1
-rw-r--r--lib/plugins/popularity/lang/hi/lang.php2
-rw-r--r--lib/plugins/popularity/lang/ja/lang.php1
-rw-r--r--lib/plugins/popularity/lang/la/intro.txt5
-rw-r--r--lib/plugins/popularity/lang/la/lang.php7
-rw-r--r--lib/plugins/popularity/lang/zh/lang.php1
-rw-r--r--lib/plugins/revert/lang/hi/lang.php1
-rw-r--r--lib/plugins/revert/lang/la/intro.txt3
-rw-r--r--lib/plugins/revert/lang/la/lang.php14
-rw-r--r--lib/plugins/revert/lang/zh/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/hi/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/la/add.txt1
-rw-r--r--lib/plugins/usermanager/lang/la/delete.txt1
-rw-r--r--lib/plugins/usermanager/lang/la/edit.txt1
-rw-r--r--lib/plugins/usermanager/lang/la/intro.txt1
-rw-r--r--lib/plugins/usermanager/lang/la/lang.php46
-rw-r--r--lib/plugins/usermanager/lang/la/list.txt1
-rw-r--r--lib/plugins/usermanager/lang/zh/lang.php1
-rw-r--r--lib/scripts/hotkeys.js2
-rw-r--r--lib/scripts/linkwiz.js1
-rw-r--r--lib/scripts/media.js8
-rw-r--r--lib/tpl/default/media.css2
-rw-r--r--lib/tpl/default/rtl.css2
45 files changed, 433 insertions, 19 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 61cf83acc..f35f9ed72 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -26,7 +26,8 @@ if(!$defer){
$ID = cleanID($_REQUEST['id']);
// Catch any possible output (e.g. errors)
-if(!isset($_REQUEST['debug'])) ob_start();
+$output = isset($_REQUEST['debug']) && $conf['allowdebug'];
+if(!$output) ob_start();
// run one of the jobs
$tmp = array(); // No event data
@@ -42,7 +43,7 @@ if ($evt->advise_before()) {
}
if($defer) sendGIF();
-if(!isset($_REQUEST['debug'])) ob_end_clean();
+if(!$output) ob_end_clean();
exit;
// --------------------------------------------------------------------
@@ -163,10 +164,6 @@ function runIndexer(){
}
if($conf['dperm']) chmod($lock, $conf['dperm']);
- // upgrade to version 2
- if (!@file_exists($conf['indexdir'].'/pageword.idx'))
- idx_upgradePageWords();
-
// do the work
idx_addPage($ID);
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 3756c43b9..f9682e1e9 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -51,7 +51,7 @@ function js_out(){
DOKU_INC.'lib/scripts/linkwiz.js',
DOKU_INC.'lib/scripts/media.js',
DOKU_INC.'lib/scripts/subscriptions.js',
- DOKU_INC.'lib/scripts/hotkeys.js',
+# disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js',
DOKU_TPLINC.'script.js',
);
@@ -117,7 +117,7 @@ function js_out(){
js_runonstart('scrollToMarker()');
js_runonstart('focusMarker()');
// init hotkeys - must have been done after init of toolbar
- js_runonstart('initializeHotkeys()');
+# disabled for FS#1958 js_runonstart('initializeHotkeys()');
// end output buffering and get contents
$js = ob_get_contents();
diff --git a/lib/plugins/acl/lang/hi/lang.php b/lib/plugins/acl/lang/hi/lang.php
index d8630a281..d6f78ffd6 100644
--- a/lib/plugins/acl/lang/hi/lang.php
+++ b/lib/plugins/acl/lang/hi/lang.php
@@ -3,4 +3,5 @@
* Hindi language file
*
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
diff --git a/lib/plugins/acl/lang/la/help.txt b/lib/plugins/acl/lang/la/help.txt
new file mode 100644
index 000000000..ba974f48c
--- /dev/null
+++ b/lib/plugins/acl/lang/la/help.txt
@@ -0,0 +1,11 @@
+=== Auxilium: ===
+
+Hic facultates spatiorum nominis paginarumque addere delereue potes.
+
+Tabella sinistra omnes paginas spatia nominisque ostendit.
+
+His campis mutare facultates electorum Sodalium Gregumque potes.
+
+In tabula omnes administrationis leges ostensae sunt. Delere quoque uel mutare plures leges potes.
+
+Si [[doku>acl|official documentation on ACL]] legas, maius auxilium in Vicem mutando habes. \ No newline at end of file
diff --git a/lib/plugins/acl/lang/la/lang.php b/lib/plugins/acl/lang/la/lang.php
new file mode 100644
index 000000000..dd6043602
--- /dev/null
+++ b/lib/plugins/acl/lang/la/lang.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Latin language file
+ *
+ */
+$lang['admin_acl'] = 'Aditus Administrationis Aditus';
+$lang['acl_group'] = 'Grex';
+$lang['acl_user'] = 'Sodalis';
+$lang['acl_perms'] = 'Facultas:';
+$lang['page'] = 'Pagina';
+$lang['namespace'] = 'Spatium nominis';
+$lang['btn_select'] = 'eligere';
+$lang['p_user_id'] = 'Sodalis <b class="acluser">%s</b> nunc has facultates paginae "<b class="aclpage">%s</b> habes: <i>%s</i>.';
+$lang['p_user_ns'] = 'Sodalis <b class="acluser">%s</b> nunc has facultates spatio nominis "<b class="aclns">%s</b> habes: <i>%s</i>.';
+$lang['p_group_id'] = 'Socius\a gregis <b class="aclgroup">%s</b> nunc has facultates paginae "<b class="aclpage">%s</b> habes: <i>%s</i>.';
+$lang['p_group_ns'] = 'Socius\a gregis <b class="aclgroup">%s</b> nunc has facultates paginae "<b class="aclns">%s</b> habes: <i>%s</i>.';
+$lang['p_choose_id'] = '<b>Sodalis grexue</b> in campo insere ut facultates paginae <b class="aclpage">%s</b> uideas.';
+$lang['p_choose_ns'] = '<b>Sodalis grexue</b> in campo insere ut facultates paginae <b class="aclns">%s</b> uideas.';
+$lang['p_inherited'] = 'Caue: hae facultates et huic rei et aliis gregibus uel spatiis nominis legitimae sunt.';
+$lang['p_isadmin'] = 'Caue: electi greges semper plenum ius habent, eo quod ut magister\stra elegitur.';
+$lang['p_include'] = 'Maiores facultates minores includunt. Creare, onerare uel delere facultates solum spatis nominis, non paginis potes';
+$lang['current'] = 'Communes AAA leges';
+$lang['where'] = 'Pagina/Spatium nominis';
+$lang['who'] = 'Sodalis/Grex';
+$lang['perm'] = 'Facultates';
+$lang['acl_perm0'] = 'Nihil';
+$lang['acl_perm1'] = 'Legere';
+$lang['acl_perm2'] = 'Recensere';
+$lang['acl_perm4'] = 'Creare';
+$lang['acl_perm8'] = 'Onerare';
+$lang['acl_perm16'] = 'Delere';
+$lang['acl_new'] = 'Nouom addere';
+$lang['acl_mod'] = 'Nouom recensere';
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index f9f924089..e806ad434 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/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['admin_acl'] = '访问控制列表(ACL)管理器';
$lang['acl_group'] = '组';
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 49712b73f..d245d3fce 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -109,7 +109,11 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
elseif ($this->_changed)
ptln('<div class="success">'.$this->getLang('updated').'</div>');
+ // POST to script() instead of wl($ID) so config manager still works if
+ // rewrite config is broken. Add $ID as hidden field to remember
+ // current ID in most cases.
ptln('<form action="'.script().'" method="post">');
+ ptln('<input type="hidden" name="id" value="'.$ID.'" />');
formSecurityToken();
$this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php
index 29c222174..bc2bc0560 100644
--- a/lib/plugins/config/lang/da/lang.php
+++ b/lib/plugins/config/lang/da/lang.php
@@ -100,6 +100,7 @@ $lang['useslash'] = 'Brug skråstreg som navnerumsdeler i netadress
$lang['usedraft'] = 'Gem automatisk en kladde under redigering';
$lang['sepchar'] = 'Orddelingstegn til sidenavne';
$lang['canonical'] = 'Benyt fuldt kanoniske netadresser';
+$lang['fnencode'] = 'Metode for indkodning af ikke ASCII filnavne';
$lang['autoplural'] = 'Tjek for flertalsendelser i henvisninger';
$lang['compression'] = 'Pakningsmetode for attic-filer';
$lang['cachetime'] = 'Længste levetid for "cache" (sek)';
@@ -140,6 +141,7 @@ $lang['proxy____port'] = 'Proxy-port';
$lang['proxy____user'] = 'Proxy-brugernavn';
$lang['proxy____pass'] = 'Proxy-kodeord';
$lang['proxy____ssl'] = 'Brug SSL til at forbinde til proxy';
+$lang['proxy____except'] = 'Regular expression til at matche URL\'er for hvilke proxier der skal ignores';
$lang['safemodehack'] = 'Slå "safemode hack" til ';
$lang['ftp____host'] = 'FTP-server til "safemode hack"';
$lang['ftp____port'] = 'FTP-port til "safemode hack"';
@@ -187,3 +189,4 @@ $lang['useheading_o_0'] = 'Aldrig';
$lang['useheading_o_navigation'] = 'Kun navigering';
$lang['useheading_o_content'] = 'Kun wiki-indhold';
$lang['useheading_o_1'] = 'Altid';
+$lang['readdircache'] = 'Maksimum alder for readdir hukommelse (sek)';
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 54769bb22..01beeeeb9 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -118,23 +118,23 @@ $lang['renderer_xhtml'] = 'Standard-Renderer für die normale (XHTML) Wik
$lang['renderer__core'] = '%s (DokuWiki Kern)';
$lang['renderer__plugin'] = '%s (Erweiterung)';
$lang['rememberme'] = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)';
-$lang['rss_type'] = 'XML Feed-Typ';
+$lang['rss_type'] = 'XML-Feed-Format';
$lang['rss_linkto'] = 'XML-Feed verlinken auf';
$lang['rss_content'] = 'Was soll in XML-Feedinhalten angezeigt werden?';
$lang['rss_update'] = 'Aktualisierungsintervall für XML-Feeds (Sekunden)';
$lang['recent_days'] = 'Wie viele Änderungen sollen vorgehalten werden? (Tage)';
$lang['rss_show_summary'] = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
$lang['target____wiki'] = 'Zielfenstername für interne Links';
-$lang['target____interwiki'] = 'Zielfenstername für interwiki Links';
+$lang['target____interwiki'] = 'Zielfenstername für InterWiki-Links';
$lang['target____extern'] = 'Zielfenstername für externe Links';
$lang['target____media'] = 'Zielfenstername für Medienlinks';
-$lang['target____windows'] = 'Zielfenstername für Windowslinks';
+$lang['target____windows'] = 'Zielfenstername für Windows-Freigaben-Links';
$lang['proxy____host'] = 'Proxyadresse';
$lang['proxy____port'] = 'Proxyport';
$lang['proxy____user'] = 'Benutzername für den Proxy';
$lang['proxy____pass'] = 'Passwort von dem Proxybenutzer';
$lang['proxy____ssl'] = 'SSL verwenden um auf den Proxy zu zugreifen';
-$land['proxy____except'] = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
+$lang['proxy____except'] = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
$lang['safemodehack'] = 'Aktiviere safemode Hack';
$lang['ftp____host'] = 'FTP Server für safemode Hack';
$lang['ftp____port'] = 'FTP Port für safemode Hack';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index b1e92174d..aa763da03 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -143,7 +143,7 @@ $lang['proxy____port'] = 'Proxy-Port';
$lang['proxy____user'] = 'Proxy Nutzername';
$lang['proxy____pass'] = 'Proxy Passwort';
$lang['proxy____ssl'] = 'SSL bei Verbindung zum Proxy verwenden';
-$land['proxy____except'] = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
+$lang['proxy____except'] = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
$lang['safemodehack'] = 'Safemodehack verwenden';
$lang['ftp____host'] = 'FTP-Host für Safemodehack';
$lang['ftp____port'] = 'FTP-Port für Safemodehack';
diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php
index 380b00971..a50bd6d4e 100644
--- a/lib/plugins/config/lang/eu/lang.php
+++ b/lib/plugins/config/lang/eu/lang.php
@@ -91,6 +91,7 @@ $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile modu
$lang['usedraft'] = 'Automatikoki zirriborroa gorde editatze garaian';
$lang['sepchar'] = 'Orri izenaren hitz banatzailea';
$lang['canonical'] = 'Erabili URL erabat kanonikoak';
+$lang['fnencode'] = 'Non-ASCII fitxategi izenak kodetzeko metodoa.';
$lang['autoplural'] = 'Kontrolatu forma pluralak esteketan';
$lang['compression'] = 'Trinkotze metodoa attic fitxategientzat';
$lang['cachetime'] = 'Adin maximoa cachearentzat (seg)';
@@ -104,6 +105,7 @@ $lang['gdlib'] = 'GD Lib bertsioa';
$lang['im_convert'] = 'ImageMagick-en aldaketa tresnara bidea';
$lang['jpg_quality'] = 'JPG konprimitze kalitatea (0-100)';
$lang['subscribers'] = 'Gaitu orri harpidetza euskarria';
+$lang['subscribe_time'] = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.';
$lang['compress'] = 'Trinkotu CSS eta javascript irteera';
$lang['hidepages'] = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)';
$lang['send404'] = 'Bidali "HTTP 404/Ez Da Orria Aurkitu" existitzen ez diren orrientzat';
@@ -130,6 +132,7 @@ $lang['proxy____port'] = 'Proxy portua';
$lang['proxy____user'] = 'Proxyaren erabiltzaile izena';
$lang['proxy____pass'] = 'Proxyaren pasahitza ';
$lang['proxy____ssl'] = 'Erabili SSL Proxyra konektatzeko';
+$lang['proxy____except'] = 'URLak detektatzeko espresio erregularra, zeinentzat Proxy-a sahiestu beharko litzatekeen.';
$lang['safemodehack'] = 'Gaitu modu segurua hack-a';
$lang['ftp____host'] = 'FTP zerbitzaria modu seguruarentzat';
$lang['ftp____port'] = 'FTP portua modu seguruarentzat';
@@ -177,3 +180,4 @@ $lang['useheading_o_0'] = 'Inoiz';
$lang['useheading_o_navigation'] = 'Nabigazioa Bakarrik';
$lang['useheading_o_content'] = 'Wiki Edukia Bakarrik';
$lang['useheading_o_1'] = 'Beti';
+$lang['readdircache'] = 'Aintzintasun maximoa readdir cache-rentzat (seg)';
diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php
index f5c7b911b..b033e312b 100644
--- a/lib/plugins/config/lang/fi/lang.php
+++ b/lib/plugins/config/lang/fi/lang.php
@@ -85,7 +85,7 @@ $lang['disableactions_wikicode'] = 'Näytä lähdekoodi/Vie raakana';
$lang['disableactions_other'] = 'Muut toiminnot (pilkulla erotettuna)';
$lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla';
$lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)';
-$lang['securecookie'] = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhdeydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.';
+$lang['securecookie'] = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.';
$lang['xmlrpc'] = 'Käytä/poista XML-RPC liityntää';
$lang['xmlrpcuser'] = 'Estä XML-RPC:n käyttö pilkulla erotetun listan ryhmille tai käyttäjille. Jätä tyhjäksi salliaksesi käyttö kaikille.';
$lang['updatecheck'] = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys splitbrain.orgiin.';
@@ -94,7 +94,7 @@ $lang['useslash'] = 'Käytä kauttaviivaa nimiavaruuksien erottimen
$lang['usedraft'] = 'Tallenna vedos muokkaustilassa automaattisesti ';
$lang['sepchar'] = 'Sivunimen sanaerotin';
$lang['canonical'] = 'Käytä kanonisoituja URLeja';
-$lang['fnencode'] = 'Muita kuin ASCII merkkejä sisältävien tiedotonimien koodaustapa.';
+$lang['fnencode'] = 'Muita kuin ASCII merkkejä sisältävien tiedostonimien koodaustapa.';
$lang['autoplural'] = 'Etsi monikkomuotoja linkeistä';
$lang['compression'] = 'Attic-tiedostojen pakkausmenetelmä';
$lang['cachetime'] = 'Välimuisti-tiedostojen maksimi-ikä (sek)';
diff --git a/lib/plugins/config/lang/hi/lang.php b/lib/plugins/config/lang/hi/lang.php
index d73b62764..a224fdf7c 100644
--- a/lib/plugins/config/lang/hi/lang.php
+++ b/lib/plugins/config/lang/hi/lang.php
@@ -3,6 +3,7 @@
* Hindi language file
*
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
$lang['sepchar'] = 'पृष्ठ का नाम शब्द प्रथक्कर';
$lang['sitemap'] = 'गूगल का सूचना पटल नक्शा बनायें (दिन)';
@@ -10,3 +11,4 @@ $lang['license_o_'] = 'कुछ नहीं चुना';
$lang['typography_o_0'] = 'कुछ नहीं';
$lang['showuseras_o_username'] = 'उपयोगकर्ता का पूर्ण नाम';
$lang['useheading_o_0'] = 'कभी नहीं';
+$lang['useheading_o_1'] = 'हमेशा';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index c3bca045d..9ec416196 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -97,6 +97,7 @@ $lang['useslash'] = 'URL上の名前空間の区切りにスラッ
$lang['usedraft'] = '編集中の自動保存(ドラフト)機能を使用';
$lang['sepchar'] = 'ページ名の単語区切り文字';
$lang['canonical'] = 'canonical URL(正準URL)を使用';
+$lang['fnencode'] = '非アスキーファイル名のエンコーディング方法';
$lang['autoplural'] = '自動複数形処理';
$lang['compression'] = 'アーカイブファイルの圧縮方法';
$lang['cachetime'] = 'キャッシュ保持時間(秒)';
@@ -110,6 +111,7 @@ $lang['gdlib'] = 'GDlibバージョン';
$lang['im_convert'] = 'ImageMagick変換ツールへのパス';
$lang['jpg_quality'] = 'JPG圧縮品質(0-100)';
$lang['subscribers'] = '更新通知機能';
+$lang['subscribe_time'] = '購読リストと概要を送信する期間(秒)。「最近の変更とする期間」で指定した期間より小さくしてください。';
$lang['compress'] = 'CSSとJavaScriptを圧縮';
$lang['hidepages'] = '非公開ページ(Regex)';
$lang['send404'] = '文書が存在しないページに"HTTP404/Page Not Found"を使用';
@@ -136,6 +138,7 @@ $lang['proxy____port'] = 'プロキシ - ポート';
$lang['proxy____user'] = 'プロキシ - ユーザー名';
$lang['proxy____pass'] = 'プロキシ - パスワード';
$lang['proxy____ssl'] = 'プロキシへの接続にsslを使用';
+$lang['proxy____except'] = 'スキップするプロキシのURL正規表現';
$lang['safemodehack'] = 'セーフモード対策を行う';
$lang['ftp____host'] = 'FTP サーバー名(セーフモード対策)';
$lang['ftp____port'] = 'FTP ポート(セーフモード対策)';
@@ -183,3 +186,4 @@ $lang['useheading_o_0'] = '使用しない';
$lang['useheading_o_navigation'] = 'ナビゲーションのみ';
$lang['useheading_o_content'] = 'Wikiの内容のみ';
$lang['useheading_o_1'] = '常に使用する';
+$lang['readdircache'] = 'readdir キャッシュの最大保持期間(秒)';
diff --git a/lib/plugins/config/lang/la/intro.txt b/lib/plugins/config/lang/la/intro.txt
new file mode 100644
index 000000000..d23029ab1
--- /dev/null
+++ b/lib/plugins/config/lang/la/intro.txt
@@ -0,0 +1,7 @@
+====== Administrationis Administrator ======
+
+In hac pagina administratoris optiones mutare et inspicere potes. Auxilia in pagina [[doku>config]] sunt, si singulas res uidere uis, i ad paginam [[doku>plugin:config]].
+
+Optiones ostensae rubro colore tutae et non nunc mutabiles sunt. Optiones ostensae caeruleo colore praecipuae sunt et optiones ostensae in area alba singulares huic uici sunt. Et caerulae et albae optiones mutabiles sunt.
+
+Memento premere **SERVA** ante quam nouam paginam eas: si hoc non facias, mutata amissa sunt. \ No newline at end of file
diff --git a/lib/plugins/config/lang/la/lang.php b/lib/plugins/config/lang/la/lang.php
new file mode 100644
index 000000000..ca0eb1c31
--- /dev/null
+++ b/lib/plugins/config/lang/la/lang.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Latin language file
+ *
+ */
+$lang['menu'] = 'Optiones Administrationis';
+$lang['error'] = 'Optiones non nouatae ob errores: rursum temptat. Errores rubro colore signati sunt.';
+$lang['updated'] = 'Optiones feliciter nouatae.';
+$lang['nochoice'] = '(nulla optio est)';
+$lang['locked'] = 'Optio documenti non nouata est, <br/> optiones et facultates documenti inspicis.';
+$lang['danger'] = 'CAVE: si has optiones mutabis, in administrationis indicem non inire potes.';
+$lang['warning'] = 'CAVE: si hae optiones mutantur, graues errores erunt.';
+$lang['security'] = 'CAVE: si hae optiones mutantur, graues errores erunt.';
+$lang['_configuration_manager'] = 'Administrationis Administrator';
+$lang['_header_dokuwiki'] = 'Vicis Optiones';
+$lang['_header_plugin'] = 'Addendorum Optiones';
+$lang['_header_template'] = 'Vicis Formae Optiones';
+$lang['_header_undefined'] = 'Variae Optiones';
+$lang['_basic'] = 'Fundamenti Optiones';
+$lang['_display'] = 'Visiuae Optiones';
+$lang['_authentication'] = 'Confirmationis Optiones';
+$lang['_anti_spam'] = 'Malorum Optiones';
+$lang['_editing'] = 'Recensendi Optiones';
+$lang['_links'] = 'Nexi Optiones';
+$lang['_media'] = 'Visiuorum Optiones';
+$lang['_advanced'] = 'Maiores Optiones';
+$lang['_network'] = 'Interretis Optiones';
+$lang['_plugin_sufix'] = 'Addendorum Optiones';
+$lang['_template_sufix'] = 'Vicis Formae Optiones';
+$lang['_msg_setting_undefined'] = 'Res codicum sine optionibus.';
+$lang['_msg_setting_no_class'] = 'Classes sine optionibus';
+$lang['_msg_setting_no_default'] = 'Nihil';
+$lang['fmode'] = 'Documentum creandum ratio';
+$lang['dmode'] = 'Scrinia creandam ratio';
+$lang['lang'] = 'Linguae optiones';
+$lang['basedir'] = 'Computatoris seruitoris domicilium (ex. <code>/dokuwiki/</code>). Nihil scribere si id machinatione agnoscere uis.';
+$lang['baseurl'] = 'Computatoris seruitoris VRL (ex. <code>http://www.yourserver.com</code>). Nihil scribere si id machinatione agnoscere uis.';
+$lang['savedir'] = 'Documentorum seruatorum domicilium';
+$lang['start'] = 'Nomen paginae dominicae';
+$lang['title'] = 'Vicis titulus';
+$lang['template'] = 'Vicis forma';
+$lang['license'] = 'Sub quibus legibus uicem creare uin?';
+$lang['fullpath'] = 'Totum domicilium paginae in pedibus scribis.';
+$lang['recent'] = 'Extremae mutationes';
+$lang['breadcrumbs'] = 'Numerus uestigiorum';
+$lang['youarehere'] = 'Ordo uestigiorum';
+$lang['typography'] = 'Signa supponentes';
+$lang['htmlok'] = 'HTML aptum facere';
+$lang['phpok'] = 'PHP aptum facere';
+$lang['dformat'] = 'Forma diei (uide paginam <a href="http://www.php.net/strftime">de diebus</a>)';
+$lang['signature'] = 'Subscriptio';
+$lang['toptoclevel'] = 'Gradus maior tabularum argumentorum';
+$lang['tocminheads'] = 'Minimus numerus capitum';
+$lang['maxtoclevel'] = 'Maximus numerus tabularum argumentorum';
+$lang['maxseclevel'] = 'Maxima pars gradus recensendi';
+$lang['camelcase'] = 'SignaContinua nexis apta facere';
+$lang['deaccent'] = 'Titulus paginarum abrogare';
+$lang['useheading'] = 'Capite primo ut titulo paginae uti';
+$lang['refcheck'] = 'Documenta uisiua inspicere';
+$lang['refshow'] = 'Numerus documentorum ostendorum';
+$lang['allowdebug'] = '<b>ineptum facias si non necessarium!</b> aptum facere';
+$lang['usewordblock'] = 'Malum interretiale ob uerba delere';
+$lang['indexdelay'] = 'Tempus transitum in ordinando (sec)';
+$lang['relnofollow'] = 'rel="nofollow" externis nexis uti';
+$lang['mailguard'] = 'Cursus interretiales abscondere';
+$lang['iexssprotect'] = 'Documenta nouata ob mala JavaScript uel HTML inspicere';
+$lang['showuseras'] = 'Quid, cum Sodalem, qui extremus paginam recensuit, ostendat, scribere';
+$lang['useacl'] = 'Aditus inspectionis indicibus uti';
+$lang['autopasswd'] = 'Tessera machinatione generata';
+$lang['authtype'] = 'Confirmationis finis';
+$lang['passcrypt'] = 'Ratio tesserae tuendae';
+$lang['defaultgroup'] = 'Grex communis';
+$lang['superuser'] = 'Magister\stra - grex, Sodalis uel index diuisus a uigulis sodalis1,@grex,sodalis2 cum plenis facultatibus sine AAA optionum termino';
+$lang['manager'] = 'Administrator - grex, Sodalis uel index diuisus a uigulis sodalis1,@grex,sodalis2 cum certis facultatibus';
+$lang['profileconfirm'] = 'Mutationes tessera confirmanda sunt';
+$lang['disableactions'] = 'Vicis actiones ineptas facere';
+$lang['disableactions_check'] = 'Inspicere';
+$lang['disableactions_subscription'] = 'Inscribe/Delere';
+$lang['disableactions_wikicode'] = 'Fontem uidere/Rudem transcribere';
+$lang['disableactions_other'] = 'Aliae actiones (uirgulis diuisae)';
+$lang['sneaky_index'] = 'Hic uicis omnes spatia nomini in indice inserit. Si ineptam hanc optionem facias, solum ea spatia, quae Sodales uidere possunt, in indice erunt. Hoc suggreges et subspatia abscondere potest.';
+$lang['auth_security_timeout'] = 'Confirmationis Tempus (secundis)';
+$lang['securecookie'] = 'Formulae HTTPS mittine solum per HTTPS possunt? Ineptam hanc optio facias, si accessus uicis tutus est, sed interretis non.';
+$lang['xmlrpc'] = 'Aptam\Ineptam XML-RPC administrationem facere';
+$lang['xmlrpcuser'] = 'Accessus XML-RPC gregibus uel Sodalibus in hoc indice astringere. Nihil scribere ut omnes accessum habeant';
+$lang['updatecheck'] = 'Nouationes et fiducias inspicerene? Hic uicis connectere splitbrain.org debes.';
+$lang['userewrite'] = 'VRL formosis uti';
+$lang['useslash'] = 'Repagula ut spatium nominis diuidas uti';
+$lang['usedraft'] = 'Propositum in recensione machinatione seruatur';
+$lang['sepchar'] = 'Signum, quod paginas diuidit';
+$lang['canonical'] = 'VRL perfecto uti';
+$lang['fnencode'] = 'Ratio quae nomen documentorum non-ASCII codificit';
+$lang['autoplural'] = 'Pluralia in nexis inspicere';
+$lang['compression'] = 'Ratio compressionis documentis "attic"';
+$lang['cachetime'] = 'Maximum tempus formulis (sec)';
+$lang['locktime'] = 'Maximum tempus documentis inclusis (sec)';
+$lang['fetchsize'] = 'Maximum pondus (bytes), quod fetch.php ab externis onerare potest';
+$lang['notify'] = 'Adnotationis mutationes ad hunc cursum mittere';
+$lang['registernotify'] = 'De nouis Sodalibus ad hunc cursum notas mittere';
+$lang['mailfrom'] = 'Cursus interretialis, quo in cursibus uti';
+$lang['gzip_output'] = 'gzip Argumentum-Codificans xhtml uti';
+$lang['gdlib'] = 'GD Lib uersio';
+$lang['im_convert'] = 'Domicilium machinae ImageMagick\'s';
+$lang['jpg_quality'] = 'JPG compressio colorum (0-100)';
+$lang['subscribers'] = 'Inscriptionis paginarum auxilium aptus facere';
+$lang['subscribe_time'] = 'Tempus post quod inscriptionum index et summa missa sunt (sec); Hic minor quam tempus declaratum fortasse est.';
+$lang['compress'] = 'CSS et javascript dimissio';
+$lang['hidepages'] = 'Paginas congruentes abscondere (uerba regularia)';
+$lang['send404'] = 'Mitte "HTTP 404/ Pagina non reperta" si paginae non sunt.';
+$lang['sitemap'] = 'Google formam situs gignere (dies)';
+$lang['broken_iua'] = 'ignore_user_abort functio inepta estne? Hoc indicem quaestionum, quae non aptae sunt, creare non potest. IIS+PHP/CGI ineptum est. Vide <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a>';
+$lang['xsendfile'] = 'X-Sendfile utine ut seruitor interretialis documenta firma creet? Tuus seruitor interretialis hunc pati debes.';
+$lang['renderer_xhtml'] = 'Quid dimittere ut hoc in principio uicis (xhtml) utaris';
+$lang['renderer__core'] = '%s (uicis nucleus)';
+$lang['renderer__plugin'] = '%s (addenda)';
+$lang['rememberme'] = 'Formulas aditus aptas facere (memento me)';
+$lang['rss_type'] = 'XML summae genus';
+$lang['rss_linkto'] = 'XML summae connectio';
+$lang['rss_content'] = 'Quid in XML summis uidere?';
+$lang['rss_update'] = 'XML summae renouationis interuallum temporis';
+$lang['recent_days'] = 'Numerus mutationum recentium tenendorum (dies)';
+$lang['rss_show_summary'] = 'XML summa titulos ostendit';
+$lang['target____wiki'] = 'Fenestra nexis internis';
+$lang['target____interwiki'] = 'Fenestra nexis inter uicem';
+$lang['target____extern'] = 'Fenestra nexis externis';
+$lang['target____media'] = 'Fenestra nexis uisiuis';
+$lang['target____windows'] = 'Fenestra nexis fenestrarum';
+$lang['proxy____host'] = 'Proxis seruitoris nomen';
+$lang['proxy____port'] = 'Proxis portus';
+$lang['proxy____user'] = 'Proxis nomen sodalis';
+$lang['proxy____pass'] = 'Proxis tessera';
+$lang['proxy____ssl'] = 'SSL ut connectas uti';
+$lang['proxy____except'] = 'Verba, ut VRL inspicias, quibus Proxis non agnoscitur.';
+$lang['safemodehack'] = 'Ad tempus conseruatio apta facere';
+$lang['ftp____host'] = 'FTP computator seruitor ad tempus seruatis';
+$lang['ftp____port'] = 'FTP ianua ad tempus seruatis';
+$lang['ftp____user'] = 'FTP Sodalis ad tempus seruatis';
+$lang['ftp____pass'] = 'FTP tessera ad tempus seruatis';
+$lang['ftp____root'] = 'FTP domicilium ad tempus seruatis';
+$lang['license_o_'] = 'Nihil electum';
+$lang['typography_o_0'] = 'neuter';
+$lang['typography_o_1'] = 'sine singulis uirgulis';
+$lang['typography_o_2'] = 'cum singulis uirgulis';
+$lang['userewrite_o_0'] = 'neuter';
+$lang['userewrite_o_1'] = '.htaccess';
+$lang['userewrite_o_2'] = 'DokuWiki domesticus';
+$lang['deaccent_o_0'] = 'ex';
+$lang['deaccent_o_1'] = 'accentum tollere';
+$lang['deaccent_o_2'] = 'Latinis litteris';
+$lang['gdlib_o_0'] = 'GD Lib inepta';
+$lang['gdlib_o_1'] = 'Versio 1.x';
+$lang['gdlib_o_2'] = 'Machinatione inspicere';
+$lang['rss_type_o_rss'] = 'RSS 0.91';
+$lang['rss_type_o_rss1'] = 'RSS 1.0';
+$lang['rss_type_o_rss2'] = 'RSS 2.0';
+$lang['rss_type_o_atom'] = 'Atom 0.3';
+$lang['rss_type_o_atom1'] = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Summa';
+$lang['rss_content_o_diff'] = 'Comparatio una';
+$lang['rss_content_o_htmldiff'] = 'Tabulae HTML formatae comparatae';
+$lang['rss_content_o_html'] = 'Pagina cum HTML';
+$lang['rss_linkto_o_diff'] = 'discrimina uidere';
+$lang['rss_linkto_o_page'] = 'pagina recensita';
+$lang['rss_linkto_o_rev'] = 'recensionum index';
+$lang['rss_linkto_o_current'] = 'hic pagina';
+$lang['compression_o_0'] = 'neuter';
+$lang['compression_o_gz'] = 'gzip';
+$lang['compression_o_bz2'] = 'bz2';
+$lang['xsendfile_o_0'] = 'Noli uti';
+$lang['xsendfile_o_2'] = 'Praecipuus X-Sendfile';
+$lang['xsendfile_o_3'] = 'Proprietarius Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Sodalis nomen';
+$lang['showuseras_o_username'] = 'Sodalis nomen uerum';
+$lang['showuseras_o_email'] = 'Sodalis cursus interretialis (absconditus ut is tueratur)';
+$lang['showuseras_o_email_link'] = 'Sodalis cursus interretialis ut mailto: nexum';
+$lang['useheading_o_0'] = 'Numquam';
+$lang['useheading_o_navigation'] = 'Solum adspicere';
+$lang['useheading_o_content'] = 'Solum uicis argumentum';
+$lang['useheading_o_1'] = 'Semper';
+$lang['readdircache'] = 'Maximum tempus readdir (sec)';
diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php
index 5b88f4bfc..336de5b36 100644
--- a/lib/plugins/config/lang/pt/lang.php
+++ b/lib/plugins/config/lang/pt/lang.php
@@ -94,6 +94,7 @@ $lang['useslash'] = 'Usar a barra como separador de espaços de nom
$lang['usedraft'] = 'Guardar o rascunho automaticamente durante a edição';
$lang['sepchar'] = 'Separador de palavras no nome da página';
$lang['canonical'] = 'Usar URLs absolutas (http://servidor/caminho)';
+$lang['fnencode'] = 'Método de codificar nomes de ficheiro não-ASCII.';
$lang['autoplural'] = 'Verificar formas plurais nos links';
$lang['compression'] = 'Método de compressão para histórico';
$lang['cachetime'] = 'Idade máxima para cache (seg.)';
@@ -107,6 +108,7 @@ $lang['gdlib'] = 'Versão GD Lib';
$lang['im_convert'] = 'Caminho para a ferramenta "convert" do ImageMagick';
$lang['jpg_quality'] = 'Compressão/Qualidade JPG (0-100)';
$lang['subscribers'] = 'Habilitar o suporte a subscrição de páginas ';
+$lang['subscribe_time'] = 'Tempo após o qual as listas de subscrição e "digests" são enviados (seg.); Isto deve ser inferior ao tempo especificado em recent_days.';
$lang['compress'] = 'Compactar as saídas de CSS e JavaScript';
$lang['hidepages'] = 'Esconder páginas correspondentes (expressões regulares)';
$lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes';
@@ -133,6 +135,7 @@ $lang['proxy____port'] = 'Porta de Proxy';
$lang['proxy____user'] = 'Nome de utilizador Proxy';
$lang['proxy____pass'] = 'Password de Proxy ';
$lang['proxy____ssl'] = 'Usar SSL para conectar ao proxy';
+$lang['proxy____except'] = 'Expressão regular para condizer URLs para os quais o proxy deve ser saltado.';
$lang['safemodehack'] = 'Habilitar modo de segurança';
$lang['ftp____host'] = 'Servidor FTP para o modo de segurança';
$lang['ftp____port'] = 'Porta de FTP para o modo de segurança';
@@ -180,3 +183,4 @@ $lang['useheading_o_0'] = 'Nunca';
$lang['useheading_o_navigation'] = 'Apenas Navegação';
$lang['useheading_o_content'] = 'Apenas Conteúdo Wiki';
$lang['useheading_o_1'] = 'Sempre';
+$lang['readdircache'] = 'Idade máxima para a cache de "readdir" (seg)';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index 279d7c5b7..6345451d5 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/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['menu'] = '配置设置';
$lang['error'] = '由于非法参数,设置没有更新。请检查您做的改动并重新提交。
@@ -91,12 +92,14 @@ $lang['sneaky_index'] = '默认情况下,DokuWiki 在索引页会显
$lang['auth_security_timeout'] = '认证安全超时(秒)';
$lang['securecookie'] = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗?请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。';
$lang['xmlrpc'] = '启用/禁用 XML-RPC 交互界面。';
+$lang['xmlrpcuser'] = '将 XML-RPC 连接限制在用逗号分隔的组或用户中。留空对所有人开启连接权限。';
$lang['updatecheck'] = '自动检查更新并接收安全警告吗?开启该功能后 DokuWiki 将自动访问 splitbrain.org。';
$lang['userewrite'] = '使用更整洁的 URL';
$lang['useslash'] = '在 URL 中使用斜杠作为命名空间的分隔符';
$lang['usedraft'] = '编辑时自动保存一份草稿';
$lang['sepchar'] = '页面名称中的单词分隔符';
$lang['canonical'] = '使用完全标准的 URL';
+$lang['fnencode'] = '非 ASCII 文件名的编码方法。';
$lang['autoplural'] = '在链接中检查多种格式';
$lang['compression'] = 'attic 文件的压缩方式';
$lang['cachetime'] = '缓存的最长时间(秒)';
@@ -110,6 +113,8 @@ $lang['gdlib'] = 'GD 库版本';
$lang['im_convert'] = 'ImageMagick 转换工具的路径';
$lang['jpg_quality'] = 'JPG 压缩质量(0-100)';
$lang['subscribers'] = '启用页面订阅支持';
+$lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔(秒);这应当小于指定的最近更改保留时间(recent_days)。
+';
$lang['compress'] = '使 CSS 和 javascript 输出更紧密';
$lang['hidepages'] = '隐藏匹配的界面(正则表达式)';
$lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面';
@@ -136,6 +141,7 @@ $lang['proxy____port'] = '代理服务器的端口';
$lang['proxy____user'] = '代理服务器的用户名';
$lang['proxy____pass'] = '代理服务器的密码';
$lang['proxy____ssl'] = '使用 SSL 连接到代理服务器';
+$lang['proxy____except'] = '用来匹配代理应跳过的地址的正则表达式。';
$lang['safemodehack'] = '启用 Safemode Hack';
$lang['ftp____host'] = 'Safemode Hack 的 FTP 服务器';
$lang['ftp____port'] = 'Safemode Hack 的 FTP 端口';
@@ -183,3 +189,4 @@ $lang['useheading_o_0'] = '从不';
$lang['useheading_o_navigation'] = '仅限导航';
$lang['useheading_o_content'] = '仅限维基内容内';
$lang['useheading_o_1'] = '一直';
+$lang['readdircache'] = 'readdir缓存的最长寿命(秒)';
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 656b4762b..2982a3ebb 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -121,7 +121,7 @@ class ap_manage {
// update latest plugin date - FIXME
global $ID;
- send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true));
+ send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true, '&'));
}
/**
diff --git a/lib/plugins/plugin/lang/hi/lang.php b/lib/plugins/plugin/lang/hi/lang.php
index d8630a281..ab29c6550 100644
--- a/lib/plugins/plugin/lang/hi/lang.php
+++ b/lib/plugins/plugin/lang/hi/lang.php
@@ -3,4 +3,10 @@
* Hindi language file
*
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
+$lang['unknown'] = 'अज्ञात';
+$lang['deleted'] = 'मिटाया हुआ';
+$lang['date'] = 'दिनांक:';
+$lang['author'] = 'लेखक:';
+$lang['error'] = 'अज्ञात त्रुटि हुइ';
diff --git a/lib/plugins/plugin/lang/la/admin_plugin.txt b/lib/plugins/plugin/lang/la/admin_plugin.txt
new file mode 100644
index 000000000..1a361140c
--- /dev/null
+++ b/lib/plugins/plugin/lang/la/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Addendorum Administratio ======
+
+In hac pagina omnia uicis [[doku>plugins|plugins]] mutare et administrare potes. Ut addenda capere et his uti, in scrinio addendorum scribere et legere potest. \ No newline at end of file
diff --git a/lib/plugins/plugin/lang/la/lang.php b/lib/plugins/plugin/lang/la/lang.php
new file mode 100644
index 000000000..021dc84d5
--- /dev/null
+++ b/lib/plugins/plugin/lang/la/lang.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Latin language file
+ *
+ */
+$lang['menu'] = 'Administrationis addenda';
+$lang['download'] = 'Noua addenda cape';
+$lang['manage'] = 'Addenta in usu';
+$lang['btn_info'] = 'Notae';
+$lang['btn_update'] = 'Nouare';
+$lang['btn_delete'] = 'Delere';
+$lang['btn_settings'] = 'Optiones';
+$lang['btn_download'] = 'Capere';
+$lang['btn_enable'] = 'Seruare';
+$lang['url'] = 'VRL';
+$lang['installed'] = 'In usu:';
+$lang['lastupdate'] = 'Extrema renouatio:';
+$lang['source'] = 'Fons:';
+$lang['unknown'] = 'Ignotum';
+$lang['updating'] = 'Nouans...';
+$lang['updated'] = 'Addenda %s nouata feliciter';
+$lang['updates'] = 'Hae addenda nouata feliciter sunt';
+$lang['update_none'] = 'Nulla renouatio inuenta';
+$lang['deleting'] = 'Delens...';
+$lang['deleted'] = 'Addenda %s deleta.';
+$lang['downloading'] = 'Capens ...';
+$lang['downloaded'] = 'Addenda %s recte in usu';
+$lang['downloads'] = 'Hae addenda feliciter in usu:';
+$lang['download_none'] = 'Nulla addenda reperta aut errores in capiendo sunt.';
+$lang['plugin'] = 'Addenda:';
+$lang['components'] = 'Partes';
+$lang['noinfo'] = 'Addenda alias notas non habent.';
+$lang['name'] = 'Nomen:';
+$lang['date'] = 'Dies:';
+$lang['type'] = 'Genus:';
+$lang['desc'] = 'Descriptio:';
+$lang['author'] = 'Auctor:';
+$lang['www'] = 'Situs interretialis:';
+$lang['error'] = 'Error ignotus.';
+$lang['error_download'] = 'Addenda quae non renouantur: %s';
+$lang['error_badurl'] = 'VRL malum';
+$lang['error_dircreate'] = 'Scrinium temporaneum non creatur, sic nihil capi potest';
+$lang['error_decompress'] = 'Addendorum administrator nouare non potest. Rursum capere nouationes temptat aut manu addenda noua.';
+$lang['error_copy'] = 'Exemplar malum in scrinio addendorum <em>%s</em> est: facultates documenti scrinique fortasse illegitimae sunt. Hic accidit cum addenda partim nouata sunt.';
+$lang['error_delete'] = 'Addenda <em>%s</em> non delentur.';
+$lang['enabled'] = 'Addenda %s apta facta.';
+$lang['notenabled'] = 'Addenda %s quae apta fieri non possunt.';
+$lang['disabled'] = 'Addenda %s non in usu.';
+$lang['notdisabled'] = 'Addenda %s quae inepta fieri non possunt.';
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index f53eca96a..d5b456604 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/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['menu'] = '插件管理器';
$lang['download'] = '下载并安装新的插件';
diff --git a/lib/plugins/popularity/lang/hi/lang.php b/lib/plugins/popularity/lang/hi/lang.php
index d8630a281..c0085d72a 100644
--- a/lib/plugins/popularity/lang/hi/lang.php
+++ b/lib/plugins/popularity/lang/hi/lang.php
@@ -3,4 +3,6 @@
* Hindi language file
*
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
+$lang['submit'] = 'डेटा भेजे';
diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php
index 7f3c90f3d..1e0dbdc3f 100644
--- a/lib/plugins/popularity/lang/ja/lang.php
+++ b/lib/plugins/popularity/lang/ja/lang.php
@@ -5,6 +5,7 @@
* @author Ikuo Obataya <i.obataya@gmail.com>
* @author Daniel Dupriest <kououken@gmail.com>
* @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ * @author Yuji Takenaka <webmaster@davilin.com>
*/
$lang['name'] = '利用状況調査(ロードに少し時間が掛かります)';
$lang['submit'] = 'データ送信';
diff --git a/lib/plugins/popularity/lang/la/intro.txt b/lib/plugins/popularity/lang/la/intro.txt
new file mode 100644
index 000000000..6f4ce8488
--- /dev/null
+++ b/lib/plugins/popularity/lang/la/intro.txt
@@ -0,0 +1,5 @@
+====== Index Fauoris Popularis ======
+
+Haec machina fauorem popularem mittis sic ut creatores uicis meliorem illum facere possint.
+
+Rursum te fauorem mittere experamus sic ut si mutationes meliores uel peiores esse uidere possimus. \ No newline at end of file
diff --git a/lib/plugins/popularity/lang/la/lang.php b/lib/plugins/popularity/lang/la/lang.php
new file mode 100644
index 000000000..e634f9d41
--- /dev/null
+++ b/lib/plugins/popularity/lang/la/lang.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Latin language file
+ *
+ */
+$lang['name'] = 'Index fauoris popularis (multum tempus quaerere potest)';
+$lang['submit'] = 'Missum die';
diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index 22fad03b2..ee13b9f77 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -8,6 +8,7 @@
* @author Simon zhan <simonzhan@21cn.com>
* @author mr.jinyi@gmail.com
* @author ben <ben@livetom.com>
+ * @author lainme <lainme993@gmail.com>
*/
$lang['name'] = '人气反馈(载入可能需要一些时间)';
$lang['submit'] = '发送数据';
diff --git a/lib/plugins/revert/lang/hi/lang.php b/lib/plugins/revert/lang/hi/lang.php
index d8630a281..d6f78ffd6 100644
--- a/lib/plugins/revert/lang/hi/lang.php
+++ b/lib/plugins/revert/lang/hi/lang.php
@@ -3,4 +3,5 @@
* Hindi language file
*
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
diff --git a/lib/plugins/revert/lang/la/intro.txt b/lib/plugins/revert/lang/la/intro.txt
new file mode 100644
index 000000000..35916f683
--- /dev/null
+++ b/lib/plugins/revert/lang/la/intro.txt
@@ -0,0 +1,3 @@
+====== Restituendi Administrator ======
+
+Haec pagina contra mala interretialia paginas restituta. Ut paginas aegras quaeras, malum VRL scribe, deinde paginas malas eligas. \ No newline at end of file
diff --git a/lib/plugins/revert/lang/la/lang.php b/lib/plugins/revert/lang/la/lang.php
new file mode 100644
index 000000000..f742e63f2
--- /dev/null
+++ b/lib/plugins/revert/lang/la/lang.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Latin language file
+ *
+ */
+$lang['menu'] = 'Restituendi administrator';
+$lang['filter'] = 'Malas paginas quaerere';
+$lang['revert'] = 'Electas paginas restituere';
+$lang['reverted'] = '%s restitutur ut %s recenseas';
+$lang['removed'] = '%s deletur';
+$lang['revstart'] = 'Restitutio agens. Hic multo tempore agere potest. Si nimium tempus transit, manu restituis.';
+$lang['revstop'] = 'Restitutio feliciter perfecta.';
+$lang['note1'] = 'Caue: litteras maiores et minores discernit';
+$lang['note2'] = 'Caue: pagina in recentiori forma sine malis uerbis "<i>%s</i>" restituetur';
diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php
index 892cf2dbe..36c8267d6 100644
--- a/lib/plugins/revert/lang/zh/lang.php
+++ b/lib/plugins/revert/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['menu'] = '还原管理器';
$lang['filter'] = '搜索包含垃圾信息的页面';
diff --git a/lib/plugins/usermanager/lang/hi/lang.php b/lib/plugins/usermanager/lang/hi/lang.php
index d8630a281..d6f78ffd6 100644
--- a/lib/plugins/usermanager/lang/hi/lang.php
+++ b/lib/plugins/usermanager/lang/hi/lang.php
@@ -3,4 +3,5 @@
* Hindi language file
*
* @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ * @author yndesai@gmail.com
*/
diff --git a/lib/plugins/usermanager/lang/la/add.txt b/lib/plugins/usermanager/lang/la/add.txt
new file mode 100644
index 000000000..beb797c4a
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/add.txt
@@ -0,0 +1 @@
+===== Sodalem addere ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/delete.txt b/lib/plugins/usermanager/lang/la/delete.txt
new file mode 100644
index 000000000..1eb5e1f14
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/delete.txt
@@ -0,0 +1 @@
+===== Sodalem delere ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/edit.txt b/lib/plugins/usermanager/lang/la/edit.txt
new file mode 100644
index 000000000..4e3d3b2ae
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/edit.txt
@@ -0,0 +1 @@
+===== Sodalem recensere ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/intro.txt b/lib/plugins/usermanager/lang/la/intro.txt
new file mode 100644
index 000000000..7f5c011a8
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/intro.txt
@@ -0,0 +1 @@
+====== Sodalis Tabella ====== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/la/lang.php b/lib/plugins/usermanager/lang/la/lang.php
new file mode 100644
index 000000000..2646979bd
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/lang.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Latin language file
+ *
+ */
+$lang['menu'] = 'Sodalis Tabella';
+$lang['noauth'] = '(Sodalis confirmatio deest)';
+$lang['nosupport'] = '(Sodalis administratio deest)';
+$lang['badauth'] = 'Confirmatio fieri non potest.';
+$lang['user_id'] = 'Sodalis';
+$lang['user_pass'] = 'Tessera';
+$lang['user_name'] = 'Nomen uerum';
+$lang['user_mail'] = 'Cursus Interretialis';
+$lang['user_groups'] = 'Grex';
+$lang['field'] = 'Campus';
+$lang['value'] = 'Vis';
+$lang['add'] = 'Addere';
+$lang['delete'] = 'Delere';
+$lang['delete_selected'] = 'Electa delere';
+$lang['edit'] = 'Recensere';
+$lang['edit_prompt'] = 'Sodalem recensere';
+$lang['modify'] = 'Mutata seruare';
+$lang['search'] = 'Quaerere';
+$lang['search_prompt'] = 'Agentem quaerere';
+$lang['clear'] = 'Colum quaerendi abrogare';
+$lang['filter'] = 'Colum';
+$lang['summary'] = 'Sodales %1$d-%2$d inter %3$d ostenduntur. Numerus Sodalium. %4$d.';
+$lang['nonefound'] = 'Sodalis non repertus. Numerus sodalium: %d';
+$lang['delete_ok'] = '%d Sodales delentur.';
+$lang['delete_fail'] = '%d non deleri possunt.';
+$lang['update_ok'] = 'Sodalis feliciter nouatus\a';
+$lang['update_fail'] = 'Sodalis infeliciter nouatus\a';
+$lang['update_exists'] = 'Nomen Sodalis non mutatur, eo quod hoc nomen (%s) iam electum est.';
+$lang['start'] = 'in primis';
+$lang['prev'] = 'antea';
+$lang['next'] = 'postea';
+$lang['last'] = 'in extremis';
+$lang['edit_usermissing'] = 'Hic Sodalis non inuenitur, eo quod nomen iam deletum uel mutatum est.';
+$lang['user_notify'] = 'Sodalem adnotare';
+$lang['note_notify'] = 'Adnotationes cursu interretiali missae solum si noua tessera petitur.';
+$lang['note_group'] = 'Noui\ae Sodales communi Gregi adduntur (%s) si Grex non elegitur.';
+$lang['note_pass'] = 'Tessera non generata nisi campus uacuos est et Sodalis adnotationes aptae faciuntur.';
+$lang['add_ok'] = 'Sodalis feliciter additur.';
+$lang['add_fail'] = 'Sodalis infeliciter additur.';
+$lang['notify_ok'] = 'Adnotationes cursu interretiali missae';
+$lang['notify_fail'] = 'Adnotationes cursu interretiali non missae';
diff --git a/lib/plugins/usermanager/lang/la/list.txt b/lib/plugins/usermanager/lang/la/list.txt
new file mode 100644
index 000000000..b470d2ea4
--- /dev/null
+++ b/lib/plugins/usermanager/lang/la/list.txt
@@ -0,0 +1 @@
+===== Sodalis index ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index 613826329..bae5454d4 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -8,6 +8,7 @@
* @author Simon zhan <simonzhan@21cn.com>
* @author mr.jinyi@gmail.com
* @author ben <ben@livetom.com>
+ * @author lainme <lainme993@gmail.com>
*/
$lang['menu'] = '用户管理器';
$lang['noauth'] = '(用户认证不可用)';
diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js
index ad608b227..bff28530d 100644
--- a/lib/scripts/hotkeys.js
+++ b/lib/scripts/hotkeys.js
@@ -52,7 +52,7 @@ function Hotkeys() {
t.each(anchors, function(a) {
if (a.accessKey != "") {
t.addShortcut(t.modifier + '+' + a.accessKey, function() {
- a.click();
+ location.href = a.href;
});
a.accessKey = '';
}
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index e4e92cdd2..fec43ad5e 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -31,6 +31,7 @@ var linkwiz = {
linkwiz.wiz.style.left = (findPosX(textArea)+80)+'px';
linkwiz.wiz.style.marginLeft = '-10000px';
linkwiz.wiz.style.marginTop = '-10000px';
+ linkwiz.wiz.style.position = 'absolute';
linkwiz.wiz.innerHTML =
'<div id="link__wiz_header">'+
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index c8ddfa40a..8eb19ce6b 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -215,6 +215,14 @@ var media_manager = {
return false;
}
+ // FIXME these lines deactivate the media options dialog and restore
+ // the old behavior according to FS#2047
+ opener.insertTags('wiki__text','{{'+id+'|','}}','');
+ if(!media_manager.keepopen) window.close();
+ opener.focus();
+ return false;
+
+
media_manager.ext = false;
var dot = id.lastIndexOf(".");
if (dot != -1) {
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 2831c984f..d412fd9cf 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -1,5 +1,5 @@
/**
- * The CSS in here cotrols the appearance of the media manager
+ * The CSS in here controls the appearance of the media manager
*/
#media__manager {
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index 6c2d1fbd2..f66a670e0 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -1,5 +1,5 @@
/**
- * Layout and dedsign corrections for right-to-left languages
+ * Layout and design corrections for right-to-left languages
*
* @author Andreas Gohr <andi@splitbrain.org>
* @author Dotan Kamber <kamberd@yahoo.com>