diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
| commit | 3da7921f08ecdda929466921ecc50698f1adf99e (patch) | |
| tree | 0e179e504399e874bfd785d0a95eec44b76d5952 /inc/lang/ia | |
| parent | 6cf2bbfa12b776cf47cb69ae40fb8862f715ad01 (diff) | |
| parent | cc4bb766fdac23358d7b586aa3830b9650eed7a8 (diff) | |
| download | rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.gz rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.bz2 | |
Merge branch 'master' into future
* master: (162 commits)
fixed revision JS for images
upgraded SimplePie to 1.3.1 FS#2708
removed obsolete browser plugin (migrate does it)
adjust spacing to match standard 1.4em grid
added comment on use of whitelist vs blacklist
Updated idfilter() function for IIS
use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
added 'home' class to first link in hierarchical breadcrumbs
reduced required max width to go into tablet mode
re-added linear gradients for firefox
added missing styling for disabled form elements (FS#2705)
fixed acronyms in italics (FS#2684)
improved print styles (includes fixes for FS#2645 and FS#2707)
basic styles improvements
Greek language update
Use list in acl help text, for more structure
Galician language update
touch the config on save, even if no changes were made
unwind the width narrowing commit
put some whitespace between form submit button and fieldset bottom border
...
Conflicts:
lib/plugins/config/admin.php
lib/plugins/config/settings/config.class.php
Diffstat (limited to 'inc/lang/ia')
| -rw-r--r-- | inc/lang/ia/lang.php | 4 | ||||
| -rw-r--r-- | inc/lang/ia/subscr_single.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index d7be1eff3..a9d5c376c 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -247,9 +247,9 @@ $lang['i_writeerr'] = 'Impossibile crear <code>%s</code>. Tu debe ver $lang['i_badhash'] = 'dokuwiki.php non recognoscite o modificate (hash=<code>%s</code>)'; $lang['i_badval'] = '<code>%s</code> - valor vacue o invalide'; $lang['i_success'] = 'Le configuration ha succedite. Tu pote ora deler le file install.php. Continua a -<a href="doku.php">tu nove DokuWiki</a>.'; +<a href="doku.php?id=wiki:welcome">tu nove DokuWiki</a>.'; $lang['i_failure'] = 'Alcun errores occurreva durante le scriptura del files de configuration. Es possibile que tu debe remediar iste errores manualmente ante que -tu pote usar <a href="doku.php">tu nove DokuWiki</a>.'; +tu pote usar <a href="doku.php?id=wiki:welcome">tu nove DokuWiki</a>.'; $lang['i_policy'] = 'Politica de ACL interne'; $lang['i_pol0'] = 'Wiki aperte (lectura, scriptura, incargamento pro omnes)'; $lang['i_pol1'] = 'Wiki public (lectura pro omnes, scriptura e incargamento pro usatores registrate)'; diff --git a/inc/lang/ia/subscr_single.txt b/inc/lang/ia/subscr_single.txt index 3d6ef7103..445df197c 100644 --- a/inc/lang/ia/subscr_single.txt +++ b/inc/lang/ia/subscr_single.txt @@ -15,7 +15,7 @@ Version nove: @NEWPAGE@ Pro cancellar le notificationes de paginas, aperi un session al wiki a @DOKUWIKIURL@ postea visita -@NEWPAGE@ +@SUBSCRIBE@ e cancella tu subscription al modificationes in paginas e/o spatios de nomines. -- |