From 0299eee8acee350829661908c21df292be55b791 Mon Sep 17 00:00:00 2001 From: Andreas Haerter Date: Sat, 23 Oct 2010 16:33:57 +0200 Subject: Small notation adjustment to lang: de (informal) --- lib/plugins/config/lang/de-informal/lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/config') diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 8d721b62c..01beeeeb9 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -118,17 +118,17 @@ $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'; -- cgit v1.2.3 From 0dbd6a11e5e275d1d9e33ab3ab562117066eb7de Mon Sep 17 00:00:00 2001 From: "Inko I.A" Date: Sat, 30 Oct 2010 09:22:22 +0200 Subject: Basque language update --- lib/plugins/config/lang/eu/lang.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/plugins/config') 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)'; -- cgit v1.2.3 From 64726aa44f0c7307150a3d89903f6d0b96bdb2ee Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Fri, 29 Oct 2010 18:33:48 -0400 Subject: Remember current page when saving configuration --- lib/plugins/config/admin.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/config') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 49712b73f..a628578ca 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -110,6 +110,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { ptln('
'.$this->getLang('updated').'
'); ptln('
'); + ptln(''); formSecurityToken(); $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki')); -- cgit v1.2.3 From 5d85efc6906bd57ed94bd1fceb7fe09d6a795866 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 1 Nov 2010 10:25:35 +0100 Subject: Add comment (see #1942, f338aa80, 64726aa44) --- lib/plugins/config/admin.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/plugins/config') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index a628578ca..d245d3fce 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -109,6 +109,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { elseif ($this->_changed) ptln('
'.$this->getLang('updated').'
'); + // 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(''); ptln(''); formSecurityToken(); -- cgit v1.2.3 From dab7d18d7edb3ebd430dd4915be8564aeeb511c2 Mon Sep 17 00:00:00 2001 From: Choicky Chou Date: Sun, 7 Nov 2010 10:00:16 +0100 Subject: Chinese Language update --- lib/plugins/config/lang/zh/lang.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/plugins/config') diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 6345451d5..0419968c7 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 @@ -115,7 +116,7 @@ $lang['jpg_quality'] = 'JPG 压缩质量（0-100）'; $lang['subscribers'] = '启用页面订阅支持'; $lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。 '; -$lang['compress'] = '使 CSS 和 javascript 输出更紧密'; +$lang['compress'] = '使 CSS 和 javascript 的输出更紧密'; $lang['hidepages'] = '隐藏匹配的界面（正则表达式）'; $lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面'; $lang['sitemap'] = '生成 Google sitemap（天）'; -- cgit v1.2.3