summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_test/cases/inc/auth_admincheck.test.php12
-rw-r--r--_test/cases/inc/pageutils_getid.test.php38
-rw-r--r--_test/cases/inc/parser/parser_footnote.test.php4
-rw-r--r--_test/cases/inc/parser/parser_formatting.test.php42
-rw-r--r--_test/cases/inc/parser/parser_headers.test.php21
-rw-r--r--_test/cases/inc/parser/parser_i18n.test.php6
-rw-r--r--_test/cases/inc/parser/parser_table.test.php52
-rwxr-xr-x_test/runtests.php1
-rw-r--r--conf/dokuwiki.php4
-rw-r--r--conf/license.php10
-rw-r--r--conf/local.php.dist12
-rw-r--r--conf/mime.conf20
-rw-r--r--conf/mysql.conf.php.example82
-rw-r--r--doku.php6
-rw-r--r--inc/actions.php61
-rw-r--r--inc/common.php37
-rw-r--r--inc/fulltext.php5
-rw-r--r--inc/html.php263
-rw-r--r--inc/infoutils.php12
-rw-r--r--inc/lang/bg/wordblock.txt3
-rw-r--r--inc/lang/ca-valencia/wordblock.txt4
-rw-r--r--inc/lang/ca/wordblock.txt4
-rw-r--r--inc/lang/cs/lang.php49
-rw-r--r--inc/lang/cs/mailtext.txt2
-rw-r--r--inc/lang/cs/password.txt2
-rw-r--r--inc/lang/cs/pwconfirm.txt4
-rw-r--r--inc/lang/cs/registermail.txt2
-rw-r--r--inc/lang/cs/subscr_digest.txt22
-rw-r--r--inc/lang/cs/subscr_form.txt3
-rw-r--r--inc/lang/cs/subscr_list.txt19
-rw-r--r--inc/lang/cs/subscr_single.txt25
-rw-r--r--inc/lang/cs/uploadmail.txt4
-rw-r--r--inc/lang/cs/wordblock.txt3
-rw-r--r--inc/lang/da/wordblock.txt3
-rw-r--r--inc/lang/de-informal/conflict.txt2
-rw-r--r--inc/lang/de-informal/edit.txt2
-rw-r--r--inc/lang/de-informal/lang.php59
-rw-r--r--inc/lang/de-informal/mailtext.txt3
-rw-r--r--inc/lang/de-informal/password.txt3
-rw-r--r--inc/lang/de-informal/pwconfirm.txt3
-rw-r--r--inc/lang/de-informal/uploadmail.txt3
-rw-r--r--inc/lang/de-informal/wordblock.txt4
-rw-r--r--inc/lang/de/backlinks.txt2
-rw-r--r--inc/lang/de/lang.php3
-rw-r--r--inc/lang/de/subscr_digest.txt4
-rw-r--r--inc/lang/de/wordblock.txt4
-rw-r--r--inc/lang/el/wordblock.txt4
-rw-r--r--inc/lang/en/lang.php25
-rw-r--r--inc/lang/en/wordblock.txt4
-rw-r--r--inc/lang/eo/lang.php25
-rw-r--r--inc/lang/eo/subscr_digest.txt20
-rw-r--r--inc/lang/eo/subscr_form.txt3
-rw-r--r--inc/lang/eo/subscr_list.txt17
-rw-r--r--inc/lang/eo/subscr_single.txt23
-rw-r--r--inc/lang/eo/wordblock.txt3
-rw-r--r--inc/lang/es/lang.php26
-rw-r--r--inc/lang/es/subscr_digest.txt20
-rw-r--r--inc/lang/es/subscr_form.txt3
-rw-r--r--inc/lang/es/subscr_list.txt17
-rw-r--r--inc/lang/es/subscr_single.txt23
-rw-r--r--inc/lang/es/wordblock.txt4
-rw-r--r--inc/lang/et/wordblock.txt4
-rw-r--r--inc/lang/eu/wordblock.txt3
-rw-r--r--inc/lang/fa/lang.php26
-rw-r--r--inc/lang/fa/wordblock.txt3
-rw-r--r--inc/lang/fi/lang.php25
-rw-r--r--inc/lang/fi/mailtext.txt4
-rw-r--r--inc/lang/fi/password.txt4
-rw-r--r--inc/lang/fi/pwconfirm.txt2
-rw-r--r--inc/lang/fi/registermail.txt2
-rw-r--r--inc/lang/fi/subscr_digest.txt20
-rw-r--r--inc/lang/fi/subscr_form.txt3
-rw-r--r--inc/lang/fi/subscr_list.txt18
-rw-r--r--inc/lang/fi/subscr_single.txt23
-rw-r--r--inc/lang/fi/uploadmail.txt2
-rw-r--r--inc/lang/fi/wordblock.txt3
-rw-r--r--inc/lang/fo/wordblock.txt3
-rw-r--r--inc/lang/fr/conflict.txt4
-rw-r--r--inc/lang/fr/draft.txt4
-rw-r--r--inc/lang/fr/edit.txt2
-rw-r--r--inc/lang/fr/editrev.txt2
-rw-r--r--inc/lang/fr/install.html16
-rw-r--r--inc/lang/fr/lang.php176
-rw-r--r--inc/lang/fr/locked.txt2
-rw-r--r--inc/lang/fr/mailtext.txt5
-rw-r--r--inc/lang/fr/newpage.txt2
-rw-r--r--inc/lang/fr/norev.txt2
-rw-r--r--inc/lang/fr/password.txt2
-rw-r--r--inc/lang/fr/pwconfirm.txt4
-rw-r--r--inc/lang/fr/registermail.txt2
-rw-r--r--inc/lang/fr/resendpwd.txt2
-rw-r--r--inc/lang/fr/revisions.txt2
-rw-r--r--inc/lang/fr/searchpage.txt2
-rw-r--r--inc/lang/fr/subscr_digest.txt19
-rw-r--r--inc/lang/fr/subscr_form.txt3
-rw-r--r--inc/lang/fr/subscr_list.txt16
-rw-r--r--inc/lang/fr/subscr_single.txt22
-rw-r--r--inc/lang/fr/uploadmail.txt2
-rw-r--r--inc/lang/fr/wordblock.txt4
-rw-r--r--inc/lang/gl/admin.txt2
-rw-r--r--inc/lang/gl/adminplugins.txt2
-rw-r--r--inc/lang/gl/backlinks.txt2
-rw-r--r--inc/lang/gl/conflict.txt4
-rw-r--r--inc/lang/gl/denied.txt4
-rw-r--r--inc/lang/gl/diff.txt2
-rw-r--r--inc/lang/gl/draft.txt6
-rw-r--r--inc/lang/gl/edit.txt2
-rw-r--r--inc/lang/gl/editrev.txt2
-rw-r--r--inc/lang/gl/install.html34
-rw-r--r--inc/lang/gl/lang.php308
-rw-r--r--inc/lang/gl/locked.txt2
-rw-r--r--inc/lang/gl/login.txt4
-rw-r--r--inc/lang/gl/mailtext.txt12
-rw-r--r--inc/lang/gl/newpage.txt2
-rw-r--r--inc/lang/gl/norev.txt4
-rw-r--r--inc/lang/gl/password.txt8
-rw-r--r--inc/lang/gl/preview.txt2
-rw-r--r--inc/lang/gl/pwconfirm.txt12
-rw-r--r--inc/lang/gl/read.txt2
-rw-r--r--inc/lang/gl/recent.txt4
-rw-r--r--inc/lang/gl/register.txt4
-rw-r--r--inc/lang/gl/registermail.txt18
-rw-r--r--inc/lang/gl/resendpwd.txt4
-rw-r--r--inc/lang/gl/revisions.txt4
-rw-r--r--inc/lang/gl/searchpage.txt4
-rw-r--r--inc/lang/gl/stopwords.txt752
-rw-r--r--inc/lang/gl/updateprofile.txt4
-rw-r--r--inc/lang/gl/uploadmail.txt22
-rw-r--r--inc/lang/gl/wordblock.txt4
-rw-r--r--inc/lang/he/wordblock.txt4
-rw-r--r--inc/lang/hr/wordblock.txt3
-rw-r--r--inc/lang/hu/wordblock.txt6
-rw-r--r--inc/lang/ia/admin.txt3
-rw-r--r--inc/lang/ia/adminplugins.txt1
-rw-r--r--inc/lang/ia/backlinks.txt3
-rw-r--r--inc/lang/ia/conflict.txt5
-rw-r--r--inc/lang/ia/denied.txt3
-rw-r--r--inc/lang/ia/diff.txt3
-rw-r--r--inc/lang/ia/draft.txt5
-rw-r--r--inc/lang/ia/edit.txt1
-rw-r--r--inc/lang/ia/editrev.txt2
-rw-r--r--inc/lang/ia/index.txt3
-rw-r--r--inc/lang/ia/install.html13
-rw-r--r--inc/lang/ia/lang.php262
-rw-r--r--inc/lang/ia/locked.txt3
-rw-r--r--inc/lang/ia/login.txt3
-rw-r--r--inc/lang/ia/mailtext.txt17
-rw-r--r--inc/lang/ia/newpage.txt3
-rw-r--r--inc/lang/ia/norev.txt3
-rw-r--r--inc/lang/ia/password.txt10
-rw-r--r--inc/lang/ia/preview.txt3
-rw-r--r--inc/lang/ia/pwconfirm.txt14
-rw-r--r--inc/lang/ia/read.txt1
-rw-r--r--inc/lang/ia/recent.txt3
-rw-r--r--inc/lang/ia/register.txt3
-rw-r--r--inc/lang/ia/registermail.txt14
-rw-r--r--inc/lang/ia/resendpwd.txt3
-rw-r--r--inc/lang/ia/revisions.txt3
-rw-r--r--inc/lang/ia/searchpage.txt5
-rw-r--r--inc/lang/ia/showrev.txt2
-rw-r--r--inc/lang/ia/stopwords.txt38
-rw-r--r--inc/lang/ia/subscr_digest.txt20
-rw-r--r--inc/lang/ia/subscr_form.txt4
-rw-r--r--inc/lang/ia/subscr_list.txt17
-rw-r--r--inc/lang/ia/subscr_single.txt26
-rw-r--r--inc/lang/ia/updateprofile.txt3
-rw-r--r--inc/lang/ia/uploadmail.txt14
-rw-r--r--inc/lang/id/wordblock.txt4
-rw-r--r--inc/lang/it/adminplugins.txt2
-rw-r--r--inc/lang/it/backlinks.txt2
-rw-r--r--inc/lang/it/conflict.txt2
-rw-r--r--inc/lang/it/denied.txt2
-rw-r--r--inc/lang/it/diff.txt2
-rw-r--r--inc/lang/it/draft.txt2
-rw-r--r--inc/lang/it/edit.txt2
-rw-r--r--inc/lang/it/editrev.txt2
-rw-r--r--inc/lang/it/index.txt2
-rw-r--r--inc/lang/it/install.html2
-rw-r--r--inc/lang/it/lang.php126
-rw-r--r--inc/lang/it/login.txt2
-rw-r--r--inc/lang/it/mailtext.txt2
-rw-r--r--inc/lang/it/password.txt4
-rw-r--r--inc/lang/it/pwconfirm.txt10
-rw-r--r--inc/lang/it/register.txt2
-rw-r--r--inc/lang/it/registermail.txt4
-rw-r--r--inc/lang/it/revisions.txt2
-rw-r--r--inc/lang/it/stopwords.txt8
-rw-r--r--inc/lang/it/subscr_digest.txt20
-rw-r--r--inc/lang/it/subscr_form.txt3
-rw-r--r--inc/lang/it/subscr_list.txt18
-rw-r--r--inc/lang/it/subscr_single.txt23
-rw-r--r--inc/lang/it/uploadmail.txt2
-rw-r--r--inc/lang/it/wordblock.txt4
-rw-r--r--inc/lang/ja/wordblock.txt4
-rw-r--r--inc/lang/ko/wordblock.txt4
-rw-r--r--inc/lang/ku/wordblock.txt4
-rw-r--r--inc/lang/lb/admin.txt3
-rw-r--r--inc/lang/lb/adminplugins.txt1
-rw-r--r--inc/lang/lb/backlinks.txt3
-rw-r--r--inc/lang/lb/conflict.txt5
-rw-r--r--inc/lang/lb/denied.txt3
-rw-r--r--inc/lang/lb/diff.txt3
-rw-r--r--inc/lang/lb/draft.txt5
-rw-r--r--inc/lang/lb/edit.txt1
-rw-r--r--inc/lang/lb/editrev.txt2
-rw-r--r--inc/lang/lb/index.txt3
-rw-r--r--inc/lang/lb/lang.php214
-rw-r--r--inc/lang/lb/locked.txt3
-rw-r--r--inc/lang/lb/login.txt3
-rw-r--r--inc/lang/lb/mailtext.txt17
-rw-r--r--inc/lang/lb/newpage.txt4
-rw-r--r--inc/lang/lb/norev.txt3
-rw-r--r--inc/lang/lb/password.txt10
-rw-r--r--inc/lang/lb/preview.txt3
-rw-r--r--inc/lang/lb/pwconfirm.txt15
-rw-r--r--inc/lang/lb/read.txt1
-rw-r--r--inc/lang/lb/recent.txt4
-rw-r--r--inc/lang/lb/register.txt4
-rw-r--r--inc/lang/lb/registermail.txt14
-rw-r--r--inc/lang/lb/resendpwd.txt3
-rw-r--r--inc/lang/lb/revisions.txt3
-rw-r--r--inc/lang/lb/searchpage.txt5
-rw-r--r--inc/lang/lb/showrev.txt2
-rw-r--r--inc/lang/lb/updateprofile.txt4
-rw-r--r--inc/lang/lb/uploadmail.txt14
-rw-r--r--inc/lang/lt/wordblock.txt4
-rw-r--r--inc/lang/lv/lang.php46
-rw-r--r--inc/lang/lv/subscr_digest.txt19
-rw-r--r--inc/lang/lv/subscr_form.txt3
-rw-r--r--inc/lang/lv/subscr_list.txt16
-rw-r--r--inc/lang/lv/subscr_single.txt23
-rw-r--r--inc/lang/lv/wordblock.txt4
-rw-r--r--inc/lang/mg/wordblock.txt5
-rw-r--r--inc/lang/mk/adminplugins.txt1
-rw-r--r--inc/lang/mk/lang.php247
-rw-r--r--inc/lang/mk/read.txt1
-rw-r--r--inc/lang/mk/recent.txt3
-rw-r--r--inc/lang/mk/showrev.txt2
-rw-r--r--inc/lang/mr/wordblock.txt3
-rw-r--r--inc/lang/nl/wordblock.txt4
-rw-r--r--inc/lang/no/wordblock.txt4
-rw-r--r--inc/lang/pl/lang.php27
-rw-r--r--inc/lang/pl/subscr_digest.txt21
-rw-r--r--inc/lang/pl/subscr_form.txt3
-rw-r--r--inc/lang/pl/subscr_list.txt18
-rw-r--r--inc/lang/pl/subscr_single.txt24
-rw-r--r--inc/lang/pl/wordblock.txt4
-rw-r--r--inc/lang/pt-br/lang.php22
-rw-r--r--inc/lang/pt-br/wordblock.txt4
-rw-r--r--inc/lang/pt/wordblock.txt7
-rw-r--r--inc/lang/ro/wordblock.txt4
-rw-r--r--inc/lang/ru/lang.php47
-rw-r--r--inc/lang/ru/subscr_digest.txt20
-rw-r--r--inc/lang/ru/subscr_form.txt3
-rw-r--r--inc/lang/ru/subscr_list.txt17
-rw-r--r--inc/lang/ru/subscr_single.txt23
-rw-r--r--inc/lang/sk/wordblock.txt3
-rw-r--r--inc/lang/sl/wordblock.txt4
-rw-r--r--inc/lang/sq/admin.txt3
-rw-r--r--inc/lang/sq/adminplugins.txt1
-rw-r--r--inc/lang/sq/backlinks.txt3
-rw-r--r--inc/lang/sq/conflict.txt5
-rw-r--r--inc/lang/sq/denied.txt3
-rw-r--r--inc/lang/sq/diff.txt3
-rw-r--r--inc/lang/sq/draft.txt5
-rw-r--r--inc/lang/sq/edit.txt1
-rw-r--r--inc/lang/sq/editrev.txt2
-rw-r--r--inc/lang/sq/index.txt3
-rw-r--r--inc/lang/sq/install.html8
-rw-r--r--inc/lang/sq/lang.php258
-rw-r--r--inc/lang/sq/locked.txt3
-rw-r--r--inc/lang/sq/login.txt3
-rw-r--r--inc/lang/sq/mailtext.txt16
-rw-r--r--inc/lang/sq/newpage.txt3
-rw-r--r--inc/lang/sq/norev.txt3
-rw-r--r--inc/lang/sq/password.txt10
-rw-r--r--inc/lang/sq/preview.txt3
-rw-r--r--inc/lang/sq/pwconfirm.txt13
-rw-r--r--inc/lang/sq/read.txt1
-rw-r--r--inc/lang/sq/recent.txt3
-rw-r--r--inc/lang/sq/register.txt3
-rw-r--r--inc/lang/sq/registermail.txt14
-rw-r--r--inc/lang/sq/resendpwd.txt3
-rw-r--r--inc/lang/sq/revisions.txt3
-rw-r--r--inc/lang/sq/searchpage.txt5
-rw-r--r--inc/lang/sq/showrev.txt2
-rw-r--r--inc/lang/sq/stopwords.txt39
-rw-r--r--inc/lang/sq/subscr_digest.txt20
-rw-r--r--inc/lang/sq/subscr_form.txt3
-rw-r--r--inc/lang/sq/subscr_list.txt13
-rw-r--r--inc/lang/sq/subscr_single.txt23
-rw-r--r--inc/lang/sq/updateprofile.txt3
-rw-r--r--inc/lang/sq/uploadmail.txt14
-rw-r--r--inc/lang/sr/wordblock.txt4
-rw-r--r--inc/lang/sv/wordblock.txt4
-rw-r--r--inc/lang/th/wordblock.txt3
-rw-r--r--inc/lang/tr/wordblock.txt4
-rw-r--r--inc/lang/uk/wordblock.txt4
-rw-r--r--inc/lang/vi/wordblock.txt3
-rw-r--r--inc/lang/zh-tw/wordblock.txt4
-rw-r--r--inc/lang/zh/wordblock.txt3
-rw-r--r--inc/pageutils.php25
-rw-r--r--inc/parser/handler.php32
-rw-r--r--inc/parser/renderer.php6
-rw-r--r--inc/parser/xhtml.php87
-rw-r--r--inc/parserutils.php2
-rw-r--r--inc/plugincontroller.class.php4
-rw-r--r--inc/subscription.php7
-rw-r--r--inc/template.php38
-rw-r--r--inc/toolbar.php26
-rw-r--r--lib/exe/ajax.php1
-rw-r--r--lib/exe/fetch.php130
-rw-r--r--lib/exe/indexer.php5
-rw-r--r--lib/exe/js.php4
-rw-r--r--lib/exe/xmlrpc.php47
-rw-r--r--lib/images/fileicons/7z.pngbin0 -> 651 bytes
-rw-r--r--lib/images/fileicons/audio.pngbin0 -> 727 bytes
-rw-r--r--lib/images/fileicons/csv.pngbin0 -> 480 bytes
-rw-r--r--lib/images/fileicons/docx.pngbin0 -> 659 bytes
-rw-r--r--lib/images/fileicons/mp3.pngbin0 -> 885 bytes
-rw-r--r--lib/images/fileicons/ogg.pngbin0 -> 865 bytes
-rw-r--r--lib/images/fileicons/pptx.pngbin0 -> 762 bytes
-rw-r--r--lib/images/fileicons/sql.pngbin0 -> 865 bytes
-rw-r--r--lib/images/fileicons/wav.pngbin0 -> 881 bytes
-rw-r--r--lib/images/fileicons/xlsx.pngbin0 -> 731 bytes
-rw-r--r--lib/images/license/badge/cc-zero.pngbin0 -> 1266 bytes
-rw-r--r--lib/images/license/button/cc-zero.pngbin0 -> 706 bytes
-rw-r--r--lib/images/media_align_center.pngbin0 -> 294 bytes
-rw-r--r--lib/images/media_align_left.pngbin0 -> 312 bytes
-rw-r--r--lib/images/media_align_noalign.pngbin0 -> 269 bytes
-rw-r--r--lib/images/media_align_right.pngbin0 -> 312 bytes
-rw-r--r--lib/images/media_link_direct.pngbin0 -> 773 bytes
-rw-r--r--lib/images/media_link_displaylnk.pngbin0 -> 343 bytes
-rw-r--r--lib/images/media_link_lnk.pngbin0 -> 651 bytes
-rw-r--r--lib/images/media_link_nolnk.pngbin0 -> 516 bytes
-rw-r--r--lib/images/media_size_large.pngbin0 -> 153 bytes
-rw-r--r--lib/images/media_size_medium.pngbin0 -> 296 bytes
-rw-r--r--lib/images/media_size_original.pngbin0 -> 312 bytes
-rw-r--r--lib/images/media_size_small.pngbin0 -> 305 bytes
-rw-r--r--lib/plugins/acl/lang/cs/lang.php1
-rw-r--r--lib/plugins/acl/lang/de-informal/lang.php6
-rw-r--r--lib/plugins/acl/lang/es/lang.php1
-rw-r--r--lib/plugins/acl/lang/fr/help.txt8
-rw-r--r--lib/plugins/acl/lang/fr/lang.php18
-rw-r--r--lib/plugins/acl/lang/gl/help.txt12
-rw-r--r--lib/plugins/acl/lang/gl/lang.php40
-rw-r--r--lib/plugins/acl/lang/ia/help.txt11
-rw-r--r--lib/plugins/acl/lang/ia/lang.php35
-rw-r--r--lib/plugins/acl/lang/it/help.txt4
-rw-r--r--lib/plugins/acl/lang/it/lang.php20
-rw-r--r--lib/plugins/acl/lang/lb/help.txt11
-rw-r--r--lib/plugins/acl/lang/lb/lang.php6
-rw-r--r--lib/plugins/acl/lang/mk/lang.php22
-rw-r--r--lib/plugins/acl/lang/pl/lang.php4
-rw-r--r--lib/plugins/acl/lang/pt-br/lang.php1
-rw-r--r--lib/plugins/acl/lang/ru/lang.php1
-rw-r--r--lib/plugins/acl/lang/sq/help.txt11
-rw-r--r--lib/plugins/acl/lang/sq/lang.php34
-rw-r--r--lib/plugins/config/lang/cs/lang.php2
-rw-r--r--lib/plugins/config/lang/de-informal/intro.txt4
-rw-r--r--lib/plugins/config/lang/de-informal/lang.php67
-rw-r--r--lib/plugins/config/lang/de/lang.php2
-rw-r--r--lib/plugins/config/lang/en/lang.php2
-rw-r--r--lib/plugins/config/lang/eo/lang.php1
-rw-r--r--lib/plugins/config/lang/es/lang.php2
-rw-r--r--lib/plugins/config/lang/fr/intro.txt4
-rw-r--r--lib/plugins/config/lang/fr/lang.php109
-rw-r--r--lib/plugins/config/lang/gl/intro.txt8
-rw-r--r--lib/plugins/config/lang/gl/lang.php236
-rw-r--r--lib/plugins/config/lang/ia/intro.txt7
-rw-r--r--lib/plugins/config/lang/ia/lang.php180
-rw-r--r--lib/plugins/config/lang/it/lang.php49
-rw-r--r--lib/plugins/config/lang/lb/intro.txt7
-rw-r--r--lib/plugins/config/lang/lb/lang.php6
-rw-r--r--lib/plugins/config/lang/lv/lang.php1
-rw-r--r--lib/plugins/config/lang/mk/lang.php6
-rw-r--r--lib/plugins/config/lang/pl/lang.php3
-rw-r--r--lib/plugins/config/lang/pt-br/lang.php1
-rw-r--r--lib/plugins/config/lang/ru/lang.php2
-rw-r--r--lib/plugins/config/lang/sq/intro.txt7
-rw-r--r--lib/plugins/config/lang/sq/lang.php180
-rw-r--r--lib/plugins/config/settings/config.class.php3
-rw-r--r--lib/plugins/plugin/lang/cs/lang.php1
-rw-r--r--lib/plugins/plugin/lang/de-informal/admin_plugin.txt2
-rw-r--r--lib/plugins/plugin/lang/de-informal/lang.php16
-rw-r--r--lib/plugins/plugin/lang/es/lang.php1
-rw-r--r--lib/plugins/plugin/lang/fr/admin_plugin.txt4
-rw-r--r--lib/plugins/plugin/lang/fr/lang.php50
-rw-r--r--lib/plugins/plugin/lang/gl/admin_plugin.txt4
-rw-r--r--lib/plugins/plugin/lang/gl/lang.php48
-rw-r--r--lib/plugins/plugin/lang/ia/admin_plugin.txt3
-rw-r--r--lib/plugins/plugin/lang/ia/lang.php51
-rw-r--r--lib/plugins/plugin/lang/it/admin_plugin.txt3
-rw-r--r--lib/plugins/plugin/lang/it/lang.php10
-rw-r--r--lib/plugins/plugin/lang/lb/admin_plugin.txt4
-rw-r--r--lib/plugins/plugin/lang/lb/lang.php6
-rw-r--r--lib/plugins/plugin/lang/mk/lang.php43
-rw-r--r--lib/plugins/plugin/lang/pl/lang.php2
-rw-r--r--lib/plugins/plugin/lang/pt-br/lang.php1
-rw-r--r--lib/plugins/plugin/lang/ru/lang.php1
-rw-r--r--lib/plugins/plugin/lang/sq/admin_plugin.txt3
-rw-r--r--lib/plugins/plugin/lang/sq/lang.php50
-rw-r--r--lib/plugins/popularity/lang/cs/lang.php1
-rw-r--r--lib/plugins/popularity/lang/de-informal/intro.txt8
-rw-r--r--lib/plugins/popularity/lang/de-informal/lang.php2
-rw-r--r--lib/plugins/popularity/lang/es/lang.php1
-rw-r--r--lib/plugins/popularity/lang/fr/intro.txt4
-rw-r--r--lib/plugins/popularity/lang/fr/lang.php2
-rw-r--r--lib/plugins/popularity/lang/gl/intro.txt10
-rw-r--r--lib/plugins/popularity/lang/gl/lang.php8
-rw-r--r--lib/plugins/popularity/lang/ia/intro.txt9
-rw-r--r--lib/plugins/popularity/lang/ia/lang.php9
-rw-r--r--lib/plugins/popularity/lang/it/intro.txt4
-rw-r--r--lib/plugins/popularity/lang/lb/lang.php6
-rw-r--r--lib/plugins/popularity/lang/mk/lang.php6
-rw-r--r--lib/plugins/popularity/lang/pl/lang.php2
-rw-r--r--lib/plugins/popularity/lang/pt-br/lang.php1
-rw-r--r--lib/plugins/popularity/lang/ru/lang.php1
-rw-r--r--lib/plugins/popularity/lang/sq/intro.txt9
-rw-r--r--lib/plugins/popularity/lang/sq/lang.php8
-rw-r--r--lib/plugins/revert/lang/cs/lang.php1
-rw-r--r--lib/plugins/revert/lang/de-informal/lang.php9
-rw-r--r--lib/plugins/revert/lang/es/lang.php1
-rw-r--r--lib/plugins/revert/lang/fr/intro.txt4
-rw-r--r--lib/plugins/revert/lang/fr/lang.php8
-rw-r--r--lib/plugins/revert/lang/gl/intro.txt4
-rw-r--r--lib/plugins/revert/lang/gl/lang.php22
-rw-r--r--lib/plugins/revert/lang/ia/intro.txt3
-rw-r--r--lib/plugins/revert/lang/ia/lang.php16
-rw-r--r--lib/plugins/revert/lang/it/intro.txt2
-rw-r--r--lib/plugins/revert/lang/lb/intro.txt3
-rw-r--r--lib/plugins/revert/lang/lb/lang.php6
-rw-r--r--lib/plugins/revert/lang/mk/lang.php6
-rw-r--r--lib/plugins/revert/lang/pl/lang.php2
-rw-r--r--lib/plugins/revert/lang/pt-br/lang.php1
-rw-r--r--lib/plugins/revert/lang/ru/lang.php1
-rw-r--r--lib/plugins/revert/lang/sq/intro.txt3
-rw-r--r--lib/plugins/revert/lang/sq/lang.php15
-rw-r--r--lib/plugins/usermanager/lang/cs/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/de-informal/lang.php10
-rw-r--r--lib/plugins/usermanager/lang/es/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/fr/lang.php12
-rw-r--r--lib/plugins/usermanager/lang/gl/add.txt2
-rw-r--r--lib/plugins/usermanager/lang/gl/delete.txt2
-rw-r--r--lib/plugins/usermanager/lang/gl/edit.txt2
-rw-r--r--lib/plugins/usermanager/lang/gl/intro.txt2
-rw-r--r--lib/plugins/usermanager/lang/gl/lang.php62
-rw-r--r--lib/plugins/usermanager/lang/gl/list.txt2
-rw-r--r--lib/plugins/usermanager/lang/ia/add.txt1
-rw-r--r--lib/plugins/usermanager/lang/ia/delete.txt1
-rw-r--r--lib/plugins/usermanager/lang/ia/edit.txt1
-rw-r--r--lib/plugins/usermanager/lang/ia/intro.txt1
-rw-r--r--lib/plugins/usermanager/lang/ia/lang.php49
-rw-r--r--lib/plugins/usermanager/lang/ia/list.txt1
-rw-r--r--lib/plugins/usermanager/lang/it/delete.txt2
-rw-r--r--lib/plugins/usermanager/lang/it/lang.php20
-rw-r--r--lib/plugins/usermanager/lang/lb/lang.php6
-rw-r--r--lib/plugins/usermanager/lang/lb/list.txt1
-rw-r--r--lib/plugins/usermanager/lang/mk/add.txt1
-rw-r--r--lib/plugins/usermanager/lang/mk/delete.txt1
-rw-r--r--lib/plugins/usermanager/lang/mk/edit.txt1
-rw-r--r--lib/plugins/usermanager/lang/mk/intro.txt1
-rw-r--r--lib/plugins/usermanager/lang/mk/lang.php38
-rw-r--r--lib/plugins/usermanager/lang/mk/list.txt1
-rw-r--r--lib/plugins/usermanager/lang/pl/lang.php2
-rw-r--r--lib/plugins/usermanager/lang/pt-br/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/ru/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/sq/add.txt1
-rw-r--r--lib/plugins/usermanager/lang/sq/delete.txt1
-rw-r--r--lib/plugins/usermanager/lang/sq/edit.txt1
-rw-r--r--lib/plugins/usermanager/lang/sq/intro.txt1
-rw-r--r--lib/plugins/usermanager/lang/sq/lang.php48
-rw-r--r--lib/plugins/usermanager/lang/sq/list.txt1
-rw-r--r--lib/scripts/drag.js22
-rw-r--r--lib/scripts/edit.js8
-rw-r--r--lib/scripts/events.js4
-rw-r--r--lib/scripts/linkwiz.js2
-rw-r--r--lib/scripts/media.js463
-rw-r--r--lib/scripts/script.js47
-rw-r--r--lib/scripts/toolbar.js16
-rw-r--r--lib/tpl/default/_mediaoptions.css92
-rw-r--r--lib/tpl/default/style.ini1
482 files changed, 6293 insertions, 1826 deletions
diff --git a/_test/cases/inc/auth_admincheck.test.php b/_test/cases/inc/auth_admincheck.test.php
index c00271a26..f14d6369e 100644
--- a/_test/cases/inc/auth_admincheck.test.php
+++ b/_test/cases/inc/auth_admincheck.test.php
@@ -19,11 +19,11 @@ class auth_admin_test extends UnitTestCase {
$conf['manager'] = 'john,@managers,doe';
// anonymous user
- $this->assertEqual(auth_ismanager('jill', '',false), false);
+ $this->assertEqual(auth_ismanager('jill', null,false), false);
// admin or manager users
- $this->assertEqual(auth_ismanager('john', '',false), true);
- $this->assertEqual(auth_ismanager('doe', '',false), true);
+ $this->assertEqual(auth_ismanager('john', null,false), true);
+ $this->assertEqual(auth_ismanager('doe', null,false), true);
// admin or manager groups
$this->assertEqual(auth_ismanager('jill', array('admin'),false), true);
@@ -35,11 +35,11 @@ class auth_admin_test extends UnitTestCase {
$conf['superuser'] = 'john,@admin,doe,@roots';
// anonymous user
- $this->assertEqual(auth_ismanager('jill', '',true), false);
+ $this->assertEqual(auth_ismanager('jill', null,true), false);
// admin user
- $this->assertEqual(auth_ismanager('john', '',true), true);
- $this->assertEqual(auth_ismanager('doe', '',true), true);
+ $this->assertEqual(auth_ismanager('john', null,true), true);
+ $this->assertEqual(auth_ismanager('doe', null,true), true);
// admin groups
$this->assertEqual(auth_ismanager('jill', array('admin'),true), true);
diff --git a/_test/cases/inc/pageutils_getid.test.php b/_test/cases/inc/pageutils_getid.test.php
index 8233ffb42..e3932a579 100644
--- a/_test/cases/inc/pageutils_getid.test.php
+++ b/_test/cases/inc/pageutils_getid.test.php
@@ -64,5 +64,43 @@ class init_getID_test extends UnitTestCase {
$this->assertEqual(getID(), 'wiki:dokuwiki');
}
+ /**
+ * getID with given id in url and userewrite=2, no basedir set, Apache and CGI.
+ */
+ function test4() {
+ global $conf;
+ $conf['basedir'] = '';
+ $conf['userewrite'] = '2';
+ $conf['baseurl'] = '';
+ $_SERVER['DOCUMENT_ROOT'] = '/var/www/vhosts/example.com/htdocs';
+ $_SERVER['SCRIPT_FILENAME'] = '/var/www/vhosts/example.com/htdocs/doku.php';
+ $_SERVER['SCRIPT_NAME'] = '/doku.php';
+ $_SERVER['REQUEST_URI'] = '/doku.php/wiki/dokuwiki';
+ $_SERVER['PATH_INFO'] = '/wiki/dokuwiki';
+ $_SERVER['PATH_TRANSLATED'] = '/var/www/vhosts/example.com/htdocs/doku.php';
+ $_SERVER['PHP_SELF'] = '/doku.php/wiki/dokuwiki';
+
+ $this->assertEqual(getID(), 'wiki:dokuwiki');
+ }
+
+ /**
+ * getID with given id / in url and userewrite=2, no basedir set, Apache and CGI.
+ */
+ function test5() {
+ global $conf;
+ $conf['basedir'] = '';
+ $conf['userewrite'] = '2';
+ $conf['baseurl'] = '';
+ $_SERVER['DOCUMENT_ROOT'] = '/var/www/';
+ $_SERVER['SCRIPT_FILENAME'] = '/var/www/dokuwiki/doku.php';
+ $_SERVER['SCRIPT_NAME'] = '/dokuwiki/doku.php';
+ $_SERVER['REQUEST_URI'] = '/dokuwiki/doku.php/?do=debug';
+ $_SERVER['PATH_INFO'] = '/';
+ $_SERVER['PATH_TRANSLATED'] = '/var/www/index.html';
+ $_SERVER['PHP_SELF'] = '/dokuwiki/doku.php/';
+
+ $this->assertEqual(getID(), 'start');
+ }
+
}
//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/_test/cases/inc/parser/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index 08d199182..a1da2ab06 100644
--- a/_test/cases/inc/parser/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
@@ -259,7 +259,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('cdata',array("\n".'Foo ')),
array('nest', array ( array (
array('footnote_open',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 8)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' Row 0 Col 1 ')),
@@ -282,7 +282,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(8, 123)),
+ array('table_close',array(123)),
array('cdata',array(' ')),
array('footnote_close',array()),
))),
diff --git a/_test/cases/inc/parser/parser_formatting.test.php b/_test/cases/inc/parser/parser_formatting.test.php
index 35bb41a6a..79509f40b 100644
--- a/_test/cases/inc/parser/parser_formatting.test.php
+++ b/_test/cases/inc/parser/parser_formatting.test.php
@@ -168,6 +168,48 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
+ function testEmWithMultiOccurence() {
+ // Case from #763
+ $this->P->addMode('emphasis',new Doku_Parser_Mode_Formatting('emphasis'));
+ $this->P->parse('//text:// Blablabla Blablabla
+
+//text:// another Blablabla Blablabla');
+ $calls = array (
+ array('document_start',array()),
+ array('p_open',array()),
+ array('cdata',array("\n")),
+ array('emphasis_open',array()),
+ array('cdata',array('text:')),
+ array('emphasis_close',array()),
+ array('cdata',array(" Blablabla Blablabla\n\n")),
+ array('emphasis_open',array()),
+ array('cdata',array('text:')),
+ array('emphasis_close',array()),
+ array('cdata',array(" another Blablabla Blablabla\n")),
+ array('p_close',array()),
+ array('document_end',array()),
+ );
+ $this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
+ }
+
+ function testEmWithUnicode() {
+ // Case from #1468
+ $this->P->addMode('emphasis',new Doku_Parser_Mode_Formatting('emphasis'));
+ $this->P->parse('//Тест://');
+ $calls = array (
+ array('document_start',array()),
+ array('p_open',array()),
+ array('cdata',array("\n")),
+ array('emphasis_open',array()),
+ array('cdata',array('Тест:')),
+ array('emphasis_close',array()),
+ array('cdata',array("\n")),
+ array('p_close',array()),
+ array('document_end',array()),
+ );
+ $this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
+ }
+
function testUnderline() {
$this->P->addMode('underline',new Doku_Parser_Mode_Formatting('underline'));
$this->P->parse('abc __bar__ def');
diff --git a/_test/cases/inc/parser/parser_headers.test.php b/_test/cases/inc/parser/parser_headers.test.php
index 8e6517123..e1c6783f5 100644
--- a/_test/cases/inc/parser/parser_headers.test.php
+++ b/_test/cases/inc/parser/parser_headers.test.php
@@ -15,14 +15,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',1,6)),
array('section_open',array(1)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array (6,0,1,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -36,14 +34,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',2,6)),
array('section_open',array(2)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,2,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -57,14 +53,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',3,6)),
array('section_open',array(3)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,3,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -116,14 +110,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',2,6)),
array('section_open',array(2)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,2,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -137,14 +129,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',2,6)),
array('section_open',array(2)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,2,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -158,14 +148,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',1,6)),
array('section_open',array(1)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,1,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -193,14 +181,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('== Header ==',1,6)),
array('section_open',array(1)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,1,'== Header ==')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -233,14 +219,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n== ====== Header\n")),
array('p_close',array()),
- array('section_edit',array(-1,22,1,'')),
array('header',array('',1,23)),
array('section_open',array(1)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(23,0,1,'')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -261,14 +245,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array('abc '.DOKU_PARSER_EOL)),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',1, 6)),
array('section_open',array(1)),
array('p_open',array()),
array('cdata',array(' def'.DOKU_PARSER_EOL)),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,0,1,'Header')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
@@ -283,21 +265,18 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nabc \n")),
array('p_close',array()),
- array('section_edit',array(-1,5,1,'')),
array('header',array('Header',1,6)),
array('section_open',array(1)),
array('p_open',array()),
array('cdata',array("\n def abc \n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(6,38,1,'Header')),
array('header',array('Header2',2,39)),
array('section_open',array(2)),
array('p_open',array()),
array('cdata',array("\n def\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(39,0,2,'Header2')),
array('document_end',array())
);
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
diff --git a/_test/cases/inc/parser/parser_i18n.test.php b/_test/cases/inc/parser/parser_i18n.test.php
index e97a0cf51..f0cceb69e 100644
--- a/_test/cases/inc/parser/parser_i18n.test.php
+++ b/_test/cases/inc/parser/parser_i18n.test.php
@@ -62,14 +62,12 @@ class TestOfDoku_Parser_i18n extends TestOfDoku_Parser {
array('p_open',array()),
array('cdata',array("\nFoo\n")),
array('p_close',array()),
- array('section_edit',array(-1,4,1,'')),
array('header',array('Iñtërnâtiônàlizætiøn',3,5)),
array('section_open',array(3)),
array('p_open',array()),
array('cdata',array("\n Bar\n")),
array('p_close',array()),
array('section_close',array()),
- array('section_edit',array(5,0,3,'Iñtërnâtiônàlizætiøn')),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -87,7 +85,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' Row 0 Col 1 ')),
@@ -110,7 +108,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 153)),
+ array('table_close',array(153)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
diff --git a/_test/cases/inc/parser/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index 981f85217..099909495 100644
--- a/_test/cases/inc/parser/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
@@ -19,7 +19,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' Row 0 Col 1 ')),
@@ -42,7 +42,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 121)),
+ array('table_close',array(121)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -59,7 +59,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' Row 0 Col 1 ')),
@@ -82,7 +82,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 121)),
+ array('table_close',array(121)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -103,10 +103,10 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(0,1)),
+ array('table_open',array(0, 1, 6)),
array('tablerow_open',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 7)),
+ array('table_close',array(7)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -128,7 +128,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,1)),
+ array('table_open',array(3, 1, 6)),
array('tablerow_open',array()),
array('tableheader_open',array(1,NULL,1)),
array('cdata',array(' X ')),
@@ -140,7 +140,7 @@ def');
array('cdata',array(' Z ')),
array('tableheader_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 19)),
+ array('table_close',array(19)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -163,7 +163,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,1)),
+ array('table_open',array(3, 1, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'right',1)),
array('cdata',array(' X ')),
@@ -175,7 +175,7 @@ def');
array('cdata',array(' Z ')),
array('tableheader_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 23)),
+ array('table_close',array(23)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -199,7 +199,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,3)),
+ array('table_open',array(3, 3, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(2,'right',1)),
array('cdata',array(' d ')),
@@ -218,7 +218,7 @@ def');
array('tablerow_close',array()),
array('tablerow_open',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 31)),
+ array('table_close',array(31)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -241,7 +241,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,3)),
+ array('table_open',array(3, 3, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,NULL,2)),
array('cdata',array(' a ')),
@@ -266,7 +266,7 @@ def');
array('cdata',array(':::f')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 51)),
+ array('table_close',array(51)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -288,7 +288,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,1)),
+ array('table_open',array(3, 1, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'right',1)),
array('cdata',array(' ')),
@@ -304,7 +304,7 @@ def');
array('cdata',array(' Z ')),
array('tableheader_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 27)),
+ array('table_close',array(27)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -328,7 +328,7 @@ def');
array('p_open',array()),
array('cdata',array(DOKU_PARSER_EOL."abc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' Row 0 Col 1 ')),
@@ -351,7 +351,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 121)),
+ array('table_close',array(121)),
array('p_open',array()),
array('cdata',array('def'.DOKU_PARSER_EOL)),
array('p_close',array()),
@@ -375,7 +375,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' ')),
@@ -403,7 +403,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 129)),
+ array('table_close',array(129)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -427,7 +427,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' ')),
@@ -451,7 +451,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 155)),
+ array('table_close',array(155)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -473,7 +473,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' Row 0')),
@@ -498,7 +498,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 123)),
+ array('table_close',array(123)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -523,7 +523,7 @@ def');
array('p_open',array()),
array('cdata',array("\n\nabc")),
array('p_close',array()),
- array('table_open',array(3,2)),
+ array('table_open',array(3, 2, 6)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left',1)),
array('cdata',array(' ')),
@@ -555,7 +555,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array(6, 129)),
+ array('table_close',array(129)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
diff --git a/_test/runtests.php b/_test/runtests.php
index c4a4f36b4..e122c59fb 100755
--- a/_test/runtests.php
+++ b/_test/runtests.php
@@ -9,7 +9,6 @@ require_once(DOKU_INC.'inc/events.php');
define('TEST_ROOT', dirname(__FILE__));
define('TMPL_FILESCHEME_PATH', TEST_ROOT . '/filescheme/');
-error_reporting(E_ALL ^ E_NOTICE);
require_once 'lib/testmanager.php';
TestManager::setup();
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index e6a19e60b..19397861c 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -103,8 +103,8 @@ $conf['gdlib'] = 2; //the GDlib version (0, 1 or 2) 2 tries
$conf['im_convert'] = ''; //path to ImageMagicks convert (will be used instead of GD)
$conf['jpg_quality'] = '70'; //quality of compression when scaling jpg images (0-100)
$conf['subscribers'] = 0; //enable change notice subscription support
-$conf['subscribe_time'] = 24 * 60 * 60; //Time after which digests / lists are sent (in sec, default 1 day)
- //Should be larger than the time specified in recent_days
+$conf['subscribe_time'] = 24*60*60; //Time after which digests / lists are sent (in sec, default 1 day)
+ //Should be smaller than the time specified in recent_days
$conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0
$conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes
$conf['send404'] = 0; //Send a HTTP 404 status for non existing pages?
diff --git a/conf/license.php b/conf/license.php
index 9a753baa7..b97cb3cfd 100644
--- a/conf/license.php
+++ b/conf/license.php
@@ -23,18 +23,22 @@ $license['cc-by-nc-sa'] = array(
);
$license['cc-by-nd'] = array(
'name' => 'CC Attribution-No Derivative Works 3.0 Unported',
- 'url' => 'cc-by-nd',
+ 'url' => 'http://creativecommons.org/licenses/by-nd/3.0/',
);
$license['cc-by-sa'] = array(
'name' => 'CC Attribution-Share Alike 3.0 Unported',
'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
);
+$license['cc-zero'] = array(
+ 'name' => 'CC0 1.0 Universal',
+ 'url' => 'http://creativecommons.org/publicdomain/zero/1.0/',
+);
$license['publicdomain'] = array(
'name' => 'Public Domain',
'url' => 'http://creativecommons.org/licenses/publicdomain/',
);
$license['gnufdl'] = array(
- 'name' => 'GNU Free Documentation License 1.2',
- 'url' => 'http://www.gnu.org/licenses/fdl-1.2.html',
+ 'name' => 'GNU Free Documentation License 1.3',
+ 'url' => 'http://www.gnu.org/licenses/fdl-1.3.html',
);
diff --git a/conf/local.php.dist b/conf/local.php.dist
index 4af6ea594..0397954f4 100644
--- a/conf/local.php.dist
+++ b/conf/local.php.dist
@@ -1,6 +1,6 @@
<?php
/**
- * This is an example of how a local.php coul look like.
+ * This is an example of how a local.php could look like.
* Simply copy the options you want to change from dokuwiki.php
* to this file and change them.
*
@@ -14,13 +14,3 @@
//$conf['useacl'] = 1; //Use Access Control Lists to restrict access?
//$conf['superuser'] = 'joe';
-/**
- * The following options are usefull, if you use a MySQL
- * database as autentication backend. Have a look into
- * mysql.conf.php too and adjust the options to match
- * your database installation.
- */
-//$conf['authtype'] = 'mysql';
-//require_once ("mysql.conf.php");
-
-
diff --git a/conf/mime.conf b/conf/mime.conf
index 2e1ce6bb0..24529b06c 100644
--- a/conf/mime.conf
+++ b/conf/mime.conf
@@ -7,22 +7,34 @@ jpg image/jpeg
jpeg image/jpeg
gif image/gif
png image/png
+
+swf application/x-shockwave-flash
+mp3 audio/mpeg
+ogg audio/ogg
+wav audio/wav
+
tgz !application/octet-stream
tar !application/x-gtar
gz !application/octet-stream
bz2 !application/octet-stream
zip !application/zip
rar !application/rar
+7z !application/x-7z-compressed
+
pdf application/pdf
ps !application/postscript
+
+rpm !application/octet-stream
+deb !application/octet-stream
+
doc !application/msword
xls !application/msexcel
ppt !application/mspowerpoint
rtf !application/msword
-swf application/x-shockwave-flash
-rpm !application/octet-stream
-deb !application/octet-stream
+docx !application/vnd.openxmlformats-officedocument.wordprocessingml.document
+xlsx !application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+pptx !application/vnd.openxmlformats-officedocument.presentationml.presentation
sxw !application/soffice
sxc !application/soffice
@@ -48,5 +60,5 @@ odt !application/vnd.oasis.opendocument.text
#txt text/plain
#conf text/plain
#xml text/xml
-
+#csv text/csv
diff --git a/conf/mysql.conf.php.example b/conf/mysql.conf.php.example
index bd67be82c..94bc14e1f 100644
--- a/conf/mysql.conf.php.example
+++ b/conf/mysql.conf.php.example
@@ -8,15 +8,15 @@
*
* TABLE users
* uid login pass firstname lastname email
- *
+ *
* TABLE groups
* gid name
- *
+ *
* TABLE usergroup
* uid gid
- *
- * To use this configuration you have to copy them to local.php
- * or at least include this file in local.php.
+ *
+ * To use this configuration you have to copy them to local.protected.php
+ * or at least include this file in local.protected.php.
*/
/* Options to configure database access. You need to set up this
@@ -59,9 +59,9 @@ $conf['auth']['mysql']['TablesToLock']= array("users", "users AS u","groups", "g
* The module access the password as 'pass' so a alias might be necessary.
*
* Following patters will be replaced:
- * %{user} user name
- * %{pass} encrypted or clear text password (depends on 'encryptPass')
- * %{dgroup} default group name
+ * %{user} user name
+ * %{pass} encrypted or clear text password (depends on 'encryptPass')
+ * %{dgroup} default group name
*/
$conf['auth']['mysql']['checkPass'] = "SELECT pass
FROM usergroup AS ug
@@ -80,7 +80,7 @@ $conf['auth']['mysql']['checkPass'] = "SELECT pass
* names listed above so aliasses might be neseccary.
*
* Following patters will be replaced:
- * %{user} user name
+ * %{user} user name
*/
$conf['auth']['mysql']['getUserInfo'] = "SELECT pass, CONCAT(firstname,' ',lastname) AS name, email AS mail
FROM users
@@ -92,7 +92,7 @@ $conf['auth']['mysql']['getUserInfo'] = "SELECT pass, CONCAT(firstname,' ',lastn
* might be nessecary.
*
* Following patters will be replaced:
- * %{user} user name
+ * %{user} user name
*/
$conf['auth']['mysql']['getGroups'] = "SELECT name as `group`
FROM groups g, users u, usergroup ug
@@ -113,13 +113,13 @@ $conf['auth']['mysql']['getGroups'] = "SELECT name as `group`
* The login name will be accessed as 'user' to a alias might be neseccary.
* No patterns will be replaced in this statement but following patters
* will be replaced in the filter expressions:
- * %{user} in FilterLogin user's login name
- * %{name} in FilterName user's full name
- * %{email} in FilterEmail user's email address
- * %{group} in FilterGroup group name
+ * %{user} in FilterLogin user's login name
+ * %{name} in FilterName user's full name
+ * %{email} in FilterEmail user's email address
+ * %{group} in FilterGroup group name
*/
$conf['auth']['mysql']['getUsers'] = "SELECT DISTINCT login AS user
- FROM users AS u
+ FROM users AS u
LEFT JOIN usergroup AS ug ON u.uid=ug.uid
LEFT JOIN groups AS g ON ug.gid=g.gid";
$conf['auth']['mysql']['FilterLogin'] = "login LIKE '%{user}'";
@@ -136,11 +136,11 @@ $conf['auth']['mysql']['SortOrder'] = "ORDER BY login";
* to store are: login name, password, email address and full name.
*
* Following patterns will be replaced:
- * %{user} user's login name
- * %{pass} password (encrypted or clear text, depends on 'encryptPass')
- * %{email} email address
- * %{name} user's full name
- */
+ * %{user} user's login name
+ * %{pass} password (encrypted or clear text, depends on 'encryptPass')
+ * %{email} email address
+ * %{name} user's full name
+ */
$conf['auth']['mysql']['addUser'] = "INSERT INTO users
(login, pass, email, firstname, lastname)
VALUES ('%{user}', '%{pass}', '%{email}',
@@ -149,7 +149,7 @@ $conf['auth']['mysql']['addUser'] = "INSERT INTO users
/* This statement should add a group to the database.
* Following patterns will be replaced:
- * %{group} group name
+ * %{group} group name
*/
$conf['auth']['mysql']['addGroup'] = "INSERT INTO groups (name)
VALUES ('%{group}')";
@@ -157,18 +157,18 @@ $conf['auth']['mysql']['addGroup'] = "INSERT INTO groups (name)
/* This statement should connect a user to a group (a user become member
* of that group).
* Following patterns will be replaced:
- * %{user} user's login name
- * %{uid} id of a user dataset
- * %{group} group name
- * %{gid} id of a group dataset
+ * %{user} user's login name
+ * %{uid} id of a user dataset
+ * %{group} group name
+ * %{gid} id of a group dataset
*/
$conf['auth']['mysql']['addUserGroup']= "INSERT INTO usergroup (uid, gid)
VALUES ('%{uid}', '%{gid}')";
/* This statement should remove a group fom the database.
* Following patterns will be replaced:
- * %{group} group name
- * %{gid} id of a group dataset
+ * %{group} group name
+ * %{gid} id of a group dataset
*/
$conf['auth']['mysql']['delGroup'] = "DELETE FROM groups
WHERE gid='%{gid}'";
@@ -177,7 +177,7 @@ $conf['auth']['mysql']['delGroup'] = "DELETE FROM groups
* The module will access the index with the name 'id' so a alias might be
* necessary.
* following patters will be replaced:
- * %{user} user name
+ * %{user} user name
*/
$conf['auth']['mysql']['getUserID'] = "SELECT uid AS id
FROM users
@@ -189,8 +189,8 @@ $conf['auth']['mysql']['getUserID'] = "SELECT uid AS id
/* This statement should remove a user fom the database.
* Following patterns will be replaced:
- * %{user} user's login name
- * %{uid} id of a user dataset
+ * %{user} user's login name
+ * %{uid} id of a user dataset
*/
$conf['auth']['mysql']['delUser'] = "DELETE FROM users
WHERE uid='%{uid}'";
@@ -198,7 +198,7 @@ $conf['auth']['mysql']['delUser'] = "DELETE FROM users
/* This statement should remove all connections from a user to any group
* (a user quits membership of all groups).
* Following patterns will be replaced:
- * %{uid} id of a user dataset
+ * %{uid} id of a user dataset
*/
$conf['auth']['mysql']['delUserRefs'] = "DELETE FROM usergroup
WHERE uid='%{uid}'";
@@ -212,12 +212,12 @@ $conf['auth']['mysql']['delUserRefs'] = "DELETE FROM usergroup
* added to updateUser on demand. Only changed parameters will be used.
*
* Following patterns will be replaced:
- * %{user} user's login name
- * %{pass} password (encrypted or clear text, depends on 'encryptPass')
- * %{email} email address
- * %{name} user's full name
+ * %{user} user's login name
+ * %{pass} password (encrypted or clear text, depends on 'encryptPass')
+ * %{email} email address
+ * %{name} user's full name
* %{uid} user id that should be updated
- */
+ */
$conf['auth']['mysql']['updateUser'] = "UPDATE users SET";
$conf['auth']['mysql']['UpdateLogin'] = "login='%{user}'";
$conf['auth']['mysql']['UpdatePass'] = "pass='%{pass}'";
@@ -230,10 +230,10 @@ $conf['auth']['mysql']['UpdateTarget']= "WHERE uid=%{uid}";
* group (a user quits membership of that group).
*
* Following patterns will be replaced:
- * %{user} user's login name
- * %{uid} id of a user dataset
- * %{group} group name
- * %{gid} id of a group dataset
+ * %{user} user's login name
+ * %{uid} id of a user dataset
+ * %{group} group name
+ * %{gid} id of a group dataset
*/
$conf['auth']['mysql']['delUserGroup']= "DELETE FROM usergroup
WHERE uid='%{uid}'
@@ -244,7 +244,7 @@ $conf['auth']['mysql']['delUserGroup']= "DELETE FROM usergroup
* be necessary.
*
* Following patters will be replaced:
- * %{group} group name
+ * %{group} group name
*/
$conf['auth']['mysql']['getGroupID'] = "SELECT gid AS id
FROM groups
diff --git a/doku.php b/doku.php
index 990bb43d3..54b1d00e9 100644
--- a/doku.php
+++ b/doku.php
@@ -30,11 +30,13 @@ $NS = getNS($ID);
$REV = $_REQUEST['rev'];
$IDX = $_REQUEST['idx'];
$DATE = $_REQUEST['date'];
-$RANGE = $_REQUEST['lines'];
+$RANGE = $_REQUEST['range'];
$HIGH = $_REQUEST['s'];
if(empty($HIGH)) $HIGH = getGoogleQuery();
-$TEXT = cleanText($_POST['wikitext']);
+if (isset($_POST['wikitext'])) {
+ $TEXT = cleanText($_POST['wikitext']);
+}
$PRE = cleanText($_POST['prefix']);
$SUF = cleanText($_POST['suffix']);
$SUM = $_REQUEST['summary'];
diff --git a/inc/actions.php b/inc/actions.php
index 91a1d9cdd..66068cd36 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -109,7 +109,7 @@ function act_dispatch(){
$ACT = act_draftsave($ACT);
//edit
- if(($ACT == 'edit' || $ACT == 'preview') && $INFO['editable']){
+ if(($ACT == 'edit' || $ACT == 'preview' || $ACT == 'recover') && $INFO['editable']){
$ACT = act_edit($ACT);
}else{
unlock($ID); //try to unlock
@@ -202,7 +202,7 @@ function act_clean($act){
if(!in_array($act,array('login','logout','register','save','cancel','edit','draft',
'preview','search','show','check','index','revisions',
'diff','recent','backlink','admin','subscribe','revert',
- 'unsubscribe','profile','resendpwd','recover','wordblock',
+ 'unsubscribe','profile','resendpwd','recover',
'draftdel','subscribens','unsubscribens',)) && substr($act,0,7) != 'export_' ) {
msg('Command unknown: '.htmlspecialchars($act),-1);
return 'show';
@@ -309,12 +309,16 @@ function act_save($act){
global $TEXT;
global $SUF;
global $SUM;
+ global $lang;
+ global $INFO;
//spam check
- if(checkwordblock())
- return 'wordblock';
- //conflict check //FIXME use INFO
- if($DATE != 0 && @filemtime(wikiFN($ID)) > $DATE )
+ if(checkwordblock()) {
+ msg($lang['wordblock'], -1);
+ return 'edit';
+ }
+ //conflict check
+ if($DATE != 0 && $INFO['meta']['date']['modified'] > $DATE )
return 'conflict';
//save it
@@ -351,8 +355,11 @@ function act_revert($act){
}
// spam check
- if(checkwordblock($Text))
- return 'wordblock';
+
+ if (checkwordblock($text)) {
+ msg($lang['wordblock'], -1);
+ return 'edit';
+ }
saveWikiText($ID,$text,$sum,false);
msg($sum,1);
@@ -440,7 +447,7 @@ function act_auth($act){
}
/**
- * Handle 'edit', 'preview'
+ * Handle 'edit', 'preview', 'recover'
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
@@ -448,6 +455,40 @@ function act_edit($act){
global $ID;
global $INFO;
+ global $TEXT;
+ global $RANGE;
+ global $PRE;
+ global $SUF;
+ global $REV;
+ global $SUM;
+ global $lang;
+ global $DATE;
+
+ if (!isset($TEXT)) {
+ if ($INFO['exists']) {
+ if ($RANGE) {
+ list($PRE,$TEXT,$SUF) = rawWikiSlices($RANGE,$ID,$REV);
+ } else {
+ $TEXT = rawWiki($ID,$REV);
+ }
+ } else {
+ $TEXT = pageTemplate($ID);
+ }
+ }
+
+ //set summary default
+ if(!$SUM){
+ if($REV){
+ $SUM = $lang['restored'];
+ }elseif(!$INFO['exists']){
+ $SUM = $lang['created'];
+ }
+ }
+
+ // Use the date of the newest revision, not of the revision we edit
+ // This is used for conflict detection
+ if(!$DATE) $DATE = $INFO['meta']['date']['modified'];
+
//check if locked by anyone - if not lock for my self
$lockedby = checklock($ID);
if($lockedby) return 'locked';
@@ -569,7 +610,7 @@ function act_subscription($act){
}
// any action given? if not just return and show the subscription page
- if(!$params['action']) return $act;
+ if(!$params['action'] || !checkSecurityToken()) return $act;
// Handle POST data, may throw exception.
trigger_event('ACTION_HANDLE_SUBSCRIBE', $params, 'subscription_handle_post');
diff --git a/inc/common.php b/inc/common.php
index c68eb2899..d1a722f45 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -725,6 +725,12 @@ function checklock($id){
* @author Andreas Gohr <andi@splitbrain.org>
*/
function lock($id){
+ global $conf;
+
+ if($conf['locktime'] == 0){
+ return;
+ }
+
$lock = wikiLockFN($id);
if($_SERVER['REMOTE_USER']){
io_saveFile($lock,$_SERVER['REMOTE_USER']);
@@ -796,15 +802,16 @@ function rawWiki($id,$rev=''){
/**
* Returns the pagetemplate contents for the ID's namespace
*
+ * @triggers COMMON_PAGE_FROMTEMPLATE
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function pageTemplate($data){
- $id = $data[0];
+function pageTemplate($id){
global $conf;
- global $INFO;
- $path = dirname(wikiFN($id));
+ if (is_array($id)) $id = $id[0];
+ $path = dirname(wikiFN($id));
+ $tpl = '';
if(@file_exists($path.'/_template.txt')){
$tpl = io_readFile($path.'/_template.txt');
}else{
@@ -818,7 +825,22 @@ function pageTemplate($data){
$path = substr($path, 0, strrpos($path, '/'));
}
}
- if(!$tpl) return '';
+ $data = compact('tpl', 'id');
+ trigger_event('COMMON_PAGE_FROMTEMPLATE', $data, 'parsePageTemplate', true);
+ return $data['tpl'];
+}
+
+/**
+ * Performs common page template replacements
+ * This is the default action for COMMON_PAGE_FROMTEMPLATE
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function parsePageTemplate($data) {
+ extract($data);
+
+ global $USERINFO;
+ global $conf;
// replace placeholders
$file = noNS($id);
@@ -850,8 +872,8 @@ function pageTemplate($data){
utf8_ucwords($page),
utf8_strtoupper($page),
$_SERVER['REMOTE_USER'],
- $INFO['userinfo']['name'],
- $INFO['userinfo']['mail'],
+ $USERINFO['name'],
+ $USERINFO['mail'],
$conf['dformat'],
), $tpl);
@@ -861,7 +883,6 @@ function pageTemplate($data){
return $tpl;
}
-
/**
* Returns the raw Wiki Text in three slices.
*
diff --git a/inc/fulltext.php b/inc/fulltext.php
index 76dd01d1f..142862529 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -9,6 +9,11 @@
if(!defined('DOKU_INC')) die('meh.');
/**
+ * create snippets for the first few results only
+ */
+if(!defined('FT_SNIPPET_NUMBER')) define('FT_SNIPPET_NUMBER',15);
+
+/**
* The fulltext search
*
* Returns a list of matching documents for the given query
diff --git a/inc/html.php b/inc/html.php
index 2d6c0a093..23eadebc4 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -80,51 +80,66 @@ function html_login(){
}
/**
- * prints a section editing button
- * used as a callback in html_secedit
+ * inserts section edit buttons if wanted or removes the markers
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function html_secedit_button($matches){
- global $ID;
+function html_secedit($text,$show=true){
global $INFO;
- $edittarget = ($matches[1] === 'SECTION') ? 'plain' :
- strtolower($matches[1]);
-
- $section = $matches[3];
- $name = $matches[2];
-
- $secedit = '';
- $secedit .= '<div class="secedit editbutton_' . $edittarget . '">';
- $secedit .= html_btn('secedit',$ID,'',
- array('do' => 'edit',
- 'lines' => $section,
- 'edittarget' => $edittarget,
- 'rev' => $INFO['lastmod']),
- 'post', $name);
- $secedit .= '</div>';
- return $secedit;
+ $regexp = '#<!-- EDIT(\d+) ([A-Z_]+) (?:"([^"]*)" )?\[(\d+-\d*)\] -->#';
+
+ if(!$INFO['writable'] || !$show || $INFO['rev']){
+ return preg_replace($regexp,'',$text);
+ }
+
+ return preg_replace_callback($regexp,
+ 'html_secedit_button', $text);
}
/**
- * inserts section edit buttons if wanted or removes the markers
+ * prepares section edit button data for event triggering
+ * used as a callback in html_secedit
*
+ * @triggers HTML_SECEDIT_BUTTON
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function html_secedit($text,$show=true){
+function html_secedit_button($matches){
+ $data = array('secid' => $matches[1],
+ 'target' => strtolower($matches[2]),
+ 'range' => $matches[count($matches) - 1]);
+ if (count($matches) === 5) {
+ $data['name'] = $matches[3];
+ }
+
+ return trigger_event('HTML_SECEDIT_BUTTON', $data,
+ 'html_secedit_get_button');
+}
+
+/**
+ * prints a section editing button
+ * used as default action form HTML_SECEDIT_BUTTON
+ *
+ * @author Adrian Lang <lang@cosmocode.de>
+ */
+function html_secedit_get_button($data) {
+ global $ID;
global $INFO;
- $regexp = '#<!-- ([A-Z]+) (?:"(.*)" )?\[(\d+-\d*)\] -->#';
+ if (!isset($data['name']) || $data['name'] === '') return;
- if($INFO['writable'] && $show && !$INFO['rev']){
- $text = preg_replace_callback($regexp,
- 'html_secedit_button', $text);
- }else{
- $text = preg_replace($regexp,'',$text);
- }
+ $name = $data['name'];
+ unset($data['name']);
+
+ $secid = $data['secid'];
+ unset($data['secid']);
- return $text;
+ return "<div class='secedit editbutton_" . $data['target'] .
+ " editbutton_" . $secid . "'>" .
+ html_btn('secedit', $ID, '',
+ array_merge(array('do' => 'edit',
+ 'rev' => $INFO['lastmod']), $data),
+ 'post', $name) . '</div>';
}
/**
@@ -354,7 +369,7 @@ function html_search(){
print html_wikilink(':'.$id,useHeading('navigation')?null:$id,$regex);
if($cnt !== 0){
print ': <span class="search_cnt">'.$cnt.' '.$lang['hits'].'</span><br />';
- if($num < 15){ // create snippets for the first number of matches only #FIXME add to conf ?
+ if($num < FT_SNIPPET_NUMBER){ // create snippets for the first number of matches only
print '<div class="search_snippet">'.ft_snippet($id,$regex).'</div>';
}
$num++;
@@ -1105,76 +1120,105 @@ function html_updateprofile(){
/**
* Preprocess edit form data
*
- * @triggers HTML_PAGE_FROMTEMPLATE
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function html_edit($text=null,$include='edit'){ //FIXME: include needed?
+function html_edit(){
global $ID;
global $REV;
global $DATE;
- global $RANGE;
global $PRE;
global $SUF;
global $INFO;
global $SUM;
global $lang;
global $conf;
+ global $TEXT;
- //set summary default
- if(!$SUM){
- if($REV){
- $SUM = $lang['restored'];
- }elseif(!$INFO['exists']){
- $SUM = $lang['created'];
- }
- }
-
- //no text? Load it!
- if(!isset($text)){
- $pr = false; //no preview mode
- if($INFO['exists']){
- if($RANGE){
- list($PRE,$text,$SUF) = rawWikiSlices($RANGE,$ID,$REV);
- }else{
- $text = rawWiki($ID,$REV);
- }
- $check = md5($text);
- $mod = false;
- }else{
- //try to load a pagetemplate
- $data = array($ID);
- $text = trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true);
- $check = md5('');
- $mod = $text!=='';
- }
- }else{
- $pr = true; //preview mode
- if (isset($_REQUEST['changecheck'])) {
- $check = $_REQUEST['changecheck'];
- $mod = md5($text)!==$check;
- } else {
- // Why? Assume default text is unmodified.
- $check = md5($text);
- $mod = false;
- }
+ if (isset($_REQUEST['changecheck'])) {
+ $check = $_REQUEST['changecheck'];
+ } elseif(!$INFO['exists']){
+ // $TEXT has been loaded from page template
+ $check = md5('');
+ } else {
+ $check = md5($TEXT);
}
+ $mod = md5($TEXT) !== $check;
$wr = $INFO['writable'] && !$INFO['locked'];
+ $include = 'edit';
if($wr){
- if ($REV) print p_locale_xhtml('editrev');
- print p_locale_xhtml($include);
+ if ($REV) $include = 'editrev';
}else{
// check pseudo action 'source'
if(!actionOK('source')){
msg('Command disabled: source',-1);
return;
}
- print p_locale_xhtml('read');
+ $include = 'read';
}
- if(!$DATE) $DATE = $INFO['lastmod'];
- $data = compact('wr', 'text', 'mod', 'check');
+ global $license;
+
+ $form = new Doku_Form(array('id' => 'dw__editform'));
+ $form->addHidden('id', $ID);
+ $form->addHidden('rev', $REV);
+ $form->addHidden('date', $DATE);
+ $form->addHidden('prefix', $PRE);
+ $form->addHidden('suffix', $SUF);
+ $form->addHidden('changecheck', $check);
+
+ $data = compact('wr', 'form');
+ $data['media_manager'] = true;
+ $data['intro_locale'] = $include;
trigger_event('HTML_EDIT_FORMSELECTION', $data, 'html_edit_form', true);
+ if (isset($data['intro_locale'])) {
+ echo p_locale_xhtml($data['intro_locale']);
+ }
+
+ $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
+ $form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
+ $form->addElement(form_makeCloseTag('div'));
+ if ($wr) {
+ $form->addElement(form_makeOpenTag('div', array('class'=>'editButtons')));
+ $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('id'=>'edbtn__save', 'accesskey'=>'s', 'tabindex'=>'4')));
+ $form->addElement(form_makeButton('submit', 'preview', $lang['btn_preview'], array('id'=>'edbtn__preview', 'accesskey'=>'p', 'tabindex'=>'5')));
+ $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_cancel'], array('tabindex'=>'6')));
+ $form->addElement(form_makeCloseTag('div'));
+ $form->addElement(form_makeOpenTag('div', array('class'=>'summary')));
+ $form->addElement(form_makeTextField('summary', $SUM, $lang['summary'], 'edit__summary', 'nowrap', array('size'=>'50', 'tabindex'=>'2')));
+ $elem = html_minoredit();
+ if ($elem) $form->addElement($elem);
+ $form->addElement(form_makeCloseTag('div'));
+ }
+ $form->addElement(form_makeCloseTag('div'));
+ if($wr && $conf['license']){
+ $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
+ $out = $lang['licenseok'];
+ $out .= '<a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"';
+ if(isset($conf['target']['extern'])) $out .= ' target="'.$conf['target']['extern'].'"';
+ $out .= '> '.$license[$conf['license']]['name'].'</a>';
+ $form->addElement($out);
+ $form->addElement(form_makeCloseTag('div'));
+ }
+
+ if ($wr) {
+ // sets changed to true when previewed
+ echo '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--';
+ echo 'textChanged = ' . ($mod ? 'true' : 'false');
+ echo '//--><!]]></script>';
+ } ?>
+ <div style="width:99%;">
+
+ <div class="toolbar">
+ <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
+ <div id="tool__bar"><?php if ($wr && $data['media_manager']){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
+ target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
+
+ </div>
+ <?php
+
+ html_form('edit', $form);
+ print '</div>'.NL;
}
/**
@@ -1185,70 +1229,11 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
* @triggers HTML_EDITFORM_OUTPUT
*/
function html_edit_form($param) {
+ global $TEXT;
extract($param);
- global $conf;
- global $license;
- global $lang;
- global $REV;
- global $DATE;
- global $PRE;
- global $SUF;
- global $INFO;
- global $SUM;
- global $ID;
- ?>
- <?php if($wr){?>
- <script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--
- <?php /* sets changed to true when previewed */?>
- textChanged = <?php ($mod) ? print 'true' : print 'false' ?>;
- //--><!]]></script>
- <?php } ?>
- <div style="width:99%;">
-
- <div class="toolbar">
- <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
- <div id="tool__bar"><?php if($wr){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
- target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
-
- </div>
- <?php
- $form = new Doku_Form(array('id' => 'dw__editform'));
- $form->addHidden('id', $ID);
- $form->addHidden('rev', $REV);
- $form->addHidden('date', $DATE);
- $form->addHidden('prefix', $PRE);
- $form->addHidden('suffix', $SUF);
- $form->addHidden('changecheck', $check);
- $attr = array('tabindex'=>'1');
- if (!$wr) $attr['readonly'] = 'readonly';
- $form->addElement(form_makeWikiText($text, $attr));
- $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
- $form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
- $form->addElement(form_makeCloseTag('div'));
- if ($wr) {
- $form->addElement(form_makeOpenTag('div', array('class'=>'editButtons')));
- $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('id'=>'edbtn__save', 'accesskey'=>'s', 'tabindex'=>'4')));
- $form->addElement(form_makeButton('submit', 'preview', $lang['btn_preview'], array('id'=>'edbtn__preview', 'accesskey'=>'p', 'tabindex'=>'5')));
- $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_cancel'], array('tabindex'=>'6')));
- $form->addElement(form_makeCloseTag('div'));
- $form->addElement(form_makeOpenTag('div', array('class'=>'summary')));
- $form->addElement(form_makeTextField('summary', $SUM, $lang['summary'], 'edit__summary', 'nowrap', array('size'=>'50', 'tabindex'=>'2')));
- $elem = html_minoredit();
- if ($elem) $form->addElement($elem);
- $form->addElement(form_makeCloseTag('div'));
- }
- $form->addElement(form_makeCloseTag('div'));
- if($wr && $conf['license']){
- $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
- $out = $lang['licenseok'];
- $out .= '<a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"';
- if(isset($conf['target']['external'])) $out .= ' target="'.$conf['target']['external'].'"';
- $out .= '> '.$license[$conf['license']]['name'].'</a>';
- $form->addElement($out);
- $form->addElement(form_makeCloseTag('div'));
- }
- html_form('edit', $form);
- print '</div>'.NL;
+ $attr = array('tabindex'=>'1');
+ if (!$wr) $attr['readonly'] = 'readonly';
+ $form->addElement(form_makeWikiText($TEXT, $attr));
}
/**
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 00a3ad2d3..32baa9450 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -287,9 +287,15 @@ function msg($message,$lvl=0,$line='',$file=''){
* @author Andreas Gohr <andi@splitbrain.org>
*/
function dbg($msg,$hidden=false){
- (!$hidden) ? print '<pre class="dbg">' : print "<!--\n";
- print_r($msg);
- (!$hidden) ? print '</pre>' : print "\n-->";
+ if($hidden){
+ echo "<!--\n";
+ print_r($msg);
+ echo "\n-->";
+ }else{
+ echo '<pre class="dbg">';
+ echo hsc(print_r($msg,true));
+ echo '</pre>';
+ }
}
/**
diff --git a/inc/lang/bg/wordblock.txt b/inc/lang/bg/wordblock.txt
deleted file mode 100644
index 1afbae21d..000000000
--- a/inc/lang/bg/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== Блокиран СПАМ ======
-
-Промените ви **не** бяха запазени, защото съдържат една или повече забранени думи. Ако сте се опитали да пуснете спам в уикито и таз хубава! Ако смятате, че това е грешка, свържете се с администратора на това Wiki.
diff --git a/inc/lang/ca-valencia/wordblock.txt b/inc/lang/ca-valencia/wordblock.txt
deleted file mode 100644
index 718bfe883..000000000
--- a/inc/lang/ca-valencia/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Bloqueig de SPAM ======
-
-Els seus canvis *no* s'han guardat perque contenen una o més paraules prohibides. Si ha intentat posar spam en el wiki.. ¡malament! Si pensa que açò és un erro, contacte en l'administrador d'este wiki.
-
diff --git a/inc/lang/ca/wordblock.txt b/inc/lang/ca/wordblock.txt
deleted file mode 100644
index 1b5f5fb36..000000000
--- a/inc/lang/ca/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Brossa blocada ======
-
-Els canvis **no** s'han desat perquè contenen una o més paraules blocades. Volíeu inundar el wiki amb brossa? Molt mal fet! Si penseu que això és un error, contacteu amb l'administrador d'aquest Wiki.
-
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index ffc2a05d7..32c61692d 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -7,6 +7,7 @@
* @author Tomas Valenta <t.valenta@sh.cvut.cz>
* @author Zbynek Krivka <zbynek.krivka@seznam.cz>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -39,10 +40,7 @@ $lang['btn_delete'] = 'Vymazat';
$lang['btn_back'] = 'Zpět';
$lang['btn_backlink'] = 'Zpětné odkazy';
$lang['btn_backtomedia'] = 'Zpět do Výběru dokumentu';
-$lang['btn_subscribe'] = 'Odebírat mailem změny stránky';
-$lang['btn_unsubscribe'] = 'Neodebírat mailem změny stránky';
-$lang['btn_subscribens'] = 'Odebírat mailem změny ve jmenném prostoru';
-$lang['btn_unsubscribens'] = 'Neodebírat mailem změny ve jmenném prostoru';
+$lang['btn_subscribe'] = 'Odebírat emailem změny stránky';
$lang['btn_profile'] = 'Upravit profil';
$lang['btn_reset'] = 'Reset';
$lang['btn_resendpwd'] = 'Zaslat nové heslo';
@@ -117,6 +115,27 @@ $lang['mediafiles'] = 'Dostupné soubory';
$lang['js']['searchmedia'] = 'Hledat soubory';
$lang['js']['keepopen'] = 'Po vybrání souboru nechat okno otevřené';
$lang['js']['hidedetails'] = 'Skrýt detaily';
+$lang['js']['mediatitle'] = 'Nastavení odkazu';
+$lang['js']['mediadisplay'] = 'Typ odkazu';
+$lang['js']['mediaalign'] = 'Zarovnání';
+$lang['js']['mediasize'] = 'Velikost obrázku';
+$lang['js']['mediatarget'] = 'Cíl odkazu';
+$lang['js']['mediaclose'] = 'Zavřít';
+$lang['js']['mediainsert'] = 'Vložit';
+$lang['js']['mediadisplayimg'] = 'Ukázat obrázek';
+$lang['js']['mediadisplaylnk'] = 'Ukázat pouze odkaz';
+$lang['js']['mediasmall'] = 'Malá verze';
+$lang['js']['mediamedium'] = 'Střední verze';
+$lang['js']['medialarge'] = 'Velká verze';
+$lang['js']['mediaoriginal'] = 'Původní verze';
+$lang['js']['medialnk'] = 'Odkaz na stránku s detailem';
+$lang['js']['mediadirect'] = 'Přímý odkaz na originál';
+$lang['js']['medianolnk'] = 'Žádný odkaz';
+$lang['js']['medianolink'] = 'Neodkazovat na obrázek';
+$lang['js']['medialeft'] = 'Zarovnat obrázek doleva.';
+$lang['js']['mediaright'] = 'Zarovnat obrázek doprava.';
+$lang['js']['mediacenter'] = 'Zarovnat obrázek na střed.';
+$lang['js']['medianoalign'] = 'Nepoužívat zarovnání.';
$lang['js']['nosmblinks'] = 'Odkazování na sdílené prostředky Windows funguje jen v Internet Exploreru.
Přesto tento odkaz můžete zkopírovat a vložit jinde.';
$lang['js']['linkwiz'] = 'Průvodce odkazy';
@@ -152,6 +171,7 @@ $lang['noflash'] = 'Pro přehrání obsahu potřebujete <a href="h
$lang['download'] = 'Stáhnout snippet';
$lang['mail_newpage'] = 'nová stránka:';
$lang['mail_changed'] = 'změna stránky:';
+$lang['mail_subscribe_list'] = 'stránky změněné ve jmenném prostoru:';
$lang['mail_new_user'] = 'nový uživatel:';
$lang['mail_upload'] = 'načtený dokument:';
$lang['qb_bold'] = 'Tučně';
@@ -194,11 +214,22 @@ $lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Formát';
$lang['img_camera'] = 'Typ fotoaparátu';
$lang['img_keywords'] = 'Klíčová slova';
-$lang['subscribe_success'] = 'Uživatel %s je nyní přihlášen k odběru změn ve stránce %s';
-$lang['subscribe_error'] = 'Chyba při zařazování uživatele %s do seznamu pro odběr změn ve stránce %s';
-$lang['subscribe_noaddress'] = 'K vašemu uživatelskému profilu chybí mailová adresa, takže vás nelze zařadit do seznamu pro odběr změn';
-$lang['unsubscribe_success'] = 'Uživatel %s byl odebrán ze seznamu pro odběr změn ve stránce %s';
-$lang['unsubscribe_error'] = 'Chyba při odstraňování uživatele %s ze seznamu pro odběru změn ve stránce %s';
+$lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s';
+$lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s';
+$lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.';
+$lang['subscr_unsubscribe_success'] = '%s byl odhlášen ze seznamu odběratelů %s';
+$lang['subscr_unsubscribe_error'] = 'Došlo k chybě při odhlašování %s ze seznamu odběratelů %s';
+$lang['subscr_already_subscribed'] = '%s již je přihlášen do seznamu odběratelů %s';
+$lang['subscr_not_subscribed'] = '%s není přihlášen do seznamu odběratelů %s';
+$lang['subscr_m_not_subscribed'] = 'V současné době neodebíráte změny na aktuální stránce nebo ve jmenném prostoru.';
+$lang['subscr_m_new_header'] = 'Přihlásit k odebírání změn emailem';
+$lang['subscr_m_current_header'] = 'Aktuální odběratelé změn';
+$lang['subscr_m_unsubscribe'] = 'Odhlásit z odběru změn emailem';
+$lang['subscr_m_subscribe'] = 'Přihlásit se k odběru změn emailem';
+$lang['subscr_m_receive'] = 'Přejete si dostávat';
+$lang['subscr_style_every'] = 'email pro každou změnu';
+$lang['subscr_style_digest'] = 'souhrnný email změn pro každou stránku';
+$lang['subscr_style_list'] = 'seznam změněných stránek od posledního emailu';
$lang['authmodfailed'] = 'Autentizace uživatelů je špatně nastavena. Informujte prosím správce této wiki.';
$lang['authtempfail'] = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.';
$lang['i_chooselang'] = 'Vyberte si jazyk';
diff --git a/inc/lang/cs/mailtext.txt b/inc/lang/cs/mailtext.txt
index 9fc68cdce..f235a299b 100644
--- a/inc/lang/cs/mailtext.txt
+++ b/inc/lang/cs/mailtext.txt
@@ -13,5 +13,5 @@ Uživatel : @USER@
--
-Tato zpráva byla vygenerována systémem DokuWiki
+Tento email byl automaticky vygenerován systémem DokuWiki
@DOKUWIKIURL@
diff --git a/inc/lang/cs/password.txt b/inc/lang/cs/password.txt
index ed1efc992..18f21f1b1 100644
--- a/inc/lang/cs/password.txt
+++ b/inc/lang/cs/password.txt
@@ -7,5 +7,5 @@ Uživatelské jméno : @LOGIN@
Heslo : @PASSWORD@
--
-Tato zpráva byla vygenerována systémem DokuWiki
+Tento email byl automaticky vygenerován systémem DokuWiki
@DOKUWIKIURL@
diff --git a/inc/lang/cs/pwconfirm.txt b/inc/lang/cs/pwconfirm.txt
index 1199150e2..aa37b3b84 100644
--- a/inc/lang/cs/pwconfirm.txt
+++ b/inc/lang/cs/pwconfirm.txt
@@ -2,12 +2,12 @@ Dobrý den,
Někdo požádal o nové heslo k vašemu uživatelskému účtu na wiki @TITLE@ (@DOKUWIKIURL@)
-Pokud jste o nové heslo nežádali, ignorujte prosím tento mail.
+Pokud jste o nové heslo nežádali, ignorujte prosím tento email.
Pro potvrzení, že jste tento požadavek poslali opravdu vy, prosím otevřete následující odkaz.
@CONFIRM@
--
-Tento mail byl automaticky vygenerován systémem DokuWiki
+Tento email byl automaticky vygenerován systémem DokuWiki
@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/registermail.txt b/inc/lang/cs/registermail.txt
index e51ee6bb2..7f5e4feb1 100644
--- a/inc/lang/cs/registermail.txt
+++ b/inc/lang/cs/registermail.txt
@@ -10,5 +10,5 @@ IP adresa : @IPADDRESS@
Hostitel : @HOSTNAME
--
-Tato zpráva byla vygenerována systémem DokuWiki
+Tento email byl automaticky vygenerován systémem DokuWiki
@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/subscr_digest.txt b/inc/lang/cs/subscr_digest.txt
new file mode 100644
index 000000000..57b7240c5
--- /dev/null
+++ b/inc/lang/cs/subscr_digest.txt
@@ -0,0 +1,22 @@
+Dobrý den!
+
+Byla změněna stránka @PAGE@ ve wiki @TITLE@.
+Zde jsou změny:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Stará revize: @OLDPAGE@
+Nová revize: @NEWPAGE@
+
+Pro odhlášení z odebírání změn na této webové stránce
+se prosím příhlašte do wiki na adrese
+@DOKUWIKIURL@,pak navštivte
+@SUBSCRIBE@
+a odhlaště se z odebírání změn na stránce či
+ve jmenném prostoru.
+
+--
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/subscr_form.txt b/inc/lang/cs/subscr_form.txt
new file mode 100644
index 000000000..b786ac137
--- /dev/null
+++ b/inc/lang/cs/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Správa odběratelů změn ======
+
+Tato stránka Vám umožnuje spravovat uživatele přihlášené k odběru změn aktuální stránky nebo jmenného prostoru. \ No newline at end of file
diff --git a/inc/lang/cs/subscr_list.txt b/inc/lang/cs/subscr_list.txt
new file mode 100644
index 000000000..82683c57f
--- /dev/null
+++ b/inc/lang/cs/subscr_list.txt
@@ -0,0 +1,19 @@
+Dobrý den!
+
+Byly změněny stránky ve jmenném prostoru @PAGE@ wiki @TITLE@.
+Zde jsou:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pro odhlášení z odebírání změn
+se prosím příhlašte do wiki na adrese
+@DOKUWIKIURL@,pak navštivte
+@SUBSCRIBE@
+a odhlaště se z odebírání změn na stránce či
+ve jmenném prostoru.
+
+--
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/subscr_single.txt b/inc/lang/cs/subscr_single.txt
new file mode 100644
index 000000000..c0089c1b7
--- /dev/null
+++ b/inc/lang/cs/subscr_single.txt
@@ -0,0 +1,25 @@
+Dobrý den!
+
+Byla změněna stránka @PAGE@ ve wiki @TITLE@.
+Zde jsou změny:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Uživatel: @USER@
+Souhrn editace: @SUMMARY@
+Stará revize: @OLDPAGE@
+Nová revize: @NEWPAGE@
+
+Pro odhlášení z odebírání změn na této webové stránce
+se prosím příhlašte do wiki na adrese
+@DOKUWIKIURL@,pak navštivte
+@SUBSCRIBE@
+a odhlaště se z odebírání změn na stránce či
+ve jmenném prostoru.
+
+--
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/uploadmail.txt b/inc/lang/cs/uploadmail.txt
index 98f860138..b19b0bf7e 100644
--- a/inc/lang/cs/uploadmail.txt
+++ b/inc/lang/cs/uploadmail.txt
@@ -10,5 +10,5 @@ MIME typ : @MIME@
Uživatel : @USER@
--
-Tato zpráva byla vygenerována systémem DokuWiki
-@DOKUWIKIUR \ No newline at end of file
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/cs/wordblock.txt b/inc/lang/cs/wordblock.txt
deleted file mode 100644
index 75fe58e0c..000000000
--- a/inc/lang/cs/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAM nebyl povolen ======
-
-Vaše změny **nebyly uloženy**, protože obsahují jedno nebo více nepovolených slov. Wiki si nepotrpí na spam! Pokud se domníváte, že jde o omyl, kontaktujte správce.
diff --git a/inc/lang/da/wordblock.txt b/inc/lang/da/wordblock.txt
deleted file mode 100644
index 5a1c0d754..000000000
--- a/inc/lang/da/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAM blokeret ======
-
-Dine ændringer blev **ikke** gemt da de indeholder et eller flere uønskede ord. Kontakt venligst admin, hvis du mener dette er en fejl.
diff --git a/inc/lang/de-informal/conflict.txt b/inc/lang/de-informal/conflict.txt
index a5ae425be..eec345061 100644
--- a/inc/lang/de-informal/conflict.txt
+++ b/inc/lang/de-informal/conflict.txt
@@ -1,6 +1,6 @@
====== Eine neuere Version existiert ======
-Eine neuere Version des aktuell in Bearbeitung befindlichen Dokuments existiert. Das heißt, jemand hat parallel an der selben Seite gearbeitet und zuerst gespeichert.
+Eine neuere Version des aktuell in Bearbeitung befindlichen Dokuments existiert. Das heißt, jemand hat gleichzeitig an der selben Seite gearbeitet und zuerst gespeichert.
Die unten aufgeführten Unterschiede können bei der Entscheidung helfen, welchem Dokument Vorrang gewährt wird. Wähle **''[Speichern]''** zum Sichern deiner Version oder **''[Abbrechen]''**, um deine Version zu verwerfen und die zuerst gespeicherte Seite zu behalten.
diff --git a/inc/lang/de-informal/edit.txt b/inc/lang/de-informal/edit.txt
index 15e02c61a..28a764124 100644
--- a/inc/lang/de-informal/edit.txt
+++ b/inc/lang/de-informal/edit.txt
@@ -1,4 +1,4 @@
-Bitte nur editieren, falls das Dokument **verbessert** werden kann.
+Bitte bearbeite dieses Dokument nur, wenn du es **verbessern** kannst.
Nach dem Bearbeiten den **''[Speichern]''**-Knopf drücken. Siehe [[wiki:syntax]] zur Wiki-Syntax. Zum Testen bitte erst im [[playground:playground|Spielplatz]] üben.
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index c90ce8f5e..de9eea1eb 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -15,7 +15,7 @@
* @author Arne Pelka <mail@arnepelka.de>
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -25,7 +25,7 @@ $lang['singlequoteopening'] = '‚';
$lang['singlequoteclosing'] = '‘';
$lang['apostrophe'] = '’';
$lang['btn_edit'] = 'Diese Seite bearbeiten';
-$lang['btn_source'] = 'Zeige Seitenquelltext';
+$lang['btn_source'] = 'Zeige Quelltext';
$lang['btn_show'] = 'Seite anzeigen';
$lang['btn_create'] = 'Seite anlegen';
$lang['btn_search'] = 'Suche';
@@ -43,7 +43,7 @@ $lang['btn_secedit'] = 'Bearbeiten';
$lang['btn_login'] = 'Anmelden';
$lang['btn_logout'] = 'Abmelden';
$lang['btn_admin'] = 'Admin';
-$lang['btn_update'] = 'Aktualisieren';
+$lang['btn_update'] = 'Updaten';
$lang['btn_delete'] = 'Löschen';
$lang['btn_back'] = 'Zurück';
$lang['btn_backlink'] = 'Links hierher';
@@ -52,7 +52,7 @@ $lang['btn_subscribe'] = 'Änderungen abonnieren';
$lang['btn_unsubscribe'] = 'Änderungen abbestellen';
$lang['btn_subscribens'] = 'Namensraumänderungen abonnieren';
$lang['btn_unsubscribens'] = 'Namensraumänderungen abbestellen';
-$lang['btn_profile'] = 'Profil aktualisieren';
+$lang['btn_profile'] = 'Benutzerprofil';
$lang['btn_reset'] = 'Zurücksetzen';
$lang['btn_resendpwd'] = 'Sende neues Passwort';
$lang['btn_draft'] = 'Entwurf bearbeiten';
@@ -64,35 +64,35 @@ $lang['user'] = 'Benutzername';
$lang['pass'] = 'Passwort';
$lang['newpass'] = 'Neues Passwort';
$lang['oldpass'] = 'Bestätigen (Altes Passwort)';
-$lang['passchk'] = 'noch einmal';
+$lang['passchk'] = 'und nochmal';
$lang['remember'] = 'Angemeldet bleiben';
$lang['fullname'] = 'Voller Name';
$lang['email'] = 'E-Mail';
$lang['register'] = 'Registrieren';
$lang['profile'] = 'Benutzerprofil';
$lang['badlogin'] = 'Nutzername oder Passwort sind falsch.';
-$lang['minoredit'] = 'kleine Änderungen';
+$lang['minoredit'] = 'kleine Änderung';
$lang['draftdate'] = 'Entwurf gespeichert am';
-$lang['nosecedit'] = 'Diese Seite wurde in der Zwischenzeit verändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
-$lang['regmissing'] = 'Alle Felder müssen ausgefüllt werden.';
+$lang['nosecedit'] = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
+$lang['regmissing'] = 'Alle Felder müssen ausgefüllt werden';
$lang['reguexists'] = 'Der Nutzername existiert leider schon.';
$lang['regsuccess'] = 'Der neue Nutzer wurde angelegt und das Passwort per Email versandt.';
$lang['regsuccess2'] = 'Der neue Nutzer wurde angelegt.';
$lang['regmailfail'] = 'Offenbar ist ein Fehler beim Versenden der Passwortmail aufgetreten. Bitte wende dich an den Wiki-Admin.';
$lang['regbadmail'] = 'Die angegebene Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wende dich bitte an den Wiki-Admin.';
-$lang['regbadpass'] = 'Die beiden eingegebenen Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
+$lang['regbadpass'] = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
$lang['regpwmail'] = 'Ihr DokuWiki Passwort';
$lang['reghere'] = 'Du hast noch keinen Zugang? Hier anmelden';
$lang['profna'] = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
$lang['profnochange'] = 'Keine Änderungen, nichts zu tun.';
$lang['profnoempty'] = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.';
-$lang['profchanged'] = 'Benutzerprofil erfolgreich geändert.';
+$lang['profchanged'] = 'Benuzerprofil erfolgreich geändert.';
$lang['pwdforget'] = 'Passwort vergessen? Fordere ein neues an';
$lang['resendna'] = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
$lang['resendpwd'] = 'Neues Passwort schicken für';
$lang['resendpwdmissing'] = 'Es tut mir Leid, aber du musst alle Felder ausfüllen.';
-$lang['resendpwdnouser'] = 'Es tut mir Leid, aber dieser Benutzer existiert nicht in unserer Datenbank.';
-$lang['resendpwdbadauth'] = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet hast.';
+$lang['resendpwdnouser'] = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.';
+$lang['resendpwdbadauth'] = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.';
$lang['resendpwdconfirm'] = 'Ein Bestätigungslink wurde per E-Mail versandt.';
$lang['resendpwdsuccess'] = 'Dein neues Passwort wurde per E-Mail versandt.';
$lang['license'] = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
@@ -108,13 +108,13 @@ $lang['willexpire'] = 'Die Sperre zur Bearbeitung dieser Seite läuft
$lang['notsavedyet'] = 'Nicht gespeicherte Änderungen gehen verloren!\nWeitermachen?';
$lang['rssfailed'] = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
$lang['nothingfound'] = 'Nichts gefunden.';
-$lang['mediaselect'] = 'Media-Dateien';
-$lang['fileupload'] = 'Media-Datei hochladen';
+$lang['mediaselect'] = 'Dateiauswahl';
+$lang['fileupload'] = 'Datei hochladen';
$lang['uploadsucc'] = 'Datei wurde erfolgreich hochgeladen';
$lang['uploadfail'] = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
$lang['uploadwrong'] = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
$lang['uploadexist'] = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
-$lang['uploadbadcontent'] = 'Der hochgeladene Inhalt stimmt nicht mit der Dateiendung % überein.';
+$lang['uploadbadcontent'] = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung % überein.';
$lang['uploadspam'] = 'Hochladen verweigert: Treffer auf der Spamliste.';
$lang['uploadxss'] = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.';
$lang['uploadsize'] = 'Die hochgeladene Datei war zu groß. (max. %s)';
@@ -133,11 +133,11 @@ $lang['js']['linkto'] = 'Link zu:';
$lang['js']['del_confirm'] = 'Die ausgewählten Dateien wirklich löschen?';
$lang['js']['mu_btn'] = 'Mehrere Dateien gleichzeitig hochladen';
$lang['mediausage'] = 'Syntax zum Verwenden dieser Datei:';
-$lang['mediaview'] = 'Originaldatei ansehen';
+$lang['mediaview'] = 'Originaldatei öffnen';
$lang['mediaroot'] = 'Wurzel';
$lang['mediaupload'] = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.';
-$lang['mediaextchange'] = 'Dateiendung von .%s nach .%s geändert!';
-$lang['reference'] = 'Referenzen für';
+$lang['mediaextchange'] = 'Dateiendung vom .%s nach .%s geändert!';
+$lang['reference'] = 'Verwendung von';
$lang['ref_inuse'] = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
$lang['ref_hidden'] = 'Einige Verweise sind auf Seiten, für die du keine Leseberechtigung hast.';
$lang['hits'] = 'Treffer';
@@ -153,13 +153,13 @@ $lang['youarehere'] = 'Du befindest dich hier';
$lang['lastmod'] = 'Zuletzt geändert';
$lang['by'] = 'von';
$lang['deleted'] = 'gelöscht';
-$lang['created'] = 'erstellt';
+$lang['created'] = 'angelegt';
$lang['restored'] = 'alte Version wieder hergestellt';
$lang['external_edit'] = 'Externe Bearbeitung';
-$lang['summary'] = 'Zusammenfassung der Änderungen';
-$lang['noflash'] = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Ihnalt anzuzeigen.';
+$lang['summary'] = 'Zusammenfassung';
+$lang['noflash'] = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.';
$lang['download'] = 'Download-Teil';
-$lang['mail_newpage'] = 'Seite hinzugefügt:';
+$lang['mail_newpage'] = 'Neue Seite:';
$lang['mail_changed'] = 'Seite geaendert:';
$lang['mail_new_user'] = 'Neuer Benutzer:';
$lang['mail_upload'] = 'Datei hochgeladen:';
@@ -187,8 +187,8 @@ $lang['qb_media'] = 'Bilder und andere Dateien hinzufügen';
$lang['qb_sig'] = 'Unterschrift einfügen';
$lang['qb_smileys'] = 'Smileys';
$lang['qb_chars'] = 'Sonderzeichen';
-$lang['upperns'] = 'Springe zum vorherigen Namensraum';
-$lang['admin_register'] = 'Neuen Benutzer hinzufügen';
+$lang['upperns'] = 'Gehe zum Ausgangsfeld';
+$lang['admin_register'] = 'Neuen Benutzer anmelden';
$lang['metaedit'] = 'Metadaten bearbeiten';
$lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden';
$lang['metasaveok'] = 'Metadaten gesichert';
@@ -198,7 +198,7 @@ $lang['img_caption'] = 'Bildunterschrift';
$lang['img_date'] = 'Datum';
$lang['img_fname'] = 'Dateiname';
$lang['img_fsize'] = 'Grösse';
-$lang['img_artist'] = 'FotografIn';
+$lang['img_artist'] = 'Fotograf';
$lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Format';
$lang['img_camera'] = 'Kamera';
@@ -216,7 +216,7 @@ $lang['i_wikiname'] = 'Wiki-Name';
$lang['i_enableacl'] = 'Zugangskontrolle (ACL) aktivieren (empfohlen)';
$lang['i_superuser'] = 'Administrator Benutzername';
$lang['i_problems'] = 'Das Installationsprogramm hat unten aufgeführte Probleme festgestellt, die zunächst behoben werden müssen, bevor du mit der Installation fortfahren kannst.';
-$lang['i_modified'] = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki-Installation. Du solltest entweder alle Dateien erneut installieren oder in der <a href="http://dokuwiki.org/install">Dokuwiki-Installationsanleitung</a> lesen.';
+$lang['i_modified'] = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki-Installation. Du solltest entweder alle Dateien noch einmal frisch installieren oder die <a href="http://dokuwiki.org/install">Dokuwiki-Installationsanleitung</a> konsultieren.';
$lang['i_funcna'] = 'Die PHP Funktion <code>%s</code> ist nicht verfügbar. Unter Umständen wurde sie von deinem Hoster deaktiviert?';
$lang['i_phpver'] = 'Deine PHP-Version <code>%s</code> ist niedriger als die benötigte Version <code>%s</code>. Bitte aktualisiere deine PHP-Installation.';
$lang['i_permfail'] = '<code>%s</code> ist nicht durch DokuWiki beschreibbar. Du musst die Berechtigungen dieses Ordners ändern!';
@@ -248,10 +248,3 @@ $lang['mu_filetypes'] = 'Erlaubte Dateitypen';
$lang['mu_info'] = 'Dateien hochgeladen.';
$lang['mu_lasterr'] = 'Letzter Fehler:';
$lang['recent_global'] = 'Im Moment siehst du die Änderungen im Namensraum <b>%s</b>. Du kannst auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
-$lang['years'] = 'vor %d Jahren';
-$lang['months'] = 'vor %d Monaten';
-$lang['weeks'] = 'vor %d Wochen';
-$lang['days'] = 'vor %d Tagen';
-$lang['hours'] = 'vor %d Stunden';
-$lang['minutes'] = 'vor %d Minuten';
-$lang['seconds'] = 'vor %d Sekunden';
diff --git a/inc/lang/de-informal/mailtext.txt b/inc/lang/de-informal/mailtext.txt
index 4fd41ad19..508c080f7 100644
--- a/inc/lang/de-informal/mailtext.txt
+++ b/inc/lang/de-informal/mailtext.txt
@@ -13,5 +13,6 @@ Benutzer : @USER@
--
-Diese Mail kommt vom DokuWiki auf
+Diese Mail wurde vom DokuWiki auf
@DOKUWIKIURL@
+erzeugt.
diff --git a/inc/lang/de-informal/password.txt b/inc/lang/de-informal/password.txt
index 9e1ecdb15..8ce252966 100644
--- a/inc/lang/de-informal/password.txt
+++ b/inc/lang/de-informal/password.txt
@@ -6,5 +6,6 @@ Benutzername: @LOGIN@
Passwort : @PASSWORD@
--
-Diese Mail kommt vom DokuWiki auf
+Diese Mail wurde vom DokuWiki auf
@DOKUWIKIURL@
+erzeugt. \ No newline at end of file
diff --git a/inc/lang/de-informal/pwconfirm.txt b/inc/lang/de-informal/pwconfirm.txt
index 538597cfa..5e5572b28 100644
--- a/inc/lang/de-informal/pwconfirm.txt
+++ b/inc/lang/de-informal/pwconfirm.txt
@@ -12,5 +12,6 @@ Bestätigungslink.
@CONFIRM@
--
-Diese Mail kommt vom DokuWiki auf
+Diese Mail wurde vom DokuWiki auf
@DOKUWIKIURL@
+erzeugt.
diff --git a/inc/lang/de-informal/uploadmail.txt b/inc/lang/de-informal/uploadmail.txt
index 72e4a2a6e..7239cc10c 100644
--- a/inc/lang/de-informal/uploadmail.txt
+++ b/inc/lang/de-informal/uploadmail.txt
@@ -10,5 +10,6 @@ MIME-Typ : @MIME@
Benutzer : @USER@
--
-Diese Mail kommt vom DokuWiki auf
+Diese Mail wurde vom DokuWiki auf
@DOKUWIKIURL@
+erzeugt.
diff --git a/inc/lang/de-informal/wordblock.txt b/inc/lang/de-informal/wordblock.txt
deleted file mode 100644
index cb3e4c06a..000000000
--- a/inc/lang/de-informal/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM blockiert ======
-
-Deine Änderungen wurden nicht gespeichert, da sie ein oder mehrere nicht erlaubte Wörter enthielten. Falls du versucht haben solltest, das Wiki zu Spammen -- Schande über ich! Wenn du glaubst, dass der Eintrag zu Unrecht blockiert wurde, kontaktiere bitte den Administrator des Wikis.
-
diff --git a/inc/lang/de/backlinks.txt b/inc/lang/de/backlinks.txt
index aae4c5582..b797b0003 100644
--- a/inc/lang/de/backlinks.txt
+++ b/inc/lang/de/backlinks.txt
@@ -1,4 +1,4 @@
-====== Backlinks ======
+====== Links hierher ======
Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken.
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 9f426c2dc..e61a95bce 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -273,3 +273,6 @@ $lang['days'] = 'vor %d Tagen';
$lang['hours'] = 'vor %d Stunden';
$lang['minutes'] = 'vor %d Minuten';
$lang['seconds'] = 'vor %d Sekunden';
+
+$lang['wordblock'] = 'Deine Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
+
diff --git a/inc/lang/de/subscr_digest.txt b/inc/lang/de/subscr_digest.txt
index 9c42541a4..c8bf770ee 100644
--- a/inc/lang/de/subscr_digest.txt
+++ b/inc/lang/de/subscr_digest.txt
@@ -10,10 +10,10 @@ Das sind die Änderungen:
Alte Revision: @OLDPAGE@
Neue Revision: @NEWPAGE@
-Um das Abonnement für diese Seite aufzulösen, melde Sie sich im Wiki an
+Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an
@DOKUWIKIURL@, besuchen dann
@SUBSCRIBE@
-und klicken auf die Taste 'Änderungen abbestellen'.
+und klicken auf den Link 'Änderungen abbestellen'.
--
Diese Mail kommt vom DokuWiki auf
diff --git a/inc/lang/de/wordblock.txt b/inc/lang/de/wordblock.txt
deleted file mode 100644
index 14622ebc2..000000000
--- a/inc/lang/de/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM blockiert ======
-
-Ihre Änderungen wurden nicht gespeichert, da sie ein oder mehrere nicht erlaubte Wörter enthielten. Falls Sie versucht haben sollten, das Wiki zu Spammen -- Schande über Sie! Wenn Sie glauben, dass der Eintrag zu Unrecht blockiert wurde, kontaktieren Sie bitte den Administrator des Wikis.
-
diff --git a/inc/lang/el/wordblock.txt b/inc/lang/el/wordblock.txt
deleted file mode 100644
index b54e8ef77..000000000
--- a/inc/lang/el/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Εντοπίστηκε SPAM ======
-
-Οι αλλαγές σας **δεν** αποθηκεύτηκαν επειδή βρέθηκε τουλάχιστον μία μη αποδεκτή λέξη. Εάν προσπαθήσατε να προσθέσετε spam σε αυτό το wiki -- κακώς! Εάν πιστεύετε ότι αυτό δεν είναι σωστό, απευθυνθείτε στον διαχειριστή της εφαρμογής.
-
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 98ded12ca..d85ceb3db 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -129,6 +129,28 @@ $lang['mediaroot'] = 'root';
$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons.';
$lang['mediaextchange'] = 'Filextension changed from .%s to .%s!';
+$lang['js']['mediatitle'] = 'Link settings';
+$lang['js']['mediadisplay'] = 'Link type';
+$lang['js']['mediaalign'] = 'Alignment';
+$lang['js']['mediasize'] = 'Image size';
+$lang['js']['mediatarget'] = 'Link target';
+$lang['js']['mediaclose'] = 'Close';
+$lang['js']['mediainsert'] = 'Insert';
+$lang['js']['mediadisplayimg'] = 'Show the image.';
+$lang['js']['mediadisplaylnk'] = 'Show only the link.';
+$lang['js']['mediasmall'] = 'Small version';
+$lang['js']['mediamedium'] = 'Medium version';
+$lang['js']['medialarge'] = 'Large version';
+$lang['js']['mediaoriginal'] = 'Original version';
+$lang['js']['medialnk'] = 'Link to detail page';
+$lang['js']['mediadirect'] = 'Direct link to original';
+$lang['js']['medianolnk'] = 'No link';
+$lang['js']['medianolink'] = 'Do not link the image';
+$lang['js']['medialeft'] = 'Align the image on the left.';
+$lang['js']['mediaright'] = 'Align the image on the right.';
+$lang['js']['mediacenter'] = 'Align the image in the middle.';
+$lang['js']['medianoalign'] = 'Use no align.';
+
$lang['reference'] = 'References for';
$lang['ref_inuse'] = 'The file can\'t be deleted, because it\'s still used by the following pages:';
$lang['ref_hidden'] = 'Some references are on pages you don\'t have permission to read';
@@ -288,4 +310,7 @@ $lang['hours'] = '%d hours ago';
$lang['minutes'] = '%d minutes ago';
$lang['seconds'] = '%d seconds ago';
+$lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
+
+
//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/en/wordblock.txt b/inc/lang/en/wordblock.txt
deleted file mode 100644
index f0f7d759d..000000000
--- a/inc/lang/en/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM blocked ======
-
-Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
-
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 14cfea2d0..c03618a0e 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -46,9 +46,6 @@ $lang['btn_back'] = 'Retroiri';
$lang['btn_backlink'] = 'Retroligoj';
$lang['btn_backtomedia'] = 'Retroiri al elekto de dosiero';
$lang['btn_subscribe'] = 'Aliĝi al paĝaj modifoj';
-$lang['btn_unsubscribe'] = 'Malaliĝi al paĝaj modifoj';
-$lang['btn_subscribens'] = 'Aliĝi al nomspacaj modifoj';
-$lang['btn_unsubscribens'] = 'Malaliĝi al nomspacaj modifoj';
$lang['btn_profile'] = 'Ĝisdatigi profilon';
$lang['btn_reset'] = 'Rekomenci';
$lang['btn_resendpwd'] = 'Sendi novan pasvorton';
@@ -158,6 +155,7 @@ $lang['noflash'] = 'La <a href="http://www.adobe.com/products/flas
$lang['download'] = 'Elŝuti eltiraĵon';
$lang['mail_newpage'] = 'paĝo aldonita:';
$lang['mail_changed'] = 'paĝo modifita:';
+$lang['mail_subscribe_list'] = 'ŝanĝitaj paĝoj en nomspaco:';
$lang['mail_new_user'] = 'Nova uzanto:';
$lang['mail_upload'] = 'dosiero alŝutita:';
$lang['qb_bold'] = 'Dika teksto';
@@ -200,11 +198,22 @@ $lang['img_copyr'] = 'Kopirajtoj';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Kamerao';
$lang['img_keywords'] = 'Ŝlosilvortoj';
-$lang['subscribe_success'] = '%s estis aldonita al dissendolisto por %s';
-$lang['subscribe_error'] = 'Estas eraro je aldono de %s al dissendolisto por %s';
-$lang['subscribe_noaddress'] = 'Estas neniu retadreso asociita al via identiĝ-nomo, do vi ne povas esti aldonata al la dissendolisto.';
-$lang['unsubscribe_success'] = '%s estas forigita de la dissendolisto por %s';
-$lang['unsubscribe_error'] = 'Estas eraro je forigo de %s el dissendolisto por %s';
+$lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s';
+$lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s';
+$lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto';
+$lang['subscr_unsubscribe_success'] = 'Forigis %s de la abonlisto por %s';
+$lang['subscr_unsubscribe_error'] = 'Eraro dum forigo de %s de la abonlisto por %s';
+$lang['subscr_already_subscribed'] = '%s jam estas abonanta al %s';
+$lang['subscr_not_subscribed'] = '%s ne abonas al %s';
+$lang['subscr_m_not_subscribed'] = 'Momente vi ne abonas la aktualan paĝon aŭ nomspacon.';
+$lang['subscr_m_new_header'] = 'Aldoni abonon';
+$lang['subscr_m_current_header'] = 'Momentaj abonoj';
+$lang['subscr_m_unsubscribe'] = 'Malaboni';
+$lang['subscr_m_subscribe'] = 'Aboni';
+$lang['subscr_m_receive'] = 'Ricevi';
+$lang['subscr_style_every'] = 'retpoŝtaĵo pro ĉiu ŝanĝo';
+$lang['subscr_style_digest'] = 'kolekta retpoŝtaĵo de ŝanĝoj por ĉiu paĝo';
+$lang['subscr_style_list'] = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo';
$lang['authmodfailed'] = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.';
$lang['authtempfail'] = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
$lang['i_chooselang'] = 'Elektu vian lingvon';
diff --git a/inc/lang/eo/subscr_digest.txt b/inc/lang/eo/subscr_digest.txt
new file mode 100644
index 000000000..d6bc69887
--- /dev/null
+++ b/inc/lang/eo/subscr_digest.txt
@@ -0,0 +1,20 @@
+Saluton!
+
+La paĝo @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen sekvas la ŝanĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Malnova versio: @OLDPAGE@
+Nova versio: @NEWPAGE@
+
+Por nuligi la paĝinformojn, ensalutu la vikion ĉe
+@DOKUWIKIURL@, poste iru al
+@SUBSCRIBE@
+kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
+
+--
+Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/eo/subscr_form.txt b/inc/lang/eo/subscr_form.txt
new file mode 100644
index 000000000..259b21045
--- /dev/null
+++ b/inc/lang/eo/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abona administrado ======
+
+Tiu paĝo lasas vin administri viajn abonojn por la aktualaj paĝo kaj nomspaco. \ No newline at end of file
diff --git a/inc/lang/eo/subscr_list.txt b/inc/lang/eo/subscr_list.txt
new file mode 100644
index 000000000..175e3f3d2
--- /dev/null
+++ b/inc/lang/eo/subscr_list.txt
@@ -0,0 +1,17 @@
+Saluton!
+
+Paĝoj en la nomspaco @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen sekvas la ŝanĝitaj paĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Por nuligi la paĝinformojn, ensalutu la vikion ĉe
+@DOKUWIKIURL@, poste iru al
+@SUBSCRIBE@
+kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
+
+--
+Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/eo/subscr_single.txt b/inc/lang/eo/subscr_single.txt
new file mode 100644
index 000000000..a1f483570
--- /dev/null
+++ b/inc/lang/eo/subscr_single.txt
@@ -0,0 +1,23 @@
+Saluton!
+
+La paĝo @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen sekvas la ŝanĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Uzanto : @USER@
+Modifa resumo: @SUMMARY@
+Malnova versio: @OLDPAGE@
+Nova versio: @NEWPAGE@
+
+Por nuligi la paĝinformojn, ensalutu la vikion ĉe
+@DOKUWIKIURL@, poste iru al
+@NEWPAGE@
+kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
+
+--
+Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/eo/wordblock.txt b/inc/lang/eo/wordblock.txt
deleted file mode 100644
index 64bb19e5c..000000000
--- a/inc/lang/eo/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAMO estis blokita ======
-
-Viaj redaktoj ne estas konservitaj, ĉar en la teksto estis trovitaj unu aŭ kelkaj malpermesindaj vortoj, ŝajnante spamo. Se vi pensas, ke tio estas eraro, bonvolu kontakti la administranton de la vikio. \ No newline at end of file
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 9d4995c52..2d473484d 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -22,6 +22,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -55,9 +56,6 @@ $lang['btn_back'] = 'Atrás';
$lang['btn_backlink'] = 'Enlaces anteriores';
$lang['btn_backtomedia'] = 'Volver a la selección de archivos multimedia';
$lang['btn_subscribe'] = 'Suscribirse a cambios de la página';
-$lang['btn_unsubscribe'] = 'Cancelar suscripción a cambios de la página';
-$lang['btn_subscribens'] = 'Suscribirse a cambios del espacio de nombres';
-$lang['btn_unsubscribens'] = 'Cancelar suscripción a cambios del espacio de nombres';
$lang['btn_profile'] = 'Actualizar perfil';
$lang['btn_reset'] = 'Restablecer';
$lang['btn_resendpwd'] = 'Enviar nueva contraseña';
@@ -167,6 +165,7 @@ $lang['noflash'] = 'Para mostrar este contenido es necesario el <a
$lang['download'] = 'Descargar trozo de código fuente';
$lang['mail_newpage'] = 'página añadida:';
$lang['mail_changed'] = 'página cambiada:';
+$lang['mail_subscribe_list'] = 'páginas cambiadas en el espacio de nombre:';
$lang['mail_new_user'] = 'nuevo usuario:';
$lang['mail_upload'] = 'archivo subido:';
$lang['qb_bold'] = 'Negrita';
@@ -209,11 +208,22 @@ $lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Cámara';
$lang['img_keywords'] = 'Palabras claves';
-$lang['subscribe_success'] = '%s ha sido añadido a la lista de notificación de cambios de %s';
-$lang['subscribe_error'] = 'Ha habido un error al agregar %s a la lista de notificación de cambios de %s';
-$lang['subscribe_noaddress'] = 'No hay ninguna dirección de correo electrónico asociada con tu nombre de usuario, no puedes ser añadido a la lista de notificación de cambios';
-$lang['unsubscribe_success'] = '%s ha sido eliminado de la lista de notificación de cambios de %s';
-$lang['unsubscribe_error'] = 'Ha habido un error al eliminar %s de la lista de notificación de cambios de %s';
+$lang['subscr_subscribe_success'] = 'Se agregó %s a las listas de suscripción para %s';
+$lang['subscr_subscribe_error'] = 'Error al agregar %s a las listas de suscripción para %s';
+$lang['subscr_subscribe_noaddress'] = 'No hay dirección asociada con tu registro, no se puede agregarte a la lista de suscripción';
+$lang['subscr_unsubscribe_success'] = 'Removido %s de la lista de suscripción para %s';
+$lang['subscr_unsubscribe_error'] = 'Error al remover %s de la lista de suscripción para %s';
+$lang['subscr_already_subscribed'] = '%s ya está suscrito a %s';
+$lang['subscr_not_subscribed'] = '%s no está suscrito a %s';
+$lang['subscr_m_not_subscribed'] = 'Actualmente no te encuentras suscrito a esta página o espacio de nombres';
+$lang['subscr_m_new_header'] = 'Agregar suscripción';
+$lang['subscr_m_current_header'] = 'Suscripciones actuales';
+$lang['subscr_m_unsubscribe'] = 'Darse de baja';
+$lang['subscr_m_subscribe'] = 'Suscribirse';
+$lang['subscr_m_receive'] = 'Recibir';
+$lang['subscr_style_every'] = 'enviar correo en cada cambio';
+$lang['subscr_style_digest'] = 'recopilar correo de cambios por cada página';
+$lang['subscr_style_list'] = 'lista de páginas con cambios desde el último correo';
$lang['authmodfailed'] = 'Está mal configurada la autenticación de usuarios. Por favor, avisa al administrador del wiki.';
$lang['authtempfail'] = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor avisa al administrador del wiki.';
$lang['i_chooselang'] = 'Elija su idioma';
diff --git a/inc/lang/es/subscr_digest.txt b/inc/lang/es/subscr_digest.txt
new file mode 100644
index 000000000..df03fcafc
--- /dev/null
+++ b/inc/lang/es/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hola!
+
+La página @PAGE@ en @TITLE@ wiki ha cambiado.
+Estos son los cambios:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Revisión Anterior: @OLDPAGE@
+Revisión Nueva: @NEWPAGE@
+
+Para cancelar la página de notificaciones, entra a la wiki en
+@DOKUWIKIURL@ luego visita
+@SUBSCRIBE@
+y date de baja en la página y/o cambios en el espacio de nombre.
+
+--
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/es/subscr_form.txt b/inc/lang/es/subscr_form.txt
new file mode 100644
index 000000000..3a8143c39
--- /dev/null
+++ b/inc/lang/es/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Administrador de Suscripciones ======
+
+Esta página te permite administrar tus suscripciones para la página actual y espacio de nombres. \ No newline at end of file
diff --git a/inc/lang/es/subscr_list.txt b/inc/lang/es/subscr_list.txt
new file mode 100644
index 000000000..80e8dc8a1
--- /dev/null
+++ b/inc/lang/es/subscr_list.txt
@@ -0,0 +1,17 @@
+Hola!
+
+Las páginas en el espacio de nombres @PAGE@ en @TITLE@ wiki ha cambiado.
+Estos son los cambios:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para cancelar la página de notificaciones, entra a la wiki en
+@DOKUWIKIURL@ luego visita
+@SUBSCRIBE@
+y date de baja en la página y/o cambios en el espacio de nombre.
+
+--
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/es/subscr_single.txt b/inc/lang/es/subscr_single.txt
new file mode 100644
index 000000000..e2a54c79f
--- /dev/null
+++ b/inc/lang/es/subscr_single.txt
@@ -0,0 +1,23 @@
+Hola!
+
+La página @PAGE@ en @TITLE@ wiki ha cambiado.
+Estos son los cambioss:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Fecha : @DATE@
+Usuario : @USER@
+Resúmen de edición: @SUMMARY@
+Revisión Anterior: @OLDPAGE@
+Nueva Revisión: @NEWPAGE@
+
+Para cancelar la página de notificaciones, entra a la wiki en
+@DOKUWIKIURL@ luego visita
+@SUBSCRIBE@
+y date de baja en la página y/o cambios en el espacio de nombre.
+
+--
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/es/wordblock.txt b/inc/lang/es/wordblock.txt
deleted file mode 100644
index 739a1b76b..000000000
--- a/inc/lang/es/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM bloqueado ======
-
-Tus cambios **no** se han guardado porque contienen una o más palabras prohibidas. Si has intentado spamear el Wiki: ¡Perro malo! Si crees que es un error contacta con el administrador de este Wiki.
-
diff --git a/inc/lang/et/wordblock.txt b/inc/lang/et/wordblock.txt
deleted file mode 100644
index 65d0d6ac3..000000000
--- a/inc/lang/et/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPÄMM blokeeritud ======
-
-Sinu muutusi kahjuks **ei** salvestatud kuna tekst sisaldab ühte või rohkem blokeeritud sõna. Kas Sa üritad Wikile spämmi saata -- oh sa põrsas! Kui aga arvad, et tegemist on eksitusega, siis suhtle Wiki administraatoriga.
-
diff --git a/inc/lang/eu/wordblock.txt b/inc/lang/eu/wordblock.txt
deleted file mode 100644
index 0af3fb26c..000000000
--- a/inc/lang/eu/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAMaren aurkako babesa ======
-
-Zure aldaketak **ez** dira gorde aurrez debekatutako hitzak erabili dituzulako. Wiki-a spammeatzen saitu bazara... -- Aiss osobuko! (VS). Hau akats bat dela uste baduzu jarri arremanetan Wiki-aren administratzailearekin.
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 1123efe13..42ba69ea3 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -46,9 +46,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'] = 'یک گذرواژه‌ی جدید برای شما فرستاده شود';
@@ -156,8 +153,10 @@ $lang['external_edit'] = 'ویرایش خارجی';
$lang['summary'] = 'پیش‌نمایش';
$lang['noflash'] = 'برای نمایش محتویات <a href="http://www.adobe.com/products/flashplayer/">افزونه‌ی فلش</a> مورد نیاز است.';
$lang['download'] = 'دیافت فایل منقطع گردید';
+$lang['table_edit_title'] = 'جدول';
$lang['mail_newpage'] = 'صفحه اضافه شد:';
$lang['mail_changed'] = 'صفحه تغییر داده شد:';
+$lang['mail_subscribe_list'] = 'صفحات تغییر داده شده در فضای‌نام';
$lang['mail_new_user'] = 'کاربر جدید:';
$lang['mail_upload'] = 'فایل ارسال شده:';
$lang['qb_bold'] = 'متن پُررنگ';
@@ -200,11 +199,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'] = 'ارسال ایمیل‌های فشرده برای تغییرات هر صفحه';
+$lang['subscr_style_list'] = 'لیست صفحات تغییر داده شده از آخرین رای‌نامه';
$lang['authmodfailed'] = 'اشکال در نوع معتبرسازی کاربران، مدیر ویکی را باخبر سازید.';
$lang['authtempfail'] = 'معتبرسازی کابران موقتن مسدود می‌باشد. اگر این حالت پایدار بود، مدیر ویکی را باخبر سازید.';
$lang['i_chooselang'] = 'انتخاب زبان';
diff --git a/inc/lang/fa/wordblock.txt b/inc/lang/fa/wordblock.txt
deleted file mode 100644
index a78c86f06..000000000
--- a/inc/lang/fa/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== اسپم مسدود شد ======
-
-این تغییرات ذخیره **نمی‌شود**، چون چند کلمه از کلمه‌های مسدود شده در آن یافت شده است. اگر فکر می‌کنید که نباید این اتفاق می‌افتاد با مدیر سیستم تماس بگیرید. \ No newline at end of file
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 6ef19ee8e..5af172fb3 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -41,9 +41,6 @@ $lang['btn_back'] = 'Takaisin';
$lang['btn_backlink'] = 'Paluulinkit';
$lang['btn_backtomedia'] = 'Takaisin mediatiedostojen valintaan';
$lang['btn_subscribe'] = 'Tilaa muutokset';
-$lang['btn_unsubscribe'] = 'Lopeta muutosten tilaus';
-$lang['btn_subscribens'] = 'Tilaa nimiavaruuden muutokset';
-$lang['btn_unsubscribens'] = 'Lopeta nimiavaruuden muutosten tilaus';
$lang['btn_profile'] = 'Päivitä profiili';
$lang['btn_reset'] = 'Tyhjennä';
$lang['btn_resendpwd'] = 'Lähetä uusi salasana';
@@ -153,6 +150,7 @@ $lang['noflash'] = 'Tarvitset <a href="http://www.adobe.com/produc
$lang['download'] = 'Lataa palanen';
$lang['mail_newpage'] = 'sivu lisätty:';
$lang['mail_changed'] = 'sivu muutettu:';
+$lang['mail_subscribe_list'] = 'muuttuneet sivut nimiavaruudessa:';
$lang['mail_new_user'] = 'uusi käyttäjä:';
$lang['mail_upload'] = 'tiedosto lähetetty:';
$lang['qb_bold'] = 'Lihavoitu teksti';
@@ -195,11 +193,22 @@ $lang['img_copyr'] = 'Tekijänoikeus';
$lang['img_format'] = 'Formaatti';
$lang['img_camera'] = 'Kamera';
$lang['img_keywords'] = 'Avainsanat';
-$lang['subscribe_success'] = '%s lisättiin käyttäjän %s seurattavien listaan';
-$lang['subscribe_error'] = 'Lisättäessä %s käyttäjän %s seurattavien listaan tapahtui virhe';
-$lang['subscribe_noaddress'] = 'Käyttäjänimelle ei löydy osoitetta. Seurattavien listaan lisääminen ei onnistu.';
-$lang['unsubscribe_success'] = '%s poistettiin käyttäjän %s seurattavien listasta';
-$lang['unsubscribe_error'] = 'Poistettaessa %s käyttäjän %s seurattavien listasta tapahtui virhe';
+$lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
+$lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
+$lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
+$lang['subscr_unsubscribe_success'] = '% poistettu tilauslistalta %s';
+$lang['subscr_unsubscribe_error'] = 'Virhe tapahtui poistaessa %s tilauslistalta %s';
+$lang['subscr_already_subscribed'] = '%s on jo tilannut %s';
+$lang['subscr_not_subscribed'] = '%s ei ole tilannut %s';
+$lang['subscr_m_not_subscribed'] = 'Et ole tilannut sivua tai nimiavaruutta';
+$lang['subscr_m_new_header'] = 'Lisää tilaus';
+$lang['subscr_m_current_header'] = 'Voimassaolevat tilaukset';
+$lang['subscr_m_unsubscribe'] = 'Poista tilaus';
+$lang['subscr_m_subscribe'] = 'Tilaa';
+$lang['subscr_m_receive'] = 'Vastaanota';
+$lang['subscr_style_every'] = 'Sähköposti joka muutoksesta';
+$lang['subscr_style_digest'] = 'yhteenveto sähköposti joka sivusta';
+$lang['subscr_style_list'] = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen';
$lang['authmodfailed'] = 'Käyttäjien autentikoinnin asetukset ovat virheelliset. Ilmoita asiasta wikin ylläpitäjälle.';
$lang['authtempfail'] = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.';
$lang['i_chooselang'] = 'Valitse kieli';
diff --git a/inc/lang/fi/mailtext.txt b/inc/lang/fi/mailtext.txt
index 0a953cb87..1808ebc38 100644
--- a/inc/lang/fi/mailtext.txt
+++ b/inc/lang/fi/mailtext.txt
@@ -13,5 +13,5 @@ Käyttäjä : @USER@
--
-Tämän postin generoi DokuWiki
-@DOKUWIKIURL@
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fi/password.txt b/inc/lang/fi/password.txt
index 3c83d1efd..51e16046c 100644
--- a/inc/lang/fi/password.txt
+++ b/inc/lang/fi/password.txt
@@ -6,5 +6,5 @@ Käyttäjätunnus : @LOGIN@
Salasana : @PASSWORD@
--
-Tämän postin generoi DokuWiki
-@DOKUWIKIURL@
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fi/pwconfirm.txt b/inc/lang/fi/pwconfirm.txt
index d134943f0..e552f5cdc 100644
--- a/inc/lang/fi/pwconfirm.txt
+++ b/inc/lang/fi/pwconfirm.txt
@@ -9,5 +9,5 @@ Käytä alla olevaa linkkiä vahvistaaksesi, että pyynnön lähettäjä todella
@CONFIRM@
--
-Tämän postin generoi DokuWiki
+Tämän postin loi DokuWiki
@DOKUWIKIURL@
diff --git a/inc/lang/fi/registermail.txt b/inc/lang/fi/registermail.txt
index 78d73f63d..c276873f0 100644
--- a/inc/lang/fi/registermail.txt
+++ b/inc/lang/fi/registermail.txt
@@ -10,5 +10,5 @@ IP-osoite : @IPADDRESS@
Hostname : @HOSTNAME@
--
-Tämän postin generoi DokuWiki osoitteessa
+Tämän postin loi DokuWiki osoitteessa
@DOKUWIKIURL@
diff --git a/inc/lang/fi/subscr_digest.txt b/inc/lang/fi/subscr_digest.txt
new file mode 100644
index 000000000..466484486
--- /dev/null
+++ b/inc/lang/fi/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hei!
+
+Sivu @PAGE@ wikissä @TITLE@ on muuttunut.
+Tässä ovat muutokset:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vanha versio: @OLDPAGE@
+Uusi versio: @NEWPAGE@
+
+Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ , jonka jälkeen katso
+@SUBSCRIBE@
+ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
+
+--
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fi/subscr_form.txt b/inc/lang/fi/subscr_form.txt
new file mode 100644
index 000000000..70f2fdeb5
--- /dev/null
+++ b/inc/lang/fi/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Tilausten hallinta ======
+
+Tämä sivu avulla voit hallita silauksiasi nykyiseltä sivulta ja nimiavaruudelta. \ No newline at end of file
diff --git a/inc/lang/fi/subscr_list.txt b/inc/lang/fi/subscr_list.txt
new file mode 100644
index 000000000..47ee1b155
--- /dev/null
+++ b/inc/lang/fi/subscr_list.txt
@@ -0,0 +1,18 @@
+Hei!
+
+Sivut nimiavaruudessa @PAGE@ wikissä @TITLE@ ovat muuttuneet.
+Tässä ovat muuttuneet sivut:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ , jonka jälkeen katso
+@SUBSCRIBE@
+ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
+
+
+--
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fi/subscr_single.txt b/inc/lang/fi/subscr_single.txt
new file mode 100644
index 000000000..0fd83e266
--- /dev/null
+++ b/inc/lang/fi/subscr_single.txt
@@ -0,0 +1,23 @@
+Hei!
+
+Sivu @PAGE@ wikissä @TITLE@ on muuttunut.
+Tässä ovat muutokset:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Päivä : @DATE@
+Käyttäjä : @USER@
+Yhteenveto: @SUMMARY@
+Vanha versio: @OLDPAGE@
+Uusi versio: @NEWPAGE@
+
+Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ , jonka jälkeen katso
+@SUBSCRIBE@
+ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
+
+--
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
diff --git a/inc/lang/fi/uploadmail.txt b/inc/lang/fi/uploadmail.txt
index 7a5ea49ed..0c116a78b 100644
--- a/inc/lang/fi/uploadmail.txt
+++ b/inc/lang/fi/uploadmail.txt
@@ -10,5 +10,5 @@ MIME Type : @MIME@
Käyttäjä : @USER@
--
-Tämän postin generoi DokuWiki osoitteessa
+Tämän postin loi DokuWiki osoitteessa
@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fi/wordblock.txt b/inc/lang/fi/wordblock.txt
deleted file mode 100644
index 4e416c68c..000000000
--- a/inc/lang/fi/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== Roskaposti torjuttu ======
-
-Muutoksiasi **ei** talletettu, koska ne pitivät sisällään yhden tai useampia epäkelpoja sanoja. Jos yritit spämmätä Wikiä, häpeä! Jos pidät tätä virheenä ota yhteyttä wikin ylläpitäjään.
diff --git a/inc/lang/fo/wordblock.txt b/inc/lang/fo/wordblock.txt
deleted file mode 100644
index f3a9b9dcd..000000000
--- a/inc/lang/fo/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAM banning ======
-
-Tínar broytingar vóru **ikki** goymdar av tí at tær innihalda eitt ella fleiri óynskt orð. Fá vinarliga samband við admin, um tú heldur at hetta er eitt brek.
diff --git a/inc/lang/fr/conflict.txt b/inc/lang/fr/conflict.txt
index 0cb0a67fb..8f527ee21 100644
--- a/inc/lang/fr/conflict.txt
+++ b/inc/lang/fr/conflict.txt
@@ -1,6 +1,6 @@
====== Une version plus récente existe déjà ======
-Une version plus récente du document que vous avez édité existe déjà. Cela se produit lorsqu'un autre utilisateur enregistre le document pendant que vous l'éditez.
+Une version plus récente du document que vous avez modifié existe déjà. Cela se produit lorsqu'un autre utilisateur enregistre le document pendant que vous le modifiez.
-Examinez attentivement les différences ci-dessous, et décidez quelle version conserver. Si vous choisissez ''Enregistrer'', votre version sera enregistrée. Cliquez sur ''Annuler'' pour conserver la version actuelle.
+Examinez attentivement les différences ci-dessous et décidez quelle version conserver. Si vous choisissez « Enregistrer », votre version sera enregistrée. Cliquez sur « Annuler » pour conserver la version actuelle.
diff --git a/inc/lang/fr/draft.txt b/inc/lang/fr/draft.txt
index fbc1609a8..a48554298 100644
--- a/inc/lang/fr/draft.txt
+++ b/inc/lang/fr/draft.txt
@@ -1,6 +1,6 @@
====== Un fichier brouillon a été trouvé ======
-La dernière édition de cette page ne s'est pas terminée proprement. Dokuwiki a enregistré automatiquement un brouillon de votre travail que vous pouvez utiliser pour votre édition. Ci-dessous figurent les données enregistrées lors de votre dernière session.
+La dernière modification de cette page ne s'est pas terminée proprement. Dokuwiki a enregistré automatiquement un brouillon de votre travail que vous pouvez utiliser pour votre modification. Ci-dessous figurent les données enregistrées lors de votre dernière session.
-À vous de décider si vous souhaitez //récupérer// votre session d'édition passée, //supprimer// le brouillon enregistré automatiquement ou //annuler// le processus d'édition.
+À vous de décider si vous souhaitez //récupérer// votre session de modification passée, //supprimer// le brouillon enregistré automatiquement ou //annuler// le processus d'édition.
diff --git a/inc/lang/fr/edit.txt b/inc/lang/fr/edit.txt
index 71b0a7c1b..e30f1b78b 100644
--- a/inc/lang/fr/edit.txt
+++ b/inc/lang/fr/edit.txt
@@ -1,2 +1,2 @@
-Modifiez cette page et cliquez sur ''Enregistrer''. Voyez le [[wiki:syntax|Guide de la mise en page]] pour une aide à propos du format. Veuillez ne modifier cette page que si vous pouvez l'**améliorer**. Si vous souhaitez faire des tests, faites vos premiers pas dans le [[playground:playground|bac à sable]].
+Modifiez cette page et cliquez sur « Enregistrer ». Voyez le [[:wiki:syntax|guide de la mise en page]] pour une aide à propos du formatage. Veuillez ne modifier cette page que si vous pouvez l'**améliorer**. Si vous souhaitez faire des tests, faites vos premiers pas dans le [[:playground:playground|bac à sable]].
diff --git a/inc/lang/fr/editrev.txt b/inc/lang/fr/editrev.txt
index 1a7e0f434..d3fa36682 100644
--- a/inc/lang/fr/editrev.txt
+++ b/inc/lang/fr/editrev.txt
@@ -1,2 +1,2 @@
-**Vous affichez une ancienne révision du document !** Si vous l'enregistrez vous créerez une nouvelle version avec ce contenu.
+**Vous affichez une ancienne révision du document !** Si vous l'enregistrez, vous créerez une nouvelle version avec ce contenu.
----
diff --git a/inc/lang/fr/install.html b/inc/lang/fr/install.html
index a2c29d022..b057becfe 100644
--- a/inc/lang/fr/install.html
+++ b/inc/lang/fr/install.html
@@ -1,19 +1,13 @@
<p>Cette page vous assiste dans la premi&egrave;re installation et la
configuration de <a href="http://dokuwiki.org">DokuWiki</a>.
-Pour plus d'information sur cet installeur reportez vous &agrave; sa
+Pour plus d'information sur cet installeur, reportez-vous &agrave; sa
<a href="http://dokuwiki.org/installer">page de
documentation</a>.</p>
-<p>DokuWiki utilise des fichiers ordinaires pour stocker les pages du
+<p>DokuWiki utilise des fichiers textes ordinaires pour stocker les pages du
wiki et les autres informations associ&eacute;es &agrave; ces pages
-(tel que images, index de recherche, anciennes r&eacute;visions, etc). Pour fonctionner correctement DokuWiki <strong>doit</strong> avoir acc&egrave;s en &eacute;criture aux diff&eacute;rents r&eacute;pertoires qui contiennent ces fichiers. L'installeur n'est pas capable de modifier les permissions sur les r&eacute;pertoires. Ceci doit &ecirc;tre effectu&eacute; directement sur la ligne de commande de votre shell, ou, si vous &ecirc;tes h&eacute;berg&eacute;, via FTP ou votre panneau de contr&ocirc;le (tel que cPanel).</p>
+(tel que images, index de recherche, anciennes r&eacute;visions, etc.). Pour fonctionner correctement, DokuWiki <strong>doit</strong> avoir acc&egrave;s en &eacute;criture aux diff&eacute;rents r&eacute;pertoires qui contiennent ces fichiers. L'installeur n'est pas capable de modifier les permissions sur les r&eacute;pertoires. Ceci doit &ecirc;tre effectu&eacute; directement sur la ligne de commande de votre shell, ou, si vous &ecirc;tes h&eacute;berg&eacute;, <em>via</em> FTP ou votre panneau de contr&ocirc;le (tel que cPanel).</p>
-<p>Cet installeur va param&eacute;trer votre configuration de DokuWiki pour des <acronym title="access control list">ACL</acronym>, qui permettront l'acc&egrave;s &agrave; un login administrateur et l'acc&egrave;s au menu d'administration de DokuWiki pour l'ajout de modules externes, la gestion d'utilisateurs, la gestion de l'acc&egrave;s aux pages du wiki et les changements de param&egrave;tres de configuration. Il n'est pas n&eacute;cessaire au fonctionnement de DokuWiki, n&eacute;anmoins il facilite l'administration de DokuWiki.</p>
+<p>Cet installeur va param&eacute;trer votre configuration de DokuWiki pour des <acronym title="Access Control List - Liste de contrôle d'acc&egrave;s">ACL</acronym>, qui permettront l'acc&egrave;s &agrave; un identifiant administrateur et l'acc&egrave;s au menu d'administration de DokuWiki pour l'ajout de modules externes (greffons), la gestion d'utilisateurs, la gestion de l'acc&egrave;s aux pages du wiki et les modifications des param&egrave;tres de configuration. Il n'est pas n&eacute;cessaire au fonctionnement de DokuWiki, n&eacute;anmoins il facilite l'administration de DokuWiki.</p>
-<p>Les utilisateurs exp&eacute;riment&eacute;s ou ceux
-n&eacute;cessitant des param&eacute;trages particuliers devraient se
-reporter aux liens suivants pour les d&eacute;tails concernant les <a
-href="http://dokuwiki.org/install">instructions
-d'installation</a> et les <a
-href="http://dokuwiki.org/config">param&egrave;tres de
-configuration</a>.</p>
+<p>Les utilisateurs exp&eacute;riment&eacute;s ou ceux n&eacute;cessitant des param&eacute;trages particuliers devraient se reporter aux liens suivants pour les d&eacute;tails concernant les <a href="http://dokuwiki.org/install">instructions d'installation</a> et les <a href="http://dokuwiki.org/config">param&egrave;tres de configuration</a>.</p>
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 6a0f408b8..be55388bf 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -18,6 +18,8 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -25,8 +27,8 @@ $lang['doublequoteopening'] = '“';
$lang['doublequoteclosing'] = '”';
$lang['singlequoteopening'] = '‘';
$lang['singlequoteclosing'] = '’';
-$lang['apostrophe'] = '\'';
-$lang['btn_edit'] = 'Éditer cette page';
+$lang['apostrophe'] = '’';
+$lang['btn_edit'] = 'Modifier cette page';
$lang['btn_source'] = 'Afficher le texte source';
$lang['btn_show'] = 'Afficher la page';
$lang['btn_create'] = 'Créer cette page';
@@ -34,32 +36,29 @@ $lang['btn_search'] = 'Rechercher';
$lang['btn_save'] = 'Enregistrer';
$lang['btn_preview'] = 'Aperçu';
$lang['btn_top'] = 'Haut de page';
-$lang['btn_newer'] = '<< plus récent';
-$lang['btn_older'] = 'moins récent >>';
+$lang['btn_newer'] = '<< Plus récent';
+$lang['btn_older'] = 'Moins récent >>';
$lang['btn_revs'] = 'Anciennes révisions';
$lang['btn_recent'] = 'Derniers changements';
$lang['btn_upload'] = 'Envoyer';
$lang['btn_cancel'] = 'Annuler';
$lang['btn_index'] = 'Index';
-$lang['btn_secedit'] = 'Éditer';
+$lang['btn_secedit'] = 'Modifier';
$lang['btn_login'] = 'Connexion';
$lang['btn_logout'] = 'Déconnexion';
-$lang['btn_admin'] = 'Admin';
-$lang['btn_update'] = 'Rafraîchir';
+$lang['btn_admin'] = 'Administrer';
+$lang['btn_update'] = 'Mettre à jour';
$lang['btn_delete'] = 'Effacer';
$lang['btn_back'] = 'Retour';
$lang['btn_backlink'] = 'Liens vers cette page';
$lang['btn_backtomedia'] = 'Retour à la sélection du fichier média';
$lang['btn_subscribe'] = 'S\'abonner à la page';
-$lang['btn_unsubscribe'] = 'Se désabonner de la page';
-$lang['btn_subscribens'] = 'S\'abonner à la catégorie';
-$lang['btn_unsubscribens'] = 'Se désabonner de la catégorie';
$lang['btn_profile'] = 'Mettre à jour le profil';
$lang['btn_reset'] = 'Réinitialiser';
$lang['btn_resendpwd'] = 'Envoyer le mot de passe';
-$lang['btn_draft'] = 'Éditer brouillon';
-$lang['btn_recover'] = 'Récupérer brouillon';
-$lang['btn_draftdel'] = 'Effacer brouillon';
+$lang['btn_draft'] = 'Modifier le brouillon';
+$lang['btn_recover'] = 'Récupérer le brouillon';
+$lang['btn_draftdel'] = 'Effacer le brouillon';
$lang['btn_revert'] = 'Restaurer';
$lang['loggedinas'] = 'Connecté en tant que ';
$lang['user'] = 'Utilisateur';
@@ -73,16 +72,16 @@ $lang['email'] = 'Adresse de courriel';
$lang['register'] = 'S\'enregistrer';
$lang['profile'] = 'Profil utilisateur';
$lang['badlogin'] = 'L\'utilisateur ou le mot de passe est incorrect.';
-$lang['minoredit'] = 'Mineur';
+$lang['minoredit'] = 'Modification mineure';
$lang['draftdate'] = 'Brouillon auto-enregistré le';
$lang['nosecedit'] = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
$lang['regmissing'] = 'Désolé, vous devez remplir tous les champs.';
-$lang['reguexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris';
+$lang['reguexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris.';
$lang['regsuccess'] = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
$lang['regsuccess2'] = 'L\'utilisateur a été créé.';
$lang['regmailfail'] = 'Il semble y avoir un problème à l\'envoi du courriel. Contactez l\'administrateur.';
-$lang['regbadmail'] = 'L\'adresse de courriel semble incorrecte - si vous pensez que c\'est une erreur, contactez l\'administrateur.';
-$lang['regbadpass'] = 'Les deux mots de passe fournis sont différents, recommencez SVP.';
+$lang['regbadmail'] = 'L\'adresse de courriel semble incorrecte. Si vous pensez que c\'est une erreur, contactez l\'administrateur.';
+$lang['regbadpass'] = 'Les deux mots de passe fournis sont différents, veuillez recommencez.';
$lang['regpwmail'] = 'Votre mot de passe DokuWiki';
$lang['reghere'] = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici ';
$lang['profna'] = 'Ce wiki ne permet pas de modifier les profils';
@@ -94,58 +93,79 @@ $lang['resendna'] = 'Ce wiki ne permet pas le renvoi de mot de pass
$lang['resendpwd'] = 'Renvoyer le mot de passe de';
$lang['resendpwdmissing'] = 'Désolé, vous devez remplir tous les champs.';
$lang['resendpwdnouser'] = 'Désolé, cet utilisateur est introuvable dans notre base.';
-$lang['resendpwdbadauth'] = 'Désolé, ce code d\'authentification est invalide. Assurez vous d\'avoir utilisé le lien de confirmation.';
+$lang['resendpwdbadauth'] = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation.';
$lang['resendpwdconfirm'] = 'Un lien de confirmation vous a été envoyé par courriel.';
$lang['resendpwdsuccess'] = 'Votre nouveau mot de passe vous a été expédié par courriel.';
-$lang['license'] = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante:';
-$lang['licenseok'] = 'Note : En éditant cette page vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
-$lang['searchmedia'] = 'Chercher le nom de fichier :';
+$lang['license'] = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante :';
+$lang['licenseok'] = 'Note : En modifiant cette page, vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
+$lang['searchmedia'] = 'Chercher le nom de fichier :';
$lang['searchmedia_in'] = 'Chercher dans %s';
$lang['txt_upload'] = 'Sélectionnez un fichier à envoyer ';
-$lang['txt_filename'] = 'Donnez un "wikiname" (optionnel) ';
+$lang['txt_filename'] = 'Donnez un « wikiname » (optionnel) ';
$lang['txt_overwrt'] = 'Écraser le fichier cible';
$lang['lockedby'] = 'Actuellement bloqué par';
$lang['lockexpire'] = 'Le blocage expire à';
-$lang['willexpire'] = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton Aperçu pour réinitialiser le minuteur.';
-$lang['notsavedyet'] = 'Les changements non enregistrés seront perdus.\nVoulez-vous vraiment continuer ?';
+$lang['willexpire'] = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['notsavedyet'] = 'Les modifications non enregistrées seront perdues.\nVoulez-vous vraiment continuer ?';
$lang['rssfailed'] = 'Une erreur s\'est produite en récupérant ce flux : ';
$lang['nothingfound'] = 'Pas de réponse.';
$lang['mediaselect'] = 'Sélection de fichier';
$lang['fileupload'] = 'Envoi de fichier';
-$lang['uploadsucc'] = 'Envoi réussi';
-$lang['uploadfail'] = 'L\'envoi n\'a pas réussi. Les permissions sont-elles correctes ?';
-$lang['uploadwrong'] = 'Envoi refusé. Cette extension de fichier est interdite !';
-$lang['uploadexist'] = 'Le fichier existe. Envoi avorté.';
+$lang['uploadsucc'] = 'Téléversement réussi';
+$lang['uploadfail'] = 'Le téléversement n\'a pas réussi. Les permissions sont-elles correctes ?';
+$lang['uploadwrong'] = 'Téléversement refusé. Cette extension de fichier est interdite !';
+$lang['uploadexist'] = 'Le fichier existe. Téléversement avorté.';
$lang['uploadbadcontent'] = 'Le contenu envoyé ne correspond pas à l\'extension du fichier %s.';
-$lang['uploadspam'] = 'L\'envoi a été bloqué par la liste noire antispam.';
-$lang['uploadxss'] = 'L\'envoi a été bloqué car son contenu est peut-être malveillant.';
-$lang['uploadsize'] = 'Le fichier envoyé était trop gros. (max. %s)';
-$lang['deletesucc'] = 'Le fichier "%s" a été effacé.';
-$lang['deletefail'] = 'Le fichier "%s" n\'a pu être effacé - vérifier les permissions.';
-$lang['mediainuse'] = 'Le fichier "%s" n\'a pas été effacé - il est en cours d\'utilisation.';
+$lang['uploadspam'] = 'Le téléversement a été bloqué par la liste noire antispam.';
+$lang['uploadxss'] = 'Le téléversement a été bloqué car son contenu est peut-être malveillant.';
+$lang['uploadsize'] = 'Le fichier téléversé était trop gros. (max. %s)';
+$lang['deletesucc'] = 'Le fichier « %s » a été effacé.';
+$lang['deletefail'] = 'Le fichier « %s » n\'a pu être effacé, vérifier les permissions.';
+$lang['mediainuse'] = 'Le fichier « %s » n\'a pas été effacé, il est en cours d\'utilisation.';
$lang['namespaces'] = 'Catégories';
$lang['mediafiles'] = 'Fichiers disponibles dans';
$lang['js']['searchmedia'] = 'Chercher des fichiers';
$lang['js']['keepopen'] = 'Gardez la fenêtre ouverte pendant la sélection';
$lang['js']['hidedetails'] = 'Masquer détails';
+$lang['js']['mediatitle'] = 'Paramètres de lien';
+$lang['js']['mediadisplay'] = 'Type de lien';
+$lang['js']['mediaalign'] = 'Alignement';
+$lang['js']['mediasize'] = 'Taille d\'image';
+$lang['js']['mediatarget'] = 'Cible du lien';
+$lang['js']['mediaclose'] = 'Fermer';
+$lang['js']['mediainsert'] = 'Insérer';
+$lang['js']['mediadisplayimg'] = 'Afficher l\'image.';
+$lang['js']['mediadisplaylnk'] = 'N\'afficher que le lien.';
+$lang['js']['mediasmall'] = 'Petite version';
+$lang['js']['mediamedium'] = 'Version moyenne';
+$lang['js']['medialarge'] = 'Grande version';
+$lang['js']['mediaoriginal'] = 'Version originale';
+$lang['js']['medialnk'] = 'Lien vers la page de détail';
+$lang['js']['mediadirect'] = 'Lien direct vers l\'original';
+$lang['js']['medianolnk'] = 'Aucun lien';
+$lang['js']['medianolink'] = 'Ne pas lier l\'image';
+$lang['js']['medialeft'] = 'Aligner l\'image sur la gauche.';
+$lang['js']['mediaright'] = 'Aligner l\'image sur la droite.';
+$lang['js']['mediacenter'] = 'Centrer l\'image';
+$lang['js']['medianoalign'] = 'Ne pas aligner.';
$lang['js']['nosmblinks'] = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.
-Vous pouvez toujours faire un copier/coller du lien.';
+Vous pouvez toujours copier puis coller le lien.';
$lang['js']['linkwiz'] = 'Assistant Lien';
-$lang['js']['linkto'] = 'Lien vers:';
+$lang['js']['linkto'] = 'Lien vers :';
$lang['js']['del_confirm'] = 'Effacer cette entrée ?';
$lang['js']['mu_btn'] = 'Envoyer plusieurs fichiers en même temps';
$lang['mediausage'] = 'Utilisez la syntaxe suivante pour faire référence à ce fichier :';
-$lang['mediaview'] = 'Voir fichier original';
-$lang['mediaroot'] = 'root';
-$lang['mediaupload'] = 'Envoyer un fichier dans la catégorie courante ici. Pour créer des sous-catégories, préfixez le nom du fichier par le nom de la sous-catégorie séparée par un double point.';
+$lang['mediaview'] = 'Afficher le fichier original';
+$lang['mediaroot'] = 'racine';
+$lang['mediaupload'] = 'Téléverser un fichier dans la catégorie actuelle. Pour créer des sous-catégories, préfixez le nom du fichier par le nom de la sous-catégorie séparée par un double-point.';
$lang['mediaextchange'] = 'Extension du fichier changée de .%s en .%s !';
$lang['reference'] = 'Références pour';
$lang['ref_inuse'] = 'Le fichier ne peut être effacé car il est utilisé par les pages suivantes :';
$lang['ref_hidden'] = 'Des références existent dans des pages que vous n\'avez pas la permission de lire';
-$lang['hits'] = 'occurrences trouvées';
+$lang['hits'] = 'Occurrences trouvées';
$lang['quickhits'] = 'Pages trouvées ';
$lang['toc'] = 'Table des matières';
-$lang['current'] = 'version actuelle';
+$lang['current'] = 'Version actuelle';
$lang['yours'] = 'Votre version';
$lang['diff'] = 'Différences avec la version actuelle';
$lang['diff2'] = 'Différences entre les versions sélectionnées';
@@ -157,42 +177,43 @@ $lang['by'] = 'par';
$lang['deleted'] = 'effacée';
$lang['created'] = 'créée';
$lang['restored'] = 'ancienne révision restaurée';
-$lang['external_edit'] = 'édition externe';
+$lang['external_edit'] = 'modification externe';
$lang['summary'] = 'Résumé';
-$lang['noflash'] = 'L"extension <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> est nécessaire pour afficher ce contenu.';
+$lang['noflash'] = 'Le greffon <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash</a> est nécessaire pour afficher ce contenu.';
$lang['download'] = 'Télécharger un extrait';
-$lang['mail_newpage'] = 'page ajoutée :';
-$lang['mail_changed'] = 'page changée :';
-$lang['mail_new_user'] = 'nouvel utilisateur :';
-$lang['mail_upload'] = 'fichier envoyé :';
-$lang['qb_bold'] = 'Gras';
-$lang['qb_italic'] = 'Italique';
+$lang['mail_newpage'] = 'page ajoutée :';
+$lang['mail_changed'] = 'page modifiée :';
+$lang['mail_subscribe_list'] = 'pages modifiées dans la catégorie :';
+$lang['mail_new_user'] = 'nouvel utilisateur :';
+$lang['mail_upload'] = 'fichier envoyé :';
+$lang['qb_bold'] = 'Emphase forte (gras)';
+$lang['qb_italic'] = 'Emphase (italique)';
$lang['qb_underl'] = 'Souligné';
-$lang['qb_code'] = 'Code';
+$lang['qb_code'] = 'Code « machine à écrire »';
$lang['qb_strike'] = 'Texte barré';
-$lang['qb_h1'] = 'En-tête 1';
-$lang['qb_h2'] = 'En-tête 2';
-$lang['qb_h3'] = 'En-tête 3';
-$lang['qb_h4'] = 'En-tête 4';
-$lang['qb_h5'] = 'En-tête 5';
+$lang['qb_h1'] = 'Titre de niveau 1';
+$lang['qb_h2'] = 'Titre de niveau 2';
+$lang['qb_h3'] = 'Titre de niveau 3';
+$lang['qb_h4'] = 'Titre de niveau 4';
+$lang['qb_h5'] = 'Titre de niveau 5';
$lang['qb_h'] = 'Titre';
$lang['qb_hs'] = 'Sélectionner la ligne de titre';
-$lang['qb_hplus'] = 'Titre supérieur';
-$lang['qb_hminus'] = 'Titre inférieur';
+$lang['qb_hplus'] = 'Titre de niveau supérieur';
+$lang['qb_hminus'] = 'Titre de niveau inférieur';
$lang['qb_hequal'] = 'Titre de même niveau';
$lang['qb_link'] = 'Lien interne';
$lang['qb_extlink'] = 'Lien externe';
$lang['qb_hr'] = 'Ligne horizontale';
$lang['qb_ol'] = 'Liste numérotée';
$lang['qb_ul'] = 'Liste à puce';
-$lang['qb_media'] = 'Ajouter des images et autres fichiers';
+$lang['qb_media'] = 'Ajouter des images ou d\'autres fichiers';
$lang['qb_sig'] = 'Insérer une signature';
-$lang['qb_smileys'] = 'Émoticons';
+$lang['qb_smileys'] = 'Émoticones';
$lang['qb_chars'] = 'Caractères spéciaux';
$lang['upperns'] = 'Aller à la catégorie parente';
$lang['admin_register'] = 'Ajouter un nouvel utilisateur';
-$lang['metaedit'] = 'Éditer les métadonnées';
-$lang['metasaveerr'] = 'Erreur à l\'écriture des métadonnées';
+$lang['metaedit'] = 'Modifier les métadonnées';
+$lang['metasaveerr'] = 'Erreur lors de l\'écriture des métadonnées';
$lang['metasaveok'] = 'Métadonnées enregistrées';
$lang['img_backto'] = 'Retour à';
$lang['img_title'] = 'Titre';
@@ -204,29 +225,40 @@ $lang['img_artist'] = 'Auteur';
$lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Format';
$lang['img_camera'] = 'Appareil photo';
-$lang['img_keywords'] = 'Mots clef';
-$lang['subscribe_success'] = 'Ajout de %s à la liste d\'abonnés de %s';
-$lang['subscribe_error'] = 'Erreur à l\'ajout de %s à la liste d\'abonnés de %s';
-$lang['subscribe_noaddress'] = 'Aucune adresse associée à votre nom d\'utilisateur, impossible de vous ajouter à la liste d\'abonnés';
-$lang['unsubscribe_success'] = 'Suppression de %s de la liste d\'abonnés de %s';
-$lang['unsubscribe_error'] = 'Erreur à la suppression de %s de la liste d\'abonnés de %s';
+$lang['img_keywords'] = 'Mots-clés';
+$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s';
+$lang['subscr_subscribe_error'] = 'Erreur en ajoutant %s à la liste de souscription de %s';
+$lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription';
+$lang['subscr_unsubscribe_success'] = '%s a été retiré de la liste de souscription de %s';
+$lang['subscr_unsubscribe_error'] = 'Erreur en retirant %s de la liste de souscription de %s';
+$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s';
+$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s';
+$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie';
+$lang['subscr_m_new_header'] = 'Ajouter une souscription';
+$lang['subscr_m_current_header'] = 'Souscriptions actives';
+$lang['subscr_m_unsubscribe'] = 'Annuler la souscription';
+$lang['subscr_m_subscribe'] = 'Souscrire';
+$lang['subscr_m_receive'] = 'Recevoir';
+$lang['subscr_style_every'] = 'Envoyer un courriel à chaque modification';
+$lang['subscr_style_digest'] = 'Courriel résumant les modifications de chaque page';
+$lang['subscr_style_list'] = 'Liste des pages modifiées depuis le dernier courriel';
$lang['authmodfailed'] = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.';
$lang['authtempfail'] = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.';
$lang['i_chooselang'] = 'Choisissez votre langue';
$lang['i_installer'] = 'Installeur DokuWiki';
-$lang['i_wikiname'] = 'Nom du Wiki';
+$lang['i_wikiname'] = 'Nom du wiki';
$lang['i_enableacl'] = 'Activer les ACL (recommandé)';
$lang['i_superuser'] = 'Super-utilisateur';
$lang['i_problems'] = 'L\'installeur a détecté les problèmes indiqués ci-dessous. Vous ne pouvez poursuivre tant qu\'ils n\'auront pas été corrigés.';
$lang['i_modified'] = 'Pour des raisons de sécurité ce script ne fonctionne qu\'avec une installation neuve et non modifiée de DokuWiki. Vous devriez ré-extraire les fichiers depuis le paquet téléchargé ou consulter les <a href="http://dokuwiki.org/install">instructions d\'installation de DokuWiki</a>';
$lang['i_funcna'] = 'La fonction PHP <code>%s</code> n\'est pas disponible. Peut-être que votre hébergeur l\'a désactivée ?';
-$lang['i_phpver'] = 'Votre version de PHP (<code>%s</code>) est antérieure à la version requise (<code>%s</code>. Vous devez mettre à jour votre installation de PHP.';
+$lang['i_phpver'] = 'Votre version de PHP (%s) est antérieure à la version requise (%s). Vous devez mettre à jour votre installation de PHP.';
$lang['i_permfail'] = '<code>%s</code> n\'est pas accessible en écriture pour DokuWiki. Vous devez corriger les permissions de ce répertoire !';
$lang['i_confexists'] = '<code>%s</code> existe déjà';
$lang['i_writeerr'] = 'Impossible de créer <code>%s</code>. Vous devez vérifier les permissions des répertoires/fichiers et créer le fichier manuellement.';
$lang['i_badhash'] = 'dokuwiki.php non reconnu ou modifié (hash=<code>%s</code>)';
-$lang['i_badval'] = '<code>%s</code> - valeur illégale ou vide';
-$lang['i_success'] = 'L\'installation s\'est terminée avec succès. Vous pouvez maintenant supprimer le fichier install.php. Continuer avec <a href="doku.php">votre nouveau DokuWiki</a>.';
+$lang['i_badval'] = '<code>%s</code> - valeur interdite ou vide';
+$lang['i_success'] = 'L\'installation s\'est terminée avec succès. Vous pouvez maintenant supprimer le fichier « install.php ». Continuer avec <a href="doku.php">votre nouveau DokuWiki</a>.';
$lang['i_failure'] = 'Des erreurs sont survenues lors de l\'écriture des fichiers de configuration. Il vous faudra les corriger manuellement avant de pouvoir utiliser <a href="doku.php">votre nouveau DokuWiki</a>.';
$lang['i_policy'] = 'Politique d\'ACL initiale';
$lang['i_pol0'] = 'Wiki ouvert (lecture, écriture, envoi de fichiers pour tout le monde)';
@@ -248,7 +280,7 @@ $lang['mu_progress'] = '@PCT@% envoyé';
$lang['mu_filetypes'] = 'Types de fichiers acceptés';
$lang['mu_info'] = 'fichiers envoyés.';
$lang['mu_lasterr'] = 'Dernière erreur : ';
-$lang['recent_global'] = 'Vous êtes actuellement en train de regarder les modifications au sein du namespace <b>%s</b>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.';
+$lang['recent_global'] = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie <strong>%s</strong>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.';
$lang['years'] = 'il y a %d ans';
$lang['months'] = 'il y a %d mois';
$lang['weeks'] = 'il y a %d semaines';
diff --git a/inc/lang/fr/locked.txt b/inc/lang/fr/locked.txt
index ac8eb4c4b..82cdd7373 100644
--- a/inc/lang/fr/locked.txt
+++ b/inc/lang/fr/locked.txt
@@ -1,3 +1,3 @@
====== Page bloquée ======
-Cette page est actuellement bloquée pour édition par un autre utilisateur. Vous devez attendre que l'autre utilisateur ait terminé ou que le blocage de la page expire.
+Cette page est actuellement bloquée pour modification par un autre utilisateur. Vous devez attendre que l'autre utilisateur ait terminé ou que le blocage de la page expire.
diff --git a/inc/lang/fr/mailtext.txt b/inc/lang/fr/mailtext.txt
index 0b87616b1..add3b2779 100644
--- a/inc/lang/fr/mailtext.txt
+++ b/inc/lang/fr/mailtext.txt
@@ -1,4 +1,4 @@
-Une page dans votre Wiki a été ajoutée ou modifiée. Voici les
+Une page dans votre wiki a été ajoutée ou modifiée. Voici les
détails :
Date : @DATE@
@@ -7,6 +7,7 @@ Adresse IP : @IPADDRESS@
Nom d'hôte : @HOSTNAME@
Ancienne révision : @OLDPAGE@
Nouvelle révision : @NEWPAGE@
+Différences : @OLDPAGE@&do=diff
Résumé : @SUMMARY@
Utilisateur : @USER@
@@ -14,5 +15,5 @@ Utilisateur : @USER@
--
-Ce message a été généré par DokuWiki
+Ce courriel a été généré par DokuWiki
@DOKUWIKIURL@
diff --git a/inc/lang/fr/newpage.txt b/inc/lang/fr/newpage.txt
index 3d834ffd0..0ed2b25af 100644
--- a/inc/lang/fr/newpage.txt
+++ b/inc/lang/fr/newpage.txt
@@ -1,4 +1,4 @@
====== Cette page n'existe pas encore ======
-Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ''Créer cette page''.
+Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ou le lien « Créer cette page ».
diff --git a/inc/lang/fr/norev.txt b/inc/lang/fr/norev.txt
index 65984ef9c..3f96b6aff 100644
--- a/inc/lang/fr/norev.txt
+++ b/inc/lang/fr/norev.txt
@@ -1,4 +1,4 @@
====== Révision non trouvée ======
-La révision demandée n'existe pas. Utilisez le bouton 'Anciennes révisions' pour une liste des révisions de ce document.
+La révision demandée n'existe pas. Utilisez le bouton ou le lien « Anciennes révisions » pour une liste des révisions de ce document.
diff --git a/inc/lang/fr/password.txt b/inc/lang/fr/password.txt
index 6c4f5309f..f4500fc85 100644
--- a/inc/lang/fr/password.txt
+++ b/inc/lang/fr/password.txt
@@ -6,5 +6,5 @@ Utilisateur : @LOGIN@
Mot de passe : @PASSWORD@
--
-Ce mail a été envoyé par DokuWiki de
+Ce courriel a été envoyé par DokuWiki de
@DOKUWIKIURL@
diff --git a/inc/lang/fr/pwconfirm.txt b/inc/lang/fr/pwconfirm.txt
index 432b5f102..af84833df 100644
--- a/inc/lang/fr/pwconfirm.txt
+++ b/inc/lang/fr/pwconfirm.txt
@@ -1,6 +1,6 @@
Bonjour @FULLNAME@ !
-Quelqu'un a demandé un nouveau mot de passe pour votre login
+Quelqu'un a demandé un nouveau mot de passe pour votre identifiant
@TITLE@ sur @DOKUWIKIURL@
Si vous n'êtes pas à l'origine de cette requête d'un nouveau mot de
@@ -11,5 +11,5 @@ Pour confirmer que cette requête émane bien de vous, merci de suivre le lien c
@CONFIRM@
--
-Ce message a été généré par DokuWiki
+Ce courriel a été généré par DokuWiki
@DOKUWIKIURL@
diff --git a/inc/lang/fr/registermail.txt b/inc/lang/fr/registermail.txt
index 960aedf2d..1beae8522 100644
--- a/inc/lang/fr/registermail.txt
+++ b/inc/lang/fr/registermail.txt
@@ -10,5 +10,5 @@ Adresse IP : @IPADDRESS@
Nom d'hôte : @HOSTNAME@
--
-Ce message a été généré par DokuWiki
+Ce courriel a été généré par DokuWiki
@DOKUWIKIURL@
diff --git a/inc/lang/fr/resendpwd.txt b/inc/lang/fr/resendpwd.txt
index 2cfbed617..44fbeef03 100644
--- a/inc/lang/fr/resendpwd.txt
+++ b/inc/lang/fr/resendpwd.txt
@@ -1,4 +1,4 @@
====== Envoyer un nouveau mot de passe ======
-Veuillez compléter les champs ci dessous pour obtenir un nouveau mot de passe pour votre compte dans ce wiki. Un lien de confirmation vous sera envoyé à l'adresse de courriel utilisée lors de votre enregistrement.
+Veuillez compléter les champs ci-dessous pour obtenir un nouveau mot de passe pour votre compte dans ce wiki. Un lien de confirmation vous sera envoyé à l'adresse de courriel utilisée lors de votre enregistrement.
diff --git a/inc/lang/fr/revisions.txt b/inc/lang/fr/revisions.txt
index c9149ef9b..29c17137f 100644
--- a/inc/lang/fr/revisions.txt
+++ b/inc/lang/fr/revisions.txt
@@ -1,4 +1,4 @@
====== Anciennes révisions ======
-Voici les anciennes révisions de la page en cours. Pour revenir à une ancienne révision, sélectionnez-la ci-dessous, cliquez sur le bouton ''Éditer cette page'' et enregistrez-la.
+Voici les anciennes révisions de la page en cours. Pour revenir à une ancienne révision, sélectionnez-la ci-dessous, cliquez sur le bouton « Modifier cette page » et enregistrez-la.
diff --git a/inc/lang/fr/searchpage.txt b/inc/lang/fr/searchpage.txt
index 8355a2f9d..a9bd91608 100644
--- a/inc/lang/fr/searchpage.txt
+++ b/inc/lang/fr/searchpage.txt
@@ -1,5 +1,5 @@
====== Recherche ======
-Voici les résultats de votre recherche. Si vous n'avez pas trouvé ce que vous cherchiez, vous pouvez créer ou éditer la page correspondante à votre requête en cliquant sur le bouton approprié.
+Voici les résultats de votre recherche. Si vous n'avez pas trouvé ce que vous cherchiez, vous pouvez créer ou modifier la page correspondante à votre requête en cliquant sur le bouton approprié.
===== Résultats =====
diff --git a/inc/lang/fr/subscr_digest.txt b/inc/lang/fr/subscr_digest.txt
new file mode 100644
index 000000000..1803407fa
--- /dev/null
+++ b/inc/lang/fr/subscr_digest.txt
@@ -0,0 +1,19 @@
+Bonjour,
+
+La page « @PAGE@ » dans le wiki « @TITLE@ » a été modifiée. Voici ces modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Révision précédente : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+
+Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
+@DOKUWIKIURL@ puis visitez
+@SUBSCRIBE@
+et désabonnez-vous de la page ou de la catégorie.
+
+--
+Ce courriel a été généré par Dokuwiki :
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fr/subscr_form.txt b/inc/lang/fr/subscr_form.txt
new file mode 100644
index 000000000..528f77475
--- /dev/null
+++ b/inc/lang/fr/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gestion de l'abonnement ======
+
+Cette page vous permet de gérer vos abonnements à la page ou à la catégorie courantes \ No newline at end of file
diff --git a/inc/lang/fr/subscr_list.txt b/inc/lang/fr/subscr_list.txt
new file mode 100644
index 000000000..3387b11ee
--- /dev/null
+++ b/inc/lang/fr/subscr_list.txt
@@ -0,0 +1,16 @@
+Bonjour,
+
+Des pages dans la catégorie « @PAGE@ » du wiki « @TITLE@ » ont été modifiées. Voici ces modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
+@DOKUWIKIURL@ puis visitez
+@SUBSCRIBE@
+et désabonnez-vous de la page ou de la catégorie.
+
+--
+Ce courriel a été généré par Dokuwiki :
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fr/subscr_single.txt b/inc/lang/fr/subscr_single.txt
new file mode 100644
index 000000000..1b9d5e1b5
--- /dev/null
+++ b/inc/lang/fr/subscr_single.txt
@@ -0,0 +1,22 @@
+Bonjour,
+
+La page « @PAGE@ » dans le wiki « @TITLE@ » a été modifiée. Voici ces modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Date : @DATE@
+Utilisateur : @USER@
+Résumé : @SUMMARY@
+Révision précédente : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+
+Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
+@DOKUWIKIURL@ puis visitez
+@SUBSCRIBE@
+et désabonnez-vous de la page ou de la catégorie.
+
+--
+Ce courriel a été généré par Dokuwiki :
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/fr/uploadmail.txt b/inc/lang/fr/uploadmail.txt
index 3a186b554..05b3205d7 100644
--- a/inc/lang/fr/uploadmail.txt
+++ b/inc/lang/fr/uploadmail.txt
@@ -1,4 +1,4 @@
-Un fichier a été envoyé dans votre DokuWiki. En voici les détails :
+Un fichier a été téléversé dans votre wiki. En voici les détails :
Fichier : @MEDIA@
Date : @DATE@
diff --git a/inc/lang/fr/wordblock.txt b/inc/lang/fr/wordblock.txt
deleted file mode 100644
index ae5962a80..000000000
--- a/inc/lang/fr/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Changement bloqué ======
-
-Vos changements n'ont **pas été enregistrés** car ils contiennent un ou plusieurs mots bloqués. Si vous avez essayé de spammer le Wiki -- mauvaise idée ! Si vous pensez que c'est une erreur, contactez l'administrateur de ce Wiki.
-
diff --git a/inc/lang/gl/admin.txt b/inc/lang/gl/admin.txt
index a5bb1753d..eeaed992a 100644
--- a/inc/lang/gl/admin.txt
+++ b/inc/lang/gl/admin.txt
@@ -1,4 +1,4 @@
====== Administración ======
-A continuación pode encontrar unha lista de tarefas administrativas dispoñíbeis no DokuWiki.
+De seguido podes atopar unha lista de tarefas administrativas dispoñíbeis no DokuWiki.
diff --git a/inc/lang/gl/adminplugins.txt b/inc/lang/gl/adminplugins.txt
index e791265e6..e52172ebc 100644
--- a/inc/lang/gl/adminplugins.txt
+++ b/inc/lang/gl/adminplugins.txt
@@ -1 +1 @@
-===== Plugins adicionais ===== \ No newline at end of file
+===== Extensións adicionais ===== \ No newline at end of file
diff --git a/inc/lang/gl/backlinks.txt b/inc/lang/gl/backlinks.txt
index 90066d032..f77b74bbd 100644
--- a/inc/lang/gl/backlinks.txt
+++ b/inc/lang/gl/backlinks.txt
@@ -1,4 +1,4 @@
====== Ligazóns entrantes ======
-Isto é unha listaxe de páxinas que parecen estar vinculadas á páxina actual.
+Isto é unha listaxe de páxinas que semellan ligar coa páxina actual.
diff --git a/inc/lang/gl/conflict.txt b/inc/lang/gl/conflict.txt
index e63e5b216..dcd87c7a5 100644
--- a/inc/lang/gl/conflict.txt
+++ b/inc/lang/gl/conflict.txt
@@ -1,6 +1,6 @@
====== Hai unha versión máis nova ======
-Hai unha versión máis nova do documento que editou. Isto sucede cando outra persoa usuaria alterou o documento mentres vostede o estaba a editar.
+Hai unha versión máis nova do documento que editaches. Isto sucede cando outro usuario mudou o documento mentres ti estabas a editalo.
-Examine as diferenzas que se mostran abaixo detalladamente e despois decida a versión que quere manter. Se selecciona ''Gardar'', gardarase a súa versión. Prema en ''Cancelar'' para manter a versión actual.
+Examina as diferenzas amosadas embaixo polo miúdo, e logo decide que versión queres manter. Se escolleres ''Gardar'', gardarase a túa versión. Preme en ''Cancelar'' para manteres a versión actual.
diff --git a/inc/lang/gl/denied.txt b/inc/lang/gl/denied.txt
index 8d388a8bb..69408a4f3 100644
--- a/inc/lang/gl/denied.txt
+++ b/inc/lang/gl/denied.txt
@@ -1,4 +1,4 @@
-====== Permiso denegado ======
+====== Permiso Denegado ======
-Sentímolo, mais non ten os permisos suficientes para continuar. É posíbel que esquecese iniciar unha sesión.
+Sentímolo, mais non tes permisos de abondo para continuares. Pode que esqueceses iniciar a sesión?
diff --git a/inc/lang/gl/diff.txt b/inc/lang/gl/diff.txt
index 5660e4025..df87707f0 100644
--- a/inc/lang/gl/diff.txt
+++ b/inc/lang/gl/diff.txt
@@ -1,4 +1,4 @@
====== Diferenzas ======
-Isto mostra as diferenzas entre a revisión seleccionada e a versión actual da páxina.
+Isto amosa as diferenzas entre a revisión seleccionada e a versión actual da páxina.
diff --git a/inc/lang/gl/draft.txt b/inc/lang/gl/draft.txt
index 8e2aa19f2..ac36dc01a 100644
--- a/inc/lang/gl/draft.txt
+++ b/inc/lang/gl/draft.txt
@@ -1,6 +1,6 @@
-====== Encontrouse un ficheiro de borrador ======
+====== Arquivo de rascuño atopado ======
-A súa última sesión de edición desta páxina non terminou de modo correcto. O DokuWiki gardou automaticamente un borrador durante o seu traballo que agora pode usar para continuar coa edición. A continuación pode ver os datos que foron gardados durante a súa última sesión.
+A túa última sesión de edición desta páxina non foi completada de xeito correcto. O DokuWiki gravou automaticamente un rascuño durante o teu traballo que agora podes usar para continuares coa edición. De seguido podes ver os datos que foron gardados da túa última sesión.
-Por favor, escolla entre se se quere //Recuperar// a súa sesión de edición perdida, //Eliminar// o borrador gardado automaticamente ou //Cancelar// o proceso de edición.
+Por favor, escolle se queres //Recuperar// a túa sesión de edición perdida, //Eliminar// o borrador autogardado ou //Cancelar// o proceso de edición.
diff --git a/inc/lang/gl/edit.txt b/inc/lang/gl/edit.txt
index 9e2061b51..1cc124300 100644
--- a/inc/lang/gl/edit.txt
+++ b/inc/lang/gl/edit.txt
@@ -1,2 +1,2 @@
-Edite a páxina e prema en ''Gardar''. Vexa a páxina [[wiki:syntax|sintaxe]] para aprender a sintaxe da Wiki. Edite a páxina só se pode **mellorala**. Se quere facer probas, aprenda como efectuar os seus primeiros pasos no [[playground:playground|campo de xogo]].
+Edita a páxina e preme en ''Gardar''. Bótalle un ollo á [[wiki:syntax|sintaxe]] para veres a sintaxe do Wiki. Por favor, edita a páxina só se podes **mellorala**. Se quixeres facer probas, aprende como levar a cabo os teus primeiros pasos na [[playground:playground|eira]].
diff --git a/inc/lang/gl/editrev.txt b/inc/lang/gl/editrev.txt
index c582fc3d0..d6a0490a3 100644
--- a/inc/lang/gl/editrev.txt
+++ b/inc/lang/gl/editrev.txt
@@ -1,2 +1,2 @@
-**Cargou unha revisión antiga do documento!** Se o garda, creará unha versión nova con eses datos.
+**Cargaches unha revisión antiga do documento!** Se o gardares, crearás unha nova versión con estes datos.
----
diff --git a/inc/lang/gl/install.html b/inc/lang/gl/install.html
index 017abad8f..ca26f7961 100644
--- a/inc/lang/gl/install.html
+++ b/inc/lang/gl/install.html
@@ -1,25 +1,25 @@
-<p>Esta páxina é unha axuda para a primeira instalación e configuración do
-<a href="http://dokuwiki.org">Dokuwiki</a>. Se quere máis información
-sobre este instalador, está dispoñíbel na súa propia
+<p>Esta páxina é unha axuda na primeira vez que se instala e configura o
+<a href="http://dokuwiki.org">Dokuwiki</a>. Se queres máis información
+verbo deste instalador está dispoñible na súa propia
<a href="http://dokuwiki.org/installer">páxina de documentación</a>.</p>
-<p>O DokuWiki usa ficheiros normais para o almacenamento das páxinas do wiki
-e outra información asociada ás mesmas (por ex. imaxes, índices de procura,
-revisións antigas etc.). Por iso, para poder operar correctamente, o DokuWiki
-<strong>precisa</strong> ter acceso de escritura nos directorios que conteñen
-eses ficheiros. Este instalador non é quen de configurar os permisos dos directorios.
-Isto debe facerse normalmente de xeito directo na liña de comandos ou, se está a
-usar unha hospedaxe, a través do FTP ou do panel de control da súa hospedaxe (por ex.
+<p>O DokuWiki emprega arquivos normais para a almacenaxe das páxinas do wiki
+e outra información asociada coas mesmas (p.e. imaxes, índices de procura,
+revisións antigas, etc). Por iso, para poder operar correctamente, o DokuWiki
+<strong>precisa</strong> ter acceso de escritura aos directorios que conteñen
+eses arquivos. Este instalador non é quen de configurar os permisos dos directorios.
+Isto debe facerse normalmente de xeito directo na liña de comandos ou, se estás a
+usar unha hospedaxe, a través do FTP ou do panel de control da túa hospedaxe (p.e.
o cPanel).</p>
-<p>Este instalador configurará o seu DokuWiki para o uso da
-<acronym title="access control list">ACL</acronym>, o cal lle permitirá á persoa administradora
-iniciar unha sesión e acceder ao menú de administración do DokuWiki para instalar plugins,
-xestionar as persoas usuarias e os accesos ás páxinas do wiki; ademais de modificar a configuración.
-Non é imprescindíbel para o funcionamento do DokuWiki, mais fai moito máis doada a
+<p>Este instalador configurará o teu DokuWiki para o uso da
+<acronym title="access control list">ACL</acronym>, o cal permitirá ao administrador
+iniciar sesión e acceder ao menú de administración do DokuWiki para instalar extensións,
+xestionar usuarios e accesos ás páxinas do wiki, ademais de modificar a configuración.
+Non é imprescindíbel para o funcionamento do DokuWiki, porén, fai moito máis doada a
administración do mesmo.</p>
-<p>As persoas usuarias expertas ou con requisitos especiais de configuración poden visitar
-as seguintes ligazóns para obter os pormenores relativos ás
+<p>Os usuarios expertos ou con requisitos especiais de configuración poden visitar
+as seguintes ligazóns para obter pormenores relativos ás
<a href="http://dokuwiki.org/install">instruccións de instalación</a>
e á <a href="http://dokuwiki.org/config">configuración</a>.</p>
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 2f34a02a0..c6ac4071e 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -3,9 +3,7 @@
* galician language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -15,8 +13,8 @@ $lang['singlequoteopening'] = '‘';
$lang['singlequoteclosing'] = '’';
$lang['apostrophe'] = '’';
$lang['btn_edit'] = 'Editar esta páxina';
-$lang['btn_source'] = 'Mostrar o código da páxina';
-$lang['btn_show'] = 'Mostrar a páxina';
+$lang['btn_source'] = 'Amosar a fonte da páxina';
+$lang['btn_show'] = 'Amosar páxina';
$lang['btn_create'] = 'Crear esta páxina';
$lang['btn_search'] = 'Procurar';
$lang['btn_save'] = 'Gardar';
@@ -25,215 +23,207 @@ $lang['btn_top'] = 'Comezo da páxina';
$lang['btn_newer'] = '<< máis recente';
$lang['btn_older'] = 'menos recente >>';
$lang['btn_revs'] = 'Revisións antigas';
-$lang['btn_recent'] = 'Cambios recentes';
+$lang['btn_recent'] = 'Trocos recentes';
$lang['btn_upload'] = 'Subir';
$lang['btn_cancel'] = 'Cancelar';
$lang['btn_index'] = 'Índice';
$lang['btn_secedit'] = 'Editar';
-$lang['btn_login'] = 'Iniciar unha sesión';
-$lang['btn_logout'] = 'Terminar a sesión';
+$lang['btn_login'] = 'Iniciar sesión';
+$lang['btn_logout'] = 'Rematar sesión';
$lang['btn_admin'] = 'Administración';
$lang['btn_update'] = 'Actualizar';
$lang['btn_delete'] = 'Borrar';
$lang['btn_back'] = 'Atrás';
-$lang['btn_backlink'] = 'Ligazón entrante';
-$lang['btn_backtomedia'] = 'Volver á Selección de Ficheiros multimedia';
-$lang['btn_subscribe'] = 'Avisar dos cambios na páxina';
-$lang['btn_unsubscribe'] = 'Non avisar dos cambios na páxina';
-$lang['btn_subscribens'] = 'Avísar dos cambios nos Nomes de espazo';
-$lang['btn_unsubscribens'] = 'Non avisar dos cambios nos Nomes de espazo';
-$lang['btn_profile'] = 'Actualizar o perfil';
+$lang['btn_backlink'] = 'Ligazóns con isto';
+$lang['btn_backtomedia'] = 'Volver á Selección de Arquivos-Media';
+$lang['btn_subscribe'] = 'Avísame dos trocos na páxina';
+$lang['btn_profile'] = 'Actualizar Perfil';
$lang['btn_reset'] = 'Reiniciar';
-$lang['btn_resendpwd'] = 'Enviar un contrasinal novo';
-$lang['btn_draft'] = 'Editar o borrador';
-$lang['btn_recover'] = 'Recuperar o borrador';
-$lang['btn_draftdel'] = 'Eliminar o borrador';
+$lang['btn_resendpwd'] = 'Envíame un novo contrasinal';
+$lang['btn_draft'] = 'Editar borrador';
+$lang['btn_recover'] = 'Recuperar borrador';
+$lang['btn_draftdel'] = 'Eliminar borrador';
$lang['btn_revert'] = 'Restaurar';
-$lang['loggedinas'] = 'Iniciou unha sesión como';
-$lang['user'] = 'Nome de persoa usuaria';
+$lang['loggedinas'] = 'Iniciaches sesión como';
+$lang['user'] = 'Nome de Usuario';
$lang['pass'] = 'Contrasinal';
-$lang['newpass'] = 'Contrasinal novo';
-$lang['oldpass'] = 'Confirmar o contrasinal actual';
+$lang['newpass'] = 'Novo Contrasinal';
+$lang['oldpass'] = 'Confirmar contrasinal actual';
$lang['passchk'] = 'de novo';
$lang['remember'] = 'Lémbrame';
-$lang['fullname'] = 'Nome completo';
-$lang['email'] = 'Correo';
+$lang['fullname'] = 'Nome Completo';
+$lang['email'] = 'Correo-e';
$lang['register'] = 'Rexístrate';
-$lang['profile'] = 'Perfil de persoa usuaria';
-$lang['badlogin'] = 'Sentímolo, mais o nome de persoa usuaria ou o contrasinal non son correctos.';
-$lang['minoredit'] = 'Cambios menores';
-$lang['draftdate'] = 'O borrador gardouse automaticamente en';
-$lang['nosecedit'] = 'A páxina cambiou, no entanto, a información da sección estaba desactualizada, polo que se cargou a páxina completa en seu lugar.';
-$lang['regmissing'] = 'Sentímolo, mais ten que encher todos os campos.';
-$lang['reguexists'] = 'Sentímolo, mais xa existe unha persoa usuaria con ese nome.';
-$lang['regsuccess'] = 'A persoa usuaria foi creada e o contrasinal enviado por correo electrónico.';
-$lang['regsuccess2'] = 'A persoa usuaria foi creada.';
-$lang['regmailfail'] = 'Semella que houbo un erro ao tentar enviar o correo co contrasinal. Contacte coa persoa administradora!';
-$lang['regbadmail'] = 'O enderezo de correo proporcionado semella incorrecto - se considera que isto é un erro, contacte coa persoa administradora';
-$lang['regbadpass'] = 'Os dous contrasinais introducidos non coinciden: Ténteo de novo.';
-$lang['regpwmail'] = 'O seu contrasinal do DokuWiki';
-$lang['reghere'] = 'Aínda non ten unha conta? Cree unha';
-$lang['profna'] = 'Esta wiki non permite modificacións dos perfís';
-$lang['profnochange'] = 'Non hai cambios, non hai nada para facer.';
-$lang['profnoempty'] = 'Non se permite un nome ou un enderezo de correo baleiros.';
-$lang['profchanged'] = 'O perfil de persoa usuaria foi actualizado correctamente.';
-$lang['pwdforget'] = 'Esqueceu o seu contrasinal? Obteña un novo';
-$lang['resendna'] = 'Esta wiki non permite o reenvío de contrasinais.';
-$lang['resendpwd'] = 'Enviar un contrasinal novo a';
-$lang['resendpwdmissing'] = 'Sentímolo, ten que encher todos os campos.';
-$lang['resendpwdnouser'] = 'Sentímolo, non encontramos esta persoa usuaria na nosa base de datos.';
-$lang['resendpwdbadauth'] = 'Sentímolo, mais este código de autorización non é válido. Asegúrese de que usou a ligazón completa de confirmación.';
-$lang['resendpwdconfirm'] = 'Enviouse unha ligazón de confirmación por correo.';
-$lang['resendpwdsuccess'] = 'O seu novo contrasinal foi enviado por correo.';
-$lang['license'] = 'O contido deste wiki, agás onde se indique o contrario, ofrécese baixo a seguinte licenza:';
-$lang['licenseok'] = 'Nota: Ao editar esta páxina estás a aceptar o licenciamento do contido baixo a seguinte licenza:';
-$lang['searchmedia'] = 'Buscar nome de ficheiro:';
-$lang['searchmedia_in'] = 'Buscar en %s';
-$lang['txt_upload'] = 'Selecciona o arquivo para subir';
+$lang['profile'] = 'Perfil de Usuario';
+$lang['badlogin'] = 'Sentímolo, mais o nome de usuario ou o contrasinal non son correctos.';
+$lang['minoredit'] = 'Trocos Menores';
+$lang['draftdate'] = 'Borrador gardado automaticamente en';
+$lang['nosecedit'] = 'A páxina mudou entrementres, a información da sección estaba desfasada polo que se cargou a páxina completa no seu lugar.';
+$lang['regmissing'] = 'Sentímolo, mais tes que cubrir todos os campos.';
+$lang['reguexists'] = 'Sentímolo, mais xa existe un usuario con ese nome.';
+$lang['regsuccess'] = 'O usuario foi creado e o contrasinal enviado por correo-e.';
+$lang['regsuccess2'] = 'O usuario foi creado.';
+$lang['regmailfail'] = 'Semella que houbo un erro ao tentar enviar o correo-e co contrasinal. Por favor, contacta co administrador!';
+$lang['regbadmail'] = 'O enderezo de correo-e proporcionado semella incorrecto - se consideras que isto é un erro, contacta co administrador';
+$lang['regbadpass'] = 'Os dous contrasinais inseridos non coinciden, por favor téntao de novo.';
+$lang['regpwmail'] = 'O teu contrasinal do DokuWiki';
+$lang['reghere'] = 'Aínda non tes unha conta? Crea a túa';
+$lang['profna'] = 'Este wiki non permite modificacións dos perfís';
+$lang['profnochange'] = 'Non hai trocos, nada que facer.';
+$lang['profnoempty'] = 'Non se permite un nome ou un enderezo de correo-e baleiros.';
+$lang['profchanged'] = 'Perfil de usuario actualizado correctamente.';
+$lang['pwdforget'] = 'Esqueceches o teu contrasinal? Consegue un novo';
+$lang['resendna'] = 'Este wiki non permite o reenvío de contrasinais.';
+$lang['resendpwd'] = 'Enviar novo contrasinal para';
+$lang['resendpwdmissing'] = 'Sentímolo, tes que cubrir todos os campos.';
+$lang['resendpwdnouser'] = 'Sentímolo, non atopamos este usuario no noso banco de datos.';
+$lang['resendpwdbadauth'] = 'Sentímolo, mais este código de autorización non é válido. Asegúrate de que usaches a ligazón completa de confirmación.';
+$lang['resendpwdconfirm'] = 'Enviouse unha ligazón de confirmación por correo-e.';
+$lang['resendpwdsuccess'] = 'O teu novo contrasinal foi enviado por correo-e.';
+$lang['license'] = 'O contido deste wiki, agás onde se indique o contrario, ofrécese baixo da seguinte licenza:';
+$lang['licenseok'] = 'Nota: Ao editares esta páxina estás a aceptar o licenciamento do contido baixo da seguinte licenza:';
+$lang['searchmedia'] = 'Procurar nome de arquivo:';
+$lang['searchmedia_in'] = 'Procurar en %s';
+$lang['txt_upload'] = 'Escolle o arquivo para subir';
$lang['txt_filename'] = 'Subir como (opcional)';
-$lang['txt_overwrt'] = 'Sobrescribir o arquivo existente';
+$lang['txt_overwrt'] = 'Sobrescribir arquivo existente';
$lang['lockedby'] = 'Bloqueado actualmente por';
-$lang['lockexpire'] = 'O bloqueo termina o';
-$lang['willexpire'] = 'O seu bloqueo para editar esta páxina vai caducar nun minuto.\nPara de evitar conflitos, use o botón de previsualización para reiniciar o contador do tempo de bloqueo.';
-$lang['notsavedyet'] = 'Perderanse os cambios non gardados.\nEstá segura/o de que quere continuar?';
-$lang['rssfailed'] = 'Houbo un erro ao tentar obter este fío RSS: ';
-$lang['nothingfound'] = 'Non se encontrou nada.';
-$lang['mediaselect'] = 'Ficheiros multimedia';
-$lang['fileupload'] = 'Subir ficheiros multimedia';
-$lang['uploadsucc'] = 'Subiuse correctamente';
-$lang['uploadfail'] = 'Fallou ao subir. É posíbel que sexa un problema de permisos?';
-$lang['uploadwrong'] = 'Subida denegada. Esta extensión de ficheiro non está permitida!';
-$lang['uploadexist'] = 'Xa existe o ficheiro. Non se fixo nada.';
-$lang['uploadbadcontent'] = 'O contido subido non concorda coa extensión de ficheiro %s.';
-$lang['uploadspam'] = 'A subida foi bloqueada pola lista negra de correo lixo.';
+$lang['lockexpire'] = 'O bloqueo remata o';
+$lang['willexpire'] = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
+$lang['notsavedyet'] = 'Perderanse os trocos non gardados.\nEstá certo de quereres continuar?';
+$lang['rssfailed'] = 'Houbo un erro ao tentar obter esta corrente RSS: ';
+$lang['nothingfound'] = 'Non se atopou nada.';
+$lang['mediaselect'] = 'Arquivos-Media';
+$lang['fileupload'] = 'Subida de Arquivos-Media';
+$lang['uploadsucc'] = 'Subida correcta';
+$lang['uploadfail'] = 'Erra na subida. Pode que sexa un problema de permisos?';
+$lang['uploadwrong'] = 'Subida denegada. Esta extensión de arquivo non está permitida!';
+$lang['uploadexist'] = 'Xa existe o arquivo. Non se fixo nada.';
+$lang['uploadbadcontent'] = 'O contido subido non concorda coa extensión do arquivo %s.';
+$lang['uploadspam'] = 'A subida foi bloqueada pola lista negra de correo-lixo.';
$lang['uploadxss'] = 'A subida foi bloqueada por un posíbel contido malicioso.';
-$lang['uploadsize'] = 'O ficheiro subido é grande de máis. (máx. %s)';
-$lang['deletesucc'] = 'O ficheiro "%s" foi eliminado.';
-$lang['deletefail'] = '"%s" non puido ser eliminado - comprobe os permisos.';
-$lang['mediainuse'] = 'O ficheiro "%s" non foi eliminado - aínda está en uso.';
+$lang['uploadsize'] = 'O arquivo subido é grande de máis. (máx. %s)';
+$lang['deletesucc'] = 'O arquivo "%s" foi eliminado.';
+$lang['deletefail'] = '"%s" non puido ser eliminado - comproba os permisos.';
+$lang['mediainuse'] = 'O arquivo "%s" non foi eliminado - aínda está en uso.';
$lang['namespaces'] = 'Nomes de espazos';
-$lang['mediafiles'] = 'Ficheiro dispoñíbeis en';
-$lang['js']['searchmedia'] = 'Buscar ficheiros';
-$lang['js']['keepopen'] = 'Manter a xanela aberta na selección';
-$lang['js']['hidedetails'] = 'Ocultar os detalles';
-$lang['js']['nosmblinks'] = 'A ligazón aos compartidos do Windows só funciona co Microsoft Internet Explorer.
+$lang['mediafiles'] = 'Arquivos dispoñíbeis en';
+$lang['js']['searchmedia'] = 'Procurar ficheiros';
+$lang['js']['keepopen'] = 'Manter a fiestra aberta na selección';
+$lang['js']['hidedetails'] = 'Agochar Pormenores';
+$lang['js']['nosmblinks'] = 'A ligazón aos compartidos do Windows só funciona no Microsoft Internet Explorer.
Sempre podes copiar e colar a ligazón.';
$lang['js']['linkwiz'] = 'Asistente de ligazóns';
-$lang['js']['linkto'] = 'Ligazón a:';
-$lang['js']['del_confirm'] = 'Quere eliminar os elementos seleccionados?';
-$lang['js']['mu_btn'] = 'Subir varios ficheiros dunha vez';
-$lang['mediausage'] = 'Utilice a seguinte sintaxe para referenciar este ficheiro:';
-$lang['mediaview'] = 'Ver o ficheiro orixinal';
-$lang['mediaroot'] = 'raíz';
-$lang['mediaupload'] = 'Suba aquí un ficheiro ao nome de espazo actual. Para crear subnomes de espazos deberá engadilos ao principio do seu nome de ficheiro en "Subir como", separados por dous puntos.';
-$lang['mediaextchange'] = 'A extensión de ficheiro foi alterada de .%s a .%s!';
+$lang['js']['linkto'] = 'Ligazón para:';
+$lang['js']['del_confirm'] = 'Estás certo de quereres eliminar os elementos seleccionados?';
+$lang['js']['mu_btn'] = 'Subir varios arquivos de vez';
+$lang['mediausage'] = 'Emprega a seguinte sintaxe para inserires unha referencia a este arquivo:';
+$lang['mediaview'] = 'Ver arquivo orixinal';
+$lang['mediaroot'] = 'raigaña';
+$lang['mediaupload'] = 'Sube aquí un arquivo ao nome de espazo actual. Para creares sub-nomes de espazos deberás antepoñelos ao nome indicado en "Subir como" separados por dous puntos.';
+$lang['mediaextchange'] = 'Extensión de arquivo mudada de .%s a .%s!';
$lang['reference'] = 'Referencias para';
-$lang['ref_inuse'] = 'O ficheiro non pode ser eliminado, xa que aínda está a ser usado polas seguintes páxinas:';
-$lang['ref_hidden'] = 'Algunhas referencias están en páxinas para as cales non ten permisos de lectura';
-$lang['hits'] = 'Visualizacións';
+$lang['ref_inuse'] = 'O arquivo non pode ser eliminado, xa que aínda está a ser usado polas seguintes páxinas:';
+$lang['ref_hidden'] = 'Algunhas referencias están en páxinas para as cales non tes permisos de lectura';
+$lang['hits'] = 'Vistas';
$lang['quickhits'] = 'Nomes de páxinas coincidentes';
-$lang['toc'] = 'Táboa de contidos';
+$lang['toc'] = 'Táboa de Contidos';
$lang['current'] = 'actual';
-$lang['yours'] = 'A súa versión';
-$lang['diff'] = 'Mostrar as diferenzas coa versión actual';
-$lang['diff2'] = 'Mostrar as diferenzas entre as revisións seleccionadas';
+$lang['yours'] = 'A túa Versión';
+$lang['diff'] = 'Amosar diferenzas coa versión actual';
+$lang['diff2'] = 'Amosar diferenzas entre as revisións seleccionadas';
$lang['line'] = 'Liña';
$lang['breadcrumb'] = 'Trazado';
-$lang['youarehere'] = 'Vostede está aquí';
+$lang['youarehere'] = 'Estás aquí';
$lang['lastmod'] = 'Última modificación';
$lang['by'] = 'por';
$lang['deleted'] = 'eliminado';
$lang['created'] = 'creado';
-$lang['restored'] = 'a revisión antiga foi restaurada';
+$lang['restored'] = 'revisión antiga restaurada';
$lang['external_edit'] = 'edición externa';
$lang['summary'] = 'Resumo da edición';
-$lang['noflash'] = 'Precísase o <a href="http://www.adobe.com/products/flashplayer/">Plugin Adobe Flash</a> para mostrar este contido.';
+$lang['noflash'] = 'Precísase o <a href="http://www.adobe.com/products/flashplayer/">Extensión Adobe Flash</a> para amosar este contido.';
$lang['mail_newpage'] = 'páxina engadida:';
-$lang['mail_changed'] = 'páxina alterada:';
-$lang['mail_new_user'] = 'Persoa usuaria nova:';
-$lang['mail_upload'] = 'ficheiro subido:';
-$lang['qb_bold'] = 'Texto en negra';
-$lang['qb_italic'] = 'Texto en cursiva';
-$lang['qb_underl'] = 'Texto subliñado';
-$lang['qb_code'] = 'Texto de código';
-$lang['qb_strike'] = 'Texto riscado';
-$lang['qb_h1'] = 'Título de nivel 1';
-$lang['qb_h2'] = 'Título de nivel 2';
-$lang['qb_h3'] = 'Título de nivel 3';
-$lang['qb_h4'] = 'Título de nivel 4';
-$lang['qb_h5'] = 'Título de nivel 5';
-$lang['qb_link'] = 'Ligazón interna';
-$lang['qb_extlink'] = 'Ligazón externa';
-$lang['qb_hr'] = 'Liña horizontal';
-$lang['qb_ol'] = 'Elemento de lista ordenada';
-$lang['qb_ul'] = 'Elemento de lista desordenada';
-$lang['qb_media'] = 'Engadir imaxes e outros ficheiros';
-$lang['qb_sig'] = 'Inserir unha sinatura';
-$lang['qb_smileys'] = 'Emoticonas';
-$lang['qb_chars'] = 'Caracteres especiais';
-$lang['admin_register'] = 'Engadir unha persoa usuaria nova';
-$lang['metaedit'] = 'Editar os metadatos';
+$lang['mail_changed'] = 'páxina mudada:';
+$lang['mail_new_user'] = 'Novo usuario:';
+$lang['mail_upload'] = 'arquivo subido:';
+$lang['qb_bold'] = 'Texto Resaltado';
+$lang['qb_italic'] = 'Texto en Cursiva';
+$lang['qb_underl'] = 'Texto Subliñado';
+$lang['qb_code'] = 'Texto de Código';
+$lang['qb_strike'] = 'Texto Riscado';
+$lang['qb_h1'] = 'Liña de Cabeceira de Nivel 1';
+$lang['qb_h2'] = 'Liña de Cabeceira de Nivel 2';
+$lang['qb_h3'] = 'Liña de Cabeceira de Nivel 3';
+$lang['qb_h4'] = 'Liña de Cabeceira de Nivel 4';
+$lang['qb_h5'] = 'Liña de Cabeceira de Nivel 5';
+$lang['qb_link'] = 'Ligazón Interna';
+$lang['qb_extlink'] = 'Ligazón Externa';
+$lang['qb_hr'] = 'Liña Horizontal';
+$lang['qb_ol'] = 'Elemento de Lista Ordenada';
+$lang['qb_ul'] = 'Elemento de Lista Desordenada';
+$lang['qb_media'] = 'Engadir Imaxes e Outros Arquivos';
+$lang['qb_sig'] = 'Inserir Sinatura';
+$lang['qb_smileys'] = 'Risoños';
+$lang['qb_chars'] = 'Caracteres Especiais';
+$lang['admin_register'] = 'Engadir novo usuario';
+$lang['metaedit'] = 'Editar Metadatos';
$lang['metasaveerr'] = 'Non se puideron escribir os metadatos';
-$lang['metasaveok'] = 'Os metadatos foron gardados';
+$lang['metasaveok'] = 'Metadatos gardados';
$lang['img_backto'] = 'Volver a';
$lang['img_title'] = 'Título';
$lang['img_caption'] = 'Lenda';
$lang['img_date'] = 'Data';
-$lang['img_fname'] = 'Nome do ficheiro';
+$lang['img_fname'] = 'Nome de arquivo';
$lang['img_fsize'] = 'Tamaño';
-$lang['img_artist'] = 'Fotógrafa/o';
+$lang['img_artist'] = 'Fotógrafo';
$lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Cámara';
-$lang['img_keywords'] = 'Palabras chave';
-$lang['subscribe_success'] = '%s foi engadido á lista de subscrición de cambios de %s';
-$lang['subscribe_error'] = 'Erro ao tentar engadir %s á lista de subscrición de cambios de %s';
-$lang['subscribe_noaddress'] = 'Non hai ningún enderezo asociado ao seu nome de persoa usuaria: non pode ser engadida/o á lista de subscrición';
-$lang['unsubscribe_success'] = 'Eliminouse %s da lista de subscrición de cambios de %s';
-$lang['unsubscribe_error'] = 'Erro ao tentar eliminar %s da lista de subscrición de cambios de %s';
-$lang['authmodfailed'] = 'A configuración de autenticación de persoa usuaria é incorrecta. Informe á persoa administradora do seu Wiki.';
-$lang['authtempfail'] = 'A autenticación de persoa usuaria non está dispoñíbel de modo temporal. Se esta situación persiste informe á persoa administradora do seu Wiki.';
-$lang['i_chooselang'] = 'Seleccione o seu idioma';
+$lang['img_keywords'] = 'Verbas chave';
+$lang['authmodfailed'] = 'Configuración de autenticación de usuario incorrecta. Por favor, informa ao Administrador do teu Wiki.';
+$lang['authtempfail'] = 'A autenticación de usuario non está dispoñible de xeito temporal. De persistir esta situación, por favor, informa ao Administrador do teu Wiki.';
+$lang['i_chooselang'] = 'Escolle o teu idioma';
$lang['i_installer'] = 'Instalador do DokuWiki';
$lang['i_wikiname'] = 'Nome do Wiki';
-$lang['i_enableacl'] = 'Activar o lista de control de acceso (ACL) (recomendado)';
-$lang['i_superuser'] = 'Superusuaria/o';
-$lang['i_problems'] = 'O instalador encontrou algúns problemas que se mostran a continuación. Non poderá continuar até que os solucione.';
+$lang['i_enableacl'] = 'Activar ACL (recomendado)';
+$lang['i_superuser'] = 'Super-usuario';
+$lang['i_problems'] = 'O instalador atopou algúns problemas, que se amosan de seguido. Non poderás continuar até que os soluciones.';
$lang['i_modified'] = 'Por razóns de seguridade este script só funcionará cunha instalación nova e sen modificar do Dokuwiki.
- Pode ou ben extraer de novo os ficheiros desde o paquete descargado ou consultar as
+ Podes ou ben extraer de novo os arquivos dende o paquete descargado ou consultar as
<a href="http://dokuwiki.org/install">instruccións completas de instalación do Dokuwiki</a>';
-$lang['i_funcna'] = 'A función <code>%s</code> de PHP non está dispoñíbel. Pode que o seu provedor de hospedaxe a desactivase por algún motivo.';
-$lang['i_phpver'] = 'A súa versión <code>%s</code> de PHP é inferior á <code>%s</code> precisa. Debe actualizar a súa instalación de PHP.';
-$lang['i_permfail'] = '<code>%s</code> non é escribíbel polo DokuWiki. Debe corrixir a configuración de permisos deste directorio!';
+$lang['i_funcna'] = 'A función <code>%s</code> do PHP non está dispoñíbel. Pode que o teu provedor de hospedaxe a desactivase por algún motivo?';
+$lang['i_phpver'] = 'A túa versión <code>%s</code> do PHP é inferior á <code>%s</code> precisa. Debes actualizar a túa instalación do PHP.';
+$lang['i_permfail'] = '<code>%s</code> non é escribíbel polo DokuWiki. Debes corrixir a configuración de permisos deste directorio!';
$lang['i_confexists'] = '<code>%s</code> xa existe';
-$lang['i_writeerr'] = 'Non se puido crear <code>%s</code>. Terá que comprobar os permisos do directorio/ficheiro e crear o ficheiro de modo manual.';
-$lang['i_badhash'] = 'dokuwiki.php é irrecoñecíbel ou foi modificado (hash=<code>%s</code>)';
+$lang['i_writeerr'] = 'Non se puido crear <code>%s</code>. Terás de comprobar os permisos do directorio/arquivo e crear o ficheiro de xeito manual.';
+$lang['i_badhash'] = 'dokuwiki.php irrecoñecíbel ou modificado (hash=<code>%s</code>)';
$lang['i_badval'] = '<code>%s</code> - ilegal ou valor baleiro';
-$lang['i_success'] = 'A configuración terminou correctamente. Agora pode borrar o ficheiro install.php. Continúe até o
- <a href="doku.php">seu novo DokuWiki</a>.';
-$lang['i_failure'] = 'Houbo algúns erros ao tentar escribir os ficheiros de configuración. Pode que precise solucionalos de mod manual antes
- de que poder usar <a href="doku.php">o seu novo DokuWiki</a>.';
+$lang['i_success'] = 'A configuración rematou correctamente. Agora podes eliminar o arquivo install.php. Continúa deica o
+ <a href="doku.php">teu novo DokuWiki</a>.';
+$lang['i_failure'] = 'Houbo algúns erros ao tentar escribir os arquivos de configuración. Pode que precises solucionalos de xeito manual antes
+ de poderes empregar <a href="doku.php">o teu novo DokuWiki</a>.';
$lang['i_policy'] = 'Regras iniciais da ACL';
-$lang['i_pol0'] = 'Wiki aberto (lectura, escritura, subida de arquivos para todas as persoas)';
-$lang['i_pol1'] = 'Wiki público (lectura para todas as persoas, escritura e subida de ficheiros para as persoas usuarias rexistradas)';
-$lang['i_pol2'] = 'Wiki pechado (lectura, escritura, subida de arquivos só para as persoas usuarias rexistradas)';
+$lang['i_pol0'] = 'Wiki Aberto (lectura, escritura, subida de arquivos para todas as persoas)';
+$lang['i_pol1'] = 'Wiki Público (lectura para todas as persoas, escritura e subida de arquivos para usuarios rexistrados)';
+$lang['i_pol2'] = 'Wiki Fechado (lectura, escritura, subida de arquivos só para usuarios rexistrados)';
$lang['i_retry'] = 'Tentar de novo';
-$lang['mu_intro'] = 'Aquí podes subir varios ficheiros dunha vez. Preme o botón Examinar para engadilos á fila. Preme en Subir cando remates.';
-$lang['mu_gridname'] = 'Nome do ficheiro';
+$lang['mu_intro'] = 'Aquí podes subir varios arquivos de vez. Preme o botón Navegar para engadilos á cola. Preme en Subir cando remates.';
+$lang['mu_gridname'] = 'Nome de Arquivo';
$lang['mu_gridsize'] = 'Tamaño';
$lang['mu_gridstat'] = 'Estado';
-$lang['mu_namespace'] = 'Nome de espazo';
-$lang['mu_browse'] = 'Examinar';
-$lang['mu_toobig'] = 'demasiado grande';
-$lang['mu_ready'] = 'listo para subir';
+$lang['mu_namespace'] = 'Nome de Espazo';
+$lang['mu_browse'] = 'Navegar';
+$lang['mu_toobig'] = 'grande de máis';
+$lang['mu_ready'] = 'disposto para subir';
$lang['mu_done'] = 'feito';
$lang['mu_fail'] = 'fallou';
-$lang['mu_authfail'] = 'a sesión caducou';
+$lang['mu_authfail'] = 'sesión expirada';
$lang['mu_progress'] = '@PCT@% subido';
-$lang['mu_filetypes'] = 'Tipos de ficheiro permitidos';
-$lang['mu_info'] = 'ficheiros subidos.';
+$lang['mu_filetypes'] = 'Tipos de arquivo Permitidos';
+$lang['mu_info'] = 'arquivos subidos.';
$lang['mu_lasterr'] = 'Último erro:';
-$lang['recent_global'] = 'Agora mesmo está a ver os cambios no nome de espazo <b>%s</b>. Tamén pode <a href="%s">ver os cambios recentes en todo o Wiki</a>.';
+$lang['recent_global'] = 'Agora mesmo estás a ver os trocos no nome de espazo <b>%s</b>. Tamén podes <a href="%s">ver os trocos recentes no Wiki enteiro</a>.';
$lang['years'] = 'hai %d anos';
$lang['months'] = 'hai %d meses';
$lang['weeks'] = 'hai %d semanas';
diff --git a/inc/lang/gl/locked.txt b/inc/lang/gl/locked.txt
index 14240335e..90f9ab082 100644
--- a/inc/lang/gl/locked.txt
+++ b/inc/lang/gl/locked.txt
@@ -1,3 +1,3 @@
====== Páxina bloqueada ======
-Esta páxina está actualmente bloqueada para a edición por outra persoa usuaria. Terá que agardar até que esa persoa usuaria termine de editar a páxina ou a que expire o bloqueo.
+Esta páxina está actualmente bloqueada para a edición por outro usuario. Terás que agardar até que este usuario remate coa edición ou a que expire o bloqueo.
diff --git a/inc/lang/gl/login.txt b/inc/lang/gl/login.txt
index 11719de50..506b30c6a 100644
--- a/inc/lang/gl/login.txt
+++ b/inc/lang/gl/login.txt
@@ -1,4 +1,4 @@
-====== Inicio de sesión ======
+====== Inicio de Sesión ======
-Actualmente non ten unha sesión iniciada! Insira as súas credenciais de autenticación para iniciar a sesión. Debe ter as cookies activadas para poder iniciar unha sesión.
+Actualmente non iniciaches sesión ningunha! Insire as túas credenciais de identificación para iniciares a sesión. Debes ter as cookies activadas para poderes iniciar unha sesión.
diff --git a/inc/lang/gl/mailtext.txt b/inc/lang/gl/mailtext.txt
index f7c06bc83..a6799d697 100644
--- a/inc/lang/gl/mailtext.txt
+++ b/inc/lang/gl/mailtext.txt
@@ -1,13 +1,13 @@
-Engadiuse ou modificouse unha páxina do seu DokuWiki. Aquí van os detalles:
+Engadiuse ou mudouse unha páxina no teu DokuWiki. Aquí van os pormenores:
Data : @DATE@
Navegador : @BROWSER@
Enderezo IP : @IPADDRESS@
-Nome do host : @HOSTNAME@
-Revisión antiga : @OLDPAGE@
-Revision nova : @NEWPAGE@
-Resumo da edición : @SUMMARY@
-Usuaria/o : @USER@
+Nome do Host : @HOSTNAME@
+Revisión Antiga : @OLDPAGE@
+Revision Nova : @NEWPAGE@
+Resumo da Edición : @SUMMARY@
+Usuario : @USER@
@DIFF@
diff --git a/inc/lang/gl/newpage.txt b/inc/lang/gl/newpage.txt
index c79ef6a41..c073f1194 100644
--- a/inc/lang/gl/newpage.txt
+++ b/inc/lang/gl/newpage.txt
@@ -1,4 +1,4 @@
====== Este tema aínda non existe ======
-Seguiu unha ligazón até un tema que aínda non existe. Se ten os permisos adecuados, pode creala vostede premendo no botón ''Crear esta páxina''.
+Seguiches unha ligazón deica un tema que aínda non existe. Se tes permisos axeitados, podes crealo ti premendo no botón ''Crear esta páxina''.
diff --git a/inc/lang/gl/norev.txt b/inc/lang/gl/norev.txt
index dd6027165..af7383da8 100644
--- a/inc/lang/gl/norev.txt
+++ b/inc/lang/gl/norev.txt
@@ -1,4 +1,4 @@
-====== Non existe esa revisión ======
+======Non hai tal revisión======
-A revisión especificada non existe. Utilice o botón ''Revisións antigas'' para obter un listado das revisións antigas deste documento.
+A revisión especificada non existe. Utiliza o botón de ''Revisións Antigas'' para obteres unha listaxe das revisións antigas deste documento.
diff --git a/inc/lang/gl/password.txt b/inc/lang/gl/password.txt
index 3e69b6cca..652a55828 100644
--- a/inc/lang/gl/password.txt
+++ b/inc/lang/gl/password.txt
@@ -1,9 +1,9 @@
-Benvida/o @FULLNAME@!
+Ola @FULLNAME@!
-Aquí ten os seus datos de persoa usuaria para @TITLE@ en @DOKUWIKIURL@
+Aquí tes os teus datos de usuario para @TITLE@ en @DOKUWIKIURL@
-Nome de usuaria/o: @LOGIN@
-Contrasinal: @PASSWORD@
+Usuario : @LOGIN@
+Contrasinal : @PASSWORD@
--
Este correo foi xerado polo DokuWiki en
diff --git a/inc/lang/gl/preview.txt b/inc/lang/gl/preview.txt
index 01cc41dcc..e0f749ff0 100644
--- a/inc/lang/gl/preview.txt
+++ b/inc/lang/gl/preview.txt
@@ -1,4 +1,4 @@
====== Previsualización ======
-Isto é unha previsualización de como aparecerá o seu texto. Lembre: **Aínda non está gardado!**
+Isto é unha previsualización de como aparecerá o teu texto. Lembra: **Non está gardado** aínda!
diff --git a/inc/lang/gl/pwconfirm.txt b/inc/lang/gl/pwconfirm.txt
index e020790d3..ef20212ff 100644
--- a/inc/lang/gl/pwconfirm.txt
+++ b/inc/lang/gl/pwconfirm.txt
@@ -1,15 +1,15 @@
Ola @FULLNAME@!
-Alguén solicitou un contrasinal novo para o seu inicio de sesión no
+Alguén solicitou un novo contrasinal para o teu inicio de sesión
@TITLE@ en @DOKUWIKIURL@
-Se non foi vostede quen o solicitou pode ignorar este correo.
+Se non fuches ti quen o fixo podes ignorar este correo-e.
-Para confirmar que esta solicitude foi realmente enviada por vostede
-por favor, visite a seguinte ligazón.
+Para confirmares que esta solicitude foi realmente enviada por ti,
+por favor, visita a seguinte ligazón.
@CONFIRM@
---
-Este correo foi xerador polo DokuWiki de
+--
+Este correo-e foi xerado polo DokuWiki de
@DOKUWIKIURL@
diff --git a/inc/lang/gl/read.txt b/inc/lang/gl/read.txt
index 912864c31..28f3e1a95 100644
--- a/inc/lang/gl/read.txt
+++ b/inc/lang/gl/read.txt
@@ -1,2 +1,2 @@
-Esta páxina é só de lectura. Podes ver o código fonte, mais non pode alterala. Coméntello á persoa administradora se considera que é un erro.
+Esta páxina é só de lectura. Podes ver o código fonte, mais non podes mudala. Coméntallo ao teu administrador se consideras que é un erro.
diff --git a/inc/lang/gl/recent.txt b/inc/lang/gl/recent.txt
index 93f8632dd..622e4d938 100644
--- a/inc/lang/gl/recent.txt
+++ b/inc/lang/gl/recent.txt
@@ -1,5 +1,5 @@
-====== Cambios recentes ======
+====== Trocos Recentes ======
-As seguintes páxinas foron cambiadas recentemente.
+As seguintes páxinas foron mudadas recentemente.
diff --git a/inc/lang/gl/register.txt b/inc/lang/gl/register.txt
index 17d9e0ff4..4f51f3878 100644
--- a/inc/lang/gl/register.txt
+++ b/inc/lang/gl/register.txt
@@ -1,4 +1,4 @@
-====== Rexistro como persoa usuaria nova ======
+====== Rexistro como novo usuario ======
-Encha toda a información requirida a continuación para crear unha conta nova neste wiki. Asegúrese de proporcionar un **enderezo de correo electrónico válido** - se non se lle solicita aquí que insira un contrasinal, recibirá un contrasinal novo nese enderezo. O nome de persoa usuaria deberá ser un [[doku>pagename|nome de páxina]] válido.
+Cubre toda a información requirida a continuación para creares unha nova conta neste wiki. Asegúrate de forneceres un **enderezo de correo-e válido** - se non se che pide aquí que insiras un contrasinal, recibirás un novo nese enderezo. O nome de usuario deberá ser un [[doku>pagename|nome de páxina]] válido.
diff --git a/inc/lang/gl/registermail.txt b/inc/lang/gl/registermail.txt
index e02fe1a1c..7d4017481 100644
--- a/inc/lang/gl/registermail.txt
+++ b/inc/lang/gl/registermail.txt
@@ -1,14 +1,14 @@
-Rexistrouse unha persoa usuaria nova. Estes son os detalles:
+Rexistrouse un novo usuario. Aquí van os pormenores:
-Nome de usuaria/o : @NEWUSER@
-Nome completo : @NEWNAME@
-Correo : @NEWEMAIL@
+Nome de usuario : @NEWUSER@
+Nome completo : @NEWNAME@
+Correo-e : @NEWEMAIL@
-Data : @DATE@
-Navegador : @BROWSER@
-Enderezo IP : @IPADDRESS@
-Nome do host : @HOSTNAME@
+Data : @DATE@
+Navegador : @BROWSER@
+Enderezo IP : @IPADDRESS@
+Nome do Host : @HOSTNAME@
--
-Este correo foi xerado polo DokuWiki de
+Este correo-e foi xerado polo DokuWiki de
@DOKUWIKIURL@
diff --git a/inc/lang/gl/resendpwd.txt b/inc/lang/gl/resendpwd.txt
index eb8cf4835..0ee2d6cb4 100644
--- a/inc/lang/gl/resendpwd.txt
+++ b/inc/lang/gl/resendpwd.txt
@@ -1,3 +1,3 @@
-====== Enviar un contrasinal novo ======
+====== Enviar novo contrasinal ======
-Insira o seu nome de persoa usuaria no seguinte formulario para obter un contrasinal novo para a súa conta neste wiki. Enviarase unha ligazón de confirmación ao seu enderezo de correo rexistrado.
+Insire o teu nome de usuario no seguinte formulario para obteres un novo contrasinal da túa conta neste wiki. Enviarase unha ligazón de confirmación ao teu enderezo rexistrado de correo-e.
diff --git a/inc/lang/gl/revisions.txt b/inc/lang/gl/revisions.txt
index a08b54685..3d5cccd7f 100644
--- a/inc/lang/gl/revisions.txt
+++ b/inc/lang/gl/revisions.txt
@@ -1,4 +1,4 @@
-====== Revisións antigas ======
+======Revisións Antigas======
-Estas son as revisións antigas do documento actual. Para retomar unha revisión antiga: selecciónea na seguinte lista, prema en ''Editar esta páxina'' e gárdea.
+Estas son as revisións antigas do documento actual. Para retomar unha revisión antiga selecciónaa na seguinte lista, preme en ''Editar esta páxina'' e gárdaa.
diff --git a/inc/lang/gl/searchpage.txt b/inc/lang/gl/searchpage.txt
index 7157cdcbf..227ca5dbc 100644
--- a/inc/lang/gl/searchpage.txt
+++ b/inc/lang/gl/searchpage.txt
@@ -1,5 +1,5 @@
-====== Procurar ======
+====== Procura ======
-Podes encontrar os resultados da súa procura a continuación. Se non encontrou o que estaba a procurar, pode crear ou editar a páxina co nome relacionado coa súa procura co botón axeitado.
+Podes atopar os resultados da túa procura a continuación. Se non atopaches o que estabas a procurar, podes crear ou editar a páxina co nome relacionado coa túa procura empregando o botón axeitado.
===== Resultados =====
diff --git a/inc/lang/gl/stopwords.txt b/inc/lang/gl/stopwords.txt
index c262147f8..5520cd275 100644
--- a/inc/lang/gl/stopwords.txt
+++ b/inc/lang/gl/stopwords.txt
@@ -1,246 +1,692 @@
-# Isto é unha listaxe das palabras que o indexador ignora (stopwords); unha por liña
-# Cando edite este ficheiro asegúrese de usar os fins de liña UNIX (nova liña única)
-# Non precisa incluír palabras de menos de 3 caracteres - estas son ignoradas de todas as formas
-# Esta listaxe está baseada nas encontradas en http://www.ranks.nl/stopwords/ (aínda en proceso)
-# Actualizouse a listaxe a partir as stopwords dispoñibilizadas por Paulo Malvar en:
-# http://d108.dinaserver.com/hosting/paulomalvar.com/Paulo_Malvar_personal_webpage/Resources_files/Galician_single_and_multiword_stopwords_Verbal_Periphrases_and_Abbreviations.tgz
-# e tamén as listaxes de palabras gramaticais na Galipedia: http://gl.wikipedia.org/wiki/Categoría_gramatical
-abaixo
-acerca
+# Isto é unha lista das verbas que o indexador ignora, unha por liña
+# Cando edites este arquivo asegúrate de usar remates de liña UNIX (nova liña única)
+# Non precisas incluír verbas de menos de 3 caracteres - estas son ignoradas de todas formas
+# Esta lista está baseada nas atopadas en http://www.ranks.nl/stopwords/ (en proceso aínda)
+aberto
+abonda
+abrir
+acabo
+acceder
+acceso
+acordo
+actitude
+actividade
+actividades
+actual
+actualización
+actualizar
+actualmente
ademais
+ademáis
+adiante
+agardar
+agora
agás
+ainda
aínda
-alén
-algún
+aiquí
+algo
+alguen
+algun
algunha
algunhas
+alguén
+algún
algúns
-amais
+alta
+amigos
+ando
+anima
+anos
ante
+anterior
+anteriores
antes
-após
-aquel
-aquela
-aquelas
-aqueles
-aquén
-aquilo
-arredor
-bardante
-beira
-canda
+aparece
+aparecen
+apartado
+aperta
+apertas
+apoio
+aqui
+aquí
+arquivo
+arquivos
+artigo
+artigos
+asunto
+atención
+atopar
+atopei
+axuda
+axudar
+baixo
+banda
+base
+bastante
+benvido
+boas
+botar
+buscador
+buscar
+cabo
+cada
+cadra
+caixa
+cales
+calidade
+calquer
+calquera
+cambio
+camiño
+campanha
+campaña
+campañas
+campo
cando
+cantidade
canto
-carón
-causa
-cerca
+cantos
+cara
+carallo
+cartos
+casa
+case
+caso
+casos
+catro
+centro
+certo
+chea
+chega
+chegar
+chisco
+cidade
+civil
+claro
+coas
+coido
+colaboración
+colaborar
+coma
+comentar
+comentario
+comentarios
+comezar
como
+comunicación
+comunidade
+común
+concreto
+condicións
conforme
-consonte
+conseguir
+conta
+contactar
+contacto
+contas
+contido
+contidos
contra
+contrario
+control
+copia
+correcto
+correio
+correo
+correoe
+correos
+correspondente
+cousa
+cousas
+coñecemento
+coñezo
+crear
+creo
+cuestión
+cuestións
+cunha
+curioso
+dabondo
+dacordo
+dados
+darlle
+data
+datos
+debate
+debe
+debemos
+deben
+deberiamos
+debería
+decidir
+decisión
+defecto
+defensa
deica
-dela
-delas
+deixa
+deixar
+deixo
deles
+demais
+demasiado
+demáis
dende
-derredor
-derriba
+dentro
+dereitos
desde
+dese
+deseño
despois
+desta
+deste
+destes
+diante
+dias
+dicir
+diferentes
+difícil
+digo
+dirección
+directamente
+directorio
+discusión
+discutir
+distintas
+distintos
+distribución
+dixen
+dixo
+doado
+dous
+duas
+dunha
durante
-elas
+días
+dúas
+dúbida
+efectivamente
+eiqui
+eiquí
eles
+eliminar
+email
+empregar
+emprego
+empresa
+empresas
+enderezo
+enderezos
+engadir
+enlace
+enquisa
+enriba
+entendo
+entidades
+entrada
+entrar
entre
-erades
-eramos
+entón
+enviar
+envio
eran
-eras
+erro
+erros
esas
+escribir
eses
+especial
+especialmente
+espero
esta
-está
estaba
-estabades
-estabamos
-estaban
estades
+estado
estamos
-están
+estan
+estar
+estaría
estas
este
estea
-esteades
-esteamos
-estean
-esteas
estes
-estivemos
+estilo
estiven
-estiver
-estivera
-estiveramos
-estiveran
-estiverdes
-estiveren
-estivermos
-estivese
-estivesemos
-estivesen
-estivo
+esto
estou
-excepto
-fomos
+está
+están
+estás
+evidentemente
+evitar
+exactamente
+exemplo
+existe
+facelo
+facemos
+facendo
+facer
+faga
+fagan
+fago
+fala
+falamos
+falando
+falar
+falla
+falo
+falta
+favor
+fazer
+feita
+feito
+ferreira
+final
+finalmente
+fios
+fixen
+fixo
+fondo
fora
-foramos
-foran
-fordes
-foren
-formos
+forma
+formas
+foro
+foron
+foros
fose
-fosedes
-fosemos
-fosen
-habemos
+fotos
+funciona
+funcionamento
+futuro
+fóra
+gracias
+gran
+grande
+grandes
+grazas
+grupo
+grupos
+gusta
+haber
haberá
-haberán
-haberedes
-haberei
-haberemos
habería
-haberíades
-haberíamos
+había
haxa
-haxades
-haxamos
-haxan
-haxas
-houbemos
-houben
-houber
-houbera
-houberades
-houberamos
-houberan
-houberemos
-houberen
-houberían
-houbermos
+historia
+home
+hora
+horas
houbese
-houbesedes
-houbesemos
-houbesen
houbo
+hoxe
+idea
+ideas
+ideia
+igual
+imos
+importancia
+importante
+importantes
+inda
+info
+información
+informar
+informe
+inicial
+iniciativa
+inicio
+intención
+interesa
+interesante
+interese
+iste
isto
+lado
+lembro
+letras
+leva
+levamos
+levar
+libre
+libro
+lista
+listas
+liña
+liñas
lles
+local
logo
+longo
+lugar
+lugo
+maior
+maiores
+maioría
mais
-máis
-malia
+mandar
+maneira
+manter
+marcha
+material
+mañá
+media
mediante
+medida
+medio
+mellor
+membros
menos
+mensaxe
+mensaxes
+mentres
+menú
+mesa
+meses
+mesma
mesmo
+mesmos
+meter
meus
+milhor
+millor
+minha
+mirar
miña
-miñas
+modificar
+moita
+moitas
moito
+moitos
+momento
+mudar
+mundo
+máis
+mínimo
+nada
+nbsp
+necesario
+necesidade
+nese
+nesta
+neste
+nestes
+ningunha
+ninguén
+ningún
+noite
+nome
+normal
nosa
nosas
noso
nosos
+nota
+nova
+novas
+novo
+novos
+nunca
nunha
-onda
+número
+ofrece
+ofrecer
+ollo
+onde
+onte
+oops
+opción
+opcións
+opinión
+orixinal
outra
+outras
outro
+outros
+paga
+palabras
para
-perante
+parabens
+parece
+pareceme
+parte
+partes
+participación
+participar
+partido
+paréceme
+pasa
+pasado
+pasar
+paso
+pedir
+pena
+pendente
+pendentes
+pensades
+pensando
+pensar
+penso
+pequena
+pequeno
+perfectamente
+perfecto
+permite
pero
+persoa
+persoal
+persoas
+pode
+podedes
+podemos
+poden
+poder
+poderiamos
+podería
+poderíamos
+podes
+podo
+poida
+poidan
pois
pola
polas
polo
polos
por
-porén
porque
+porén
+posibel
+posibilidade
+posibilidades
+posible
+posta
+posto
+pouco
+poucos
+poñer
+precisamente
+preciso
+pregos
+pregunta
+presente
+primeira
+primeiro
+principal
+principio
+proba
+probar
+probas
+problema
+problemas
+proceso
prol
+propia
+propio
+proposta
+propostas
+propoño
+propoñovos
+proxecto
+proxectos
+publicar
+punto
+pódese
+queda
+quedar
+quedou
+queira
quen
-redor
-rente
+quere
+queredes
+queremos
+queren
+queres
+quero
+quizáis
+quot
+razón
+real
+realidade
+realmente
+recibir
+referencia
+relación
+rematar
+remate
respecto
-sacado
-sacando
-salvante
-salvo
+resposta
+respostar
+respostas
+resto
+resulta
+resultado
+revisar
+revisión
+riba
+sabe
+sabedes
+saber
+sacar
+saúdo
+saúdos
+segue
+seguinte
+seguintes
+seguir
+segunda
+segundo
+seguramente
+seguro
+seica
+semana
+semanas
+semella
+semellante
+sempre
+sendo
+senon
+sentido
senón
+seria
+serie
será
serán
-serás
-seredes
-serei
-seremos
sería
-seríamos
-serían
seus
sexa
-sexades
-sexamos
sexan
-sexas
+similar
+simplemente
+sitio
+sitios
+situación
+soamente
sobre
-sodes
+solución
somos
+suas
+superior
+suponho
+suposto
+supoño
+sábado
súas
+tamen
+tampouco
tamén
+tanto
+tarde
tedes
temos
+tempo
+tempos
+tendo
+tenho
+tentar
+tería
teña
-teñades
teñamos
teñan
-teñas
+teñen
teño
-terá
-terán
-terás
-teredes
-terei
-teremos
-tería
-teriades
-teriamos
-terían
-terías
-teus
-tiña
-tiñades
-tiñamos
-tiñan
-tiñas
-tiveches
-tivemos
+timos
+tipo
tiven
-tiver
-tivera
-tiverades
-tiveramos
-tiveran
-tiveras
-tiverdes
-tiveren
-tivermos
-tivese
-tivesedes
-tivesemos
-tivesen
-tiveses
-tivestes
-tivo
+tiña
+toda
+todas
todo
+todos
+tomar
+total
+totalmente
+trabalho
+traballando
+traballar
+traballo
+traballos
tras
+trata
través
-túas
+tres
+troco
+trocos
+troques
+tódalas
+tódolos
+última
+último
+últimos
unha
unhas
-vostede
-vostedes
+única
+únicamente
+únicousar
+usuario
+usuarios
+utilizar
+vaia
+vale
+vamos
+varias
+varios
+veces
+verdade
+vexo
+veño
+vida
+vindeiro
+visitantes
+visitas
+vista
+visto
+volta
+vosa
+wink
+xeito
+xeitos
+xente
+xerais
+xeral
+xunto
+zona
diff --git a/inc/lang/gl/updateprofile.txt b/inc/lang/gl/updateprofile.txt
index bfd598117..8620dea12 100644
--- a/inc/lang/gl/updateprofile.txt
+++ b/inc/lang/gl/updateprofile.txt
@@ -1,5 +1,5 @@
-====== Actualizar o perfil da súa conta ======
+====== Actualizar o perfil da túa conta ======
-Só precisa cubrir os campos que desexe cambiar. Non pode cambiar o seu nome de persoa usuaria.
+Só precisas cubrir os campos que desexes mudar. Non podes mudar o teu nome de usuario.
diff --git a/inc/lang/gl/uploadmail.txt b/inc/lang/gl/uploadmail.txt
index 914c3644c..2a7c24762 100644
--- a/inc/lang/gl/uploadmail.txt
+++ b/inc/lang/gl/uploadmail.txt
@@ -1,14 +1,14 @@
-Subiuse un ficheiro ao seu DokuWiki. Aquí van os detalles:
+Subiuse un arquivo ao teu DokuWiki. Aquí van os pormenores:
-Ficheiro : @MEDIA@
-Data : @DATE@
-Navegador : @BROWSER@
-Enderezo IP : @IPADDRESS@
-Nome do host : @HOSTNAME@
-Tamaño : @SIZE@
-Tipo MIME : @MIME@
-Usuaria/o : @USER@
+Arquivo : @MEDIA@
+Data : @DATE@
+Navegador : @BROWSER@
+Enderezo IP : @IPADDRESS@
+Nome do Host : @HOSTNAME@
+Tamaño : @SIZE@
+Tipo MIME : @MIME@
+Usuario : @USER@
---
+--
Este correo foi xerado polo DokuWiki en
-@DOKUWIKIURL@
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/gl/wordblock.txt b/inc/lang/gl/wordblock.txt
deleted file mode 100644
index f219f8436..000000000
--- a/inc/lang/gl/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Bloqueo por SPAM ======
-
-Os seus cambios **non** foron gardados porque conteñen unha ou varias palabras bloqueadas. Se tentou introducir spam no wiki -- Nen@ mal@! Se considera que é un erro, contacte coa persoa administradora deste Wiki.
-
diff --git a/inc/lang/he/wordblock.txt b/inc/lang/he/wordblock.txt
deleted file mode 100644
index b7c3f0a7c..000000000
--- a/inc/lang/he/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== הצפה נחסמה ======
-
-השנויים שלך **לא** נשמרו מפני שהם מכילים מילה חסומה או יותר. אם באמת ניסית להציף את הויקי -- כלב רע! אם נראה לך כי זו טעות,ניתן ליצור קשר עם מנהל הויקי (מפני שאנחנו לא רוצים לקרוא לאנשים כלבים לחינם, זה פוגע בכלבים).
-
diff --git a/inc/lang/hr/wordblock.txt b/inc/lang/hr/wordblock.txt
deleted file mode 100644
index 7faf03c19..000000000
--- a/inc/lang/hr/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAM blokiranje ======
-
-Vaše izmjene **nisu** snimljene jer sadrže jednu ili više blokiranih/zabranjenih riječi. Ukoliko mislite da je to greška - molimo Vas da kontaktirate administratora.
diff --git a/inc/lang/hu/wordblock.txt b/inc/lang/hu/wordblock.txt
deleted file mode 100644
index 2fe2efa9b..000000000
--- a/inc/lang/hu/wordblock.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-====== SPAM szűrés ======
-
-A változtatásaid **nem** mentettük, mert egy vagy több tiltott szót tartalmaz. Ha kéretlen reklám anyagot ("SPAM") próbáltál erre a Wikire rakni, akkor szégyelld magad.
-
-Ha azt gondolod, hogy valami hibáról, vagy félreértésről van szó, akkor lépj kapcsolatba a Wiki-gazdával.
-
diff --git a/inc/lang/ia/admin.txt b/inc/lang/ia/admin.txt
new file mode 100644
index 000000000..f81ff3170
--- /dev/null
+++ b/inc/lang/ia/admin.txt
@@ -0,0 +1,3 @@
+====== Administration ======
+
+Hic infra se trova un lista de cargas administrative disponibile in DokuWiki.
diff --git a/inc/lang/ia/adminplugins.txt b/inc/lang/ia/adminplugins.txt
new file mode 100644
index 000000000..ad8f794b0
--- /dev/null
+++ b/inc/lang/ia/adminplugins.txt
@@ -0,0 +1 @@
+===== Plug-ins additional ===== \ No newline at end of file
diff --git a/inc/lang/ia/backlinks.txt b/inc/lang/ia/backlinks.txt
new file mode 100644
index 000000000..de5d2ac56
--- /dev/null
+++ b/inc/lang/ia/backlinks.txt
@@ -0,0 +1,3 @@
+====== Retroligamines ======
+
+Isto es un lista de paginas que contine ligamines de retorno al pagina actual. \ No newline at end of file
diff --git a/inc/lang/ia/conflict.txt b/inc/lang/ia/conflict.txt
new file mode 100644
index 000000000..576cb7e3f
--- /dev/null
+++ b/inc/lang/ia/conflict.txt
@@ -0,0 +1,5 @@
+====== Un version plus nove existe ======
+
+Existe un version plus nove del documento que tu ha modificate. Isto occurre si un altere usator cambia le documento durante que tu lo modifica.
+
+Examina minutiosemente le differentias monstrate hic infra, postea decide qual version debe esser conservate. Si tu selige ''salveguardar'', tu version essera salveguardate. Preme ''cancellar'' pro conservar le version actual.
diff --git a/inc/lang/ia/denied.txt b/inc/lang/ia/denied.txt
new file mode 100644
index 000000000..044e1532d
--- /dev/null
+++ b/inc/lang/ia/denied.txt
@@ -0,0 +1,3 @@
+====== Permission refusate ======
+
+Pardono, tu non ha le derectos requisite pro continuar. Pote esser que tu ha oblidate de aperir un session. \ No newline at end of file
diff --git a/inc/lang/ia/diff.txt b/inc/lang/ia/diff.txt
new file mode 100644
index 000000000..dbfa70f13
--- /dev/null
+++ b/inc/lang/ia/diff.txt
@@ -0,0 +1,3 @@
+====== Differentias ======
+
+Isto te monstra le differentias inter duo versiones del pagina. \ No newline at end of file
diff --git a/inc/lang/ia/draft.txt b/inc/lang/ia/draft.txt
new file mode 100644
index 000000000..ae8de13f4
--- /dev/null
+++ b/inc/lang/ia/draft.txt
@@ -0,0 +1,5 @@
+====== Version provisori trovate ======
+
+Tu ultime session de modification in iste pagina non ha essite concludite correctemente. DokuWiki ha automaticamente salveguardate un version provisori durante tu labor. Ora tu pote usar iste version provisori pro continuar le modification. Hic infra tu vide le datos salveguardate de tu ultime session.
+
+Per favor decide si tu vole //recuperar// le session de modification perdite, //deler// le version provisori o //cancellar// le processo de modification. \ No newline at end of file
diff --git a/inc/lang/ia/edit.txt b/inc/lang/ia/edit.txt
new file mode 100644
index 000000000..5bc58362a
--- /dev/null
+++ b/inc/lang/ia/edit.txt
@@ -0,0 +1 @@
+Modifica le pagina e preme "Salveguardar". Vide [[wiki:syntax]] pro le syntaxe wiki. Per favor modifica le paginas solmente si tu pote **meliorar** lo. Si tu vole testar alcun cosas, apprende facer tu prime passos in le [[playground:playground|parco de jocos]]. \ No newline at end of file
diff --git a/inc/lang/ia/editrev.txt b/inc/lang/ia/editrev.txt
new file mode 100644
index 000000000..192381f8c
--- /dev/null
+++ b/inc/lang/ia/editrev.txt
@@ -0,0 +1,2 @@
+**Tu ha cargate un version ancian del documento!** Si tu lo salveguarda, tu crea un nove version con iste datos.
+---- \ No newline at end of file
diff --git a/inc/lang/ia/index.txt b/inc/lang/ia/index.txt
new file mode 100644
index 000000000..5957cc2ab
--- /dev/null
+++ b/inc/lang/ia/index.txt
@@ -0,0 +1,3 @@
+====== Indice ======
+
+Isto es un indice super tote le paginas disponibile, ordinate per [[doku>namespaces|spatio de nomines]].
diff --git a/inc/lang/ia/install.html b/inc/lang/ia/install.html
new file mode 100644
index 000000000..340d4098f
--- /dev/null
+++ b/inc/lang/ia/install.html
@@ -0,0 +1,13 @@
+<p>Iste pagina te assiste in le prime installation e configuration de
+<a href="http://dokuwiki.org">Dokuwiki</a>. Ulterior informationes super iste installator es disponibile in le
+<a href="http://dokuwiki.org/installer">pagina de documentaiton</a> de illo.</p>
+
+<p>DokuWiki usa files ordinari pro le immagazinage de paginas wiki e altere informationes associate con iste paginas (p.ex. imagines, indices de recerca, versiones ancian, etc). Pro poter functionar, DokuWiki
+<strong>debe</strong> haber accesso de scriptura al directorios que contine iste files. Iste installator non es capabile de configurar le permissiones de directorios. Isto normalmente debe esser facite directemente con le linea de commandos, o si tu usa un albergo web, via FTP o via le pannello de controlo de tu albergo (p.ex. cPanel).</p>
+
+<p>Iste installator configurara tu installation de DokuWiki pro
+<acronym title="listas de controlo de accesso">ACL</acronym>, lo que permitte crear contos administrator, e forni accesso al menu administrative de DokuWiki pro installar plug-ins, gerer usatores, gerer accesso a paginas wiki e alterar configurationes. Isto non es necessari pro le functionamento de DokuWiki, nonobstante, illo rendera DokuWiki plus facile de administrar.</p>
+
+<p>Le usatores experte o con exigentias special pro le installation deberea usar iste ligamines pro detalios concernente le
+<a href="http://dokuwiki.org/install">instructiones de installation</a>
+e <a href="http://dokuwiki.org/config">configurationes</a>.</p>
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
new file mode 100644
index 000000000..8429fe607
--- /dev/null
+++ b/inc/lang/ia/lang.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * ia 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/MessagesIa.php?view=co
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['doublequoteopening'] = '“';
+$lang['doublequoteclosing'] = '”';
+$lang['singlequoteopening'] = '‘';
+$lang['singlequoteclosing'] = '’';
+$lang['apostrophe'] = '’';
+$lang['btn_edit'] = 'Modificar iste pagina';
+$lang['btn_source'] = 'Monstrar codice-fonte';
+$lang['btn_show'] = 'Monstrar pagina';
+$lang['btn_create'] = 'Crear iste pagina';
+$lang['btn_search'] = 'Cercar';
+$lang['btn_save'] = 'Salveguardar';
+$lang['btn_preview'] = 'Previsualisar';
+$lang['btn_top'] = 'Retornar al initio';
+$lang['btn_newer'] = '<< plus recente';
+$lang['btn_older'] = 'minus recente >>';
+$lang['btn_revs'] = 'Versiones ancian';
+$lang['btn_recent'] = 'Modificationes recente';
+$lang['btn_upload'] = 'Incargar';
+$lang['btn_cancel'] = 'Cancellar';
+$lang['btn_index'] = 'Indice';
+$lang['btn_secedit'] = 'Modificar';
+$lang['btn_login'] = 'Aperir session';
+$lang['btn_logout'] = 'Clauder session';
+$lang['btn_admin'] = 'Admin';
+$lang['btn_update'] = 'Actualisar';
+$lang['btn_delete'] = 'Deler';
+$lang['btn_back'] = 'Retornar';
+$lang['btn_backlink'] = 'Retroligamines';
+$lang['btn_backtomedia'] = 'Retornar al selection de files multimedia';
+$lang['btn_subscribe'] = 'Gerer subscriptiones';
+$lang['btn_profile'] = 'Actualisar profilo';
+$lang['btn_reset'] = 'Reinitialisar';
+$lang['btn_resendpwd'] = 'Inviar nove contrasigno';
+$lang['btn_draft'] = 'Modificar version provisori';
+$lang['btn_recover'] = 'Recuperar version provisori';
+$lang['btn_draftdel'] = 'Deler version provisori';
+$lang['btn_revert'] = 'Restaurar';
+$lang['loggedinas'] = 'Session aperite como';
+$lang['user'] = 'Nomine de usator';
+$lang['pass'] = 'Contrasigno';
+$lang['newpass'] = 'Nove contrasigno';
+$lang['oldpass'] = 'Confirmar contrasigno actual';
+$lang['passchk'] = 'un altere vice';
+$lang['remember'] = 'Memorar me';
+$lang['fullname'] = 'Nomine real';
+$lang['email'] = 'E-mail';
+$lang['register'] = 'Crear conto';
+$lang['profile'] = 'Profilo de usator';
+$lang['badlogin'] = 'Le nomine de usator o le contrasigno es incorrecte.';
+$lang['minoredit'] = 'Modificationes minor';
+$lang['draftdate'] = 'Version provisori automaticamente salveguardate le';
+$lang['nosecedit'] = 'Le pagina ha essite modificate intertanto. Le informationes del section es ora obsolete, dunque le pagina complete ha essite cargate in su loco.';
+$lang['regmissing'] = 'Es necessari completar tote le campos.';
+$lang['reguexists'] = 'Regrettabilemente, un usator con iste nomine ja existe.';
+$lang['regsuccess'] = 'Le conto ha essite create e le contrasigno ha essite inviate per e-mail.';
+$lang['regsuccess2'] = 'Le conto ha essite create.';
+$lang['regmailfail'] = 'Il pare que un error occurreva durante le invio del message con le contrasigno. Per favor contacta le administrator!';
+$lang['regbadmail'] = 'Le adresse de e-mail date pare esser invalide. Si tu pensa que isto es un error, contacta le administrator.';
+$lang['regbadpass'] = 'Le duo contrasignos date non es identic. Per favor reproba.';
+$lang['regpwmail'] = 'Tu contrasigno de DokuWiki';
+$lang['reghere'] = 'Tu non ha ancora un conto? Crea un, simplemente.';
+$lang['profna'] = 'Iste wiki non supporta le modification de profilos.';
+$lang['profnochange'] = 'Nulle modification, nihil a facer.';
+$lang['profnoempty'] = 'Un nomine o adresse de e-mail vacue non es permittite.';
+$lang['profchanged'] = 'Actualisation del profilo de usator succedite.';
+$lang['pwdforget'] = 'Contrasigno oblidate? Obtene un altere';
+$lang['resendna'] = 'Iste wiki non supporta le invio de un nove contrasigno.';
+$lang['resendpwd'] = 'Inviar nove contrasigno pro';
+$lang['resendpwdmissing'] = 'Es necessari completar tote le campos.';
+$lang['resendpwdnouser'] = 'Iste usator non ha essite trovate in le base de datos.';
+$lang['resendpwdbadauth'] = 'Iste codice de authentication non es valide. Assecura te que tu ha usate le ligamine de confirmation complete.';
+$lang['resendpwdconfirm'] = 'Un ligamine de confirmation ha essite inviate per e-mail.';
+$lang['resendpwdsuccess'] = 'Tu nove contrasigno ha essite inviate per e-mail.';
+$lang['license'] = 'Excepte ubi indicate alteremente, le contento in iste wiki es disponibile sub le licentia sequente:';
+$lang['licenseok'] = 'Nota ben! Per modificar iste pagina tu accepta que tu contento essera publicate sub le conditiones del licentia sequente:';
+$lang['searchmedia'] = 'Cercar file con nomine:';
+$lang['searchmedia_in'] = 'Cercar in %s';
+$lang['txt_upload'] = 'Selige le file a incargar';
+$lang['txt_filename'] = 'Incargar como (optional)';
+$lang['txt_overwrt'] = 'Reimplaciar le file existente';
+$lang['lockedby'] = 'Actualmente serrate per';
+$lang['lockexpire'] = 'Serratura expira le';
+$lang['willexpire'] = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
+$lang['notsavedyet'] = 'Le modificationes non salveguardate essera perdite.\nRealmente continuar?';
+$lang['rssfailed'] = 'Un error occurreva durante le obtention de iste syndication:';
+$lang['nothingfound'] = 'Nihil ha essite trovate.';
+$lang['mediaselect'] = 'Files multimedia';
+$lang['fileupload'] = 'Incargar file multimedia';
+$lang['uploadsucc'] = 'Incargamento succedite';
+$lang['uploadfail'] = 'Incargamento fallite. Pote esser que le permissiones es incorrecte.';
+$lang['uploadwrong'] = 'Incargamento refusate. Iste typo de file es prohibite!';
+$lang['uploadexist'] = 'File ja existe. Nihil facite.';
+$lang['uploadbadcontent'] = 'Le typo del contento incargate non corresponde al extension del nomine de file "%s".';
+$lang['uploadspam'] = 'Le incargamento ha essite blocate per le lista nigre anti-spam.';
+$lang['uploadxss'] = 'Le incargamento ha essite blocate a causa de contento possibilemente malitiose.';
+$lang['uploadsize'] = 'Le file incargate es troppo grande. (Max. %s)';
+$lang['deletesucc'] = 'Le file "%s" ha essite delite.';
+$lang['deletefail'] = '"%s" non poteva esser delite. Verifica le permissiones.';
+$lang['mediainuse'] = 'Le file "%s" non ha essite delite proque illo es ancora in uso.';
+$lang['namespaces'] = 'Spatios de nomines';
+$lang['mediafiles'] = 'Files disponibile in';
+$lang['js']['searchmedia'] = 'Cercar files';
+$lang['js']['keepopen'] = 'Mantener fenestra aperte post selection';
+$lang['js']['hidedetails'] = 'Celar detalios';
+$lang['js']['nosmblinks'] = 'Le ligamines a ressources de Windows functiona solmente in Microsoft Internet Explorer.
+Tu pote nonobstante copiar e collar le ligamine.';
+$lang['js']['linkwiz'] = 'Assistente pro ligamines';
+$lang['js']['linkto'] = 'Ligar verso:';
+$lang['js']['del_confirm'] = 'Realmente deler le entrata(s) seligite?';
+$lang['js']['mu_btn'] = 'Incargar plure files simultaneemente';
+$lang['mediausage'] = 'Usa le syntaxe sequente pro referer a iste file:';
+$lang['mediaview'] = 'Vider file original';
+$lang['mediaroot'] = 'radice';
+$lang['mediaupload'] = 'Incarga hic un file in le spatio de nomines actual. Pro crear subspatios de nomines, antepone los al nomine de file "Incargar como", separate per signos de duo punctos (":").';
+$lang['mediaextchange'] = 'Extension del file cambiate de .%s a .%s!';
+$lang['reference'] = 'Referentias pro';
+$lang['ref_inuse'] = 'Le file non pote esser delite proque illo es ancora in uso per le sequente paginas:';
+$lang['ref_hidden'] = 'Alcun referentias es in paginas pro le quales tu non ha le permission de lectura';
+$lang['hits'] = 'Resultatos';
+$lang['quickhits'] = 'Nomines de pagina correspondente';
+$lang['toc'] = 'Tabula de contento';
+$lang['current'] = 'actual';
+$lang['yours'] = 'Tu version';
+$lang['diff'] = 'Monstrar differentias con versiones actual';
+$lang['diff2'] = 'Monstrar differentias inter le versiones seligite';
+$lang['line'] = 'Linea';
+$lang['breadcrumb'] = 'Tracia';
+$lang['youarehere'] = 'Tu es hic';
+$lang['lastmod'] = 'Ultime modification';
+$lang['by'] = 'per';
+$lang['deleted'] = 'removite';
+$lang['created'] = 'create';
+$lang['restored'] = 'ancian version restaurate';
+$lang['external_edit'] = 'modification externe';
+$lang['summary'] = 'Modificar summario';
+$lang['noflash'] = 'Le <a href="http://www.adobe.com/products/flashplayer/">plug-in Flash de Adobe</a> es necessari pro monstrar iste contento.';
+$lang['download'] = 'Discargar fragmento';
+$lang['mail_newpage'] = 'pagina addite:';
+$lang['mail_changed'] = 'pagina modificate:';
+$lang['mail_subscribe_list'] = 'paginas modificate in spatio de nomines:';
+$lang['mail_new_user'] = 'nove usator:';
+$lang['mail_upload'] = 'file incargate:';
+$lang['qb_bold'] = 'Texto grasse';
+$lang['qb_italic'] = 'Texto italic';
+$lang['qb_underl'] = 'Texto sublineate';
+$lang['qb_code'] = 'Texto de codice';
+$lang['qb_strike'] = 'Texto cancellate';
+$lang['qb_h1'] = 'Titulo a nivello 1';
+$lang['qb_h2'] = 'Titulo a nivello 2';
+$lang['qb_h3'] = 'Titulo a nivello 3';
+$lang['qb_h4'] = 'Titulo a nivello 4';
+$lang['qb_h5'] = 'Titulo a nivello 5';
+$lang['qb_h'] = 'Titulo';
+$lang['qb_hs'] = 'Seliger titulo';
+$lang['qb_hplus'] = 'Titulo superior';
+$lang['qb_hminus'] = 'Titulo inferior';
+$lang['qb_hequal'] = 'Titulo al mesme nivello';
+$lang['qb_link'] = 'Ligamine interne';
+$lang['qb_extlink'] = 'Ligamine externe';
+$lang['qb_hr'] = 'Linea horizontal';
+$lang['qb_ol'] = 'Elemento de lista ordinate';
+$lang['qb_ul'] = 'Elemento de lista non ordinate';
+$lang['qb_media'] = 'Adder imagines e altere files';
+$lang['qb_sig'] = 'Inserer signatura';
+$lang['qb_smileys'] = 'Emoticones ';
+$lang['qb_chars'] = 'Characteres special';
+$lang['upperns'] = 'Saltar al spatio de nomines superior';
+$lang['admin_register'] = 'Adder nove usator';
+$lang['metaedit'] = 'Modificar metadatos';
+$lang['metasaveerr'] = 'Scriptura de metadatos fallite';
+$lang['metasaveok'] = 'Metadatos salveguardate';
+$lang['img_backto'] = 'Retornar a';
+$lang['img_title'] = 'Titulo';
+$lang['img_caption'] = 'Legenda';
+$lang['img_date'] = 'Data';
+$lang['img_fname'] = 'Nomine de file';
+$lang['img_fsize'] = 'Dimension';
+$lang['img_artist'] = 'Photographo';
+$lang['img_copyr'] = 'Copyright';
+$lang['img_format'] = 'Formato';
+$lang['img_camera'] = 'Camera';
+$lang['img_keywords'] = 'Parolas-clave';
+$lang['subscr_subscribe_success'] = '%s addite al lista de subscription de %s';
+$lang['subscr_subscribe_error'] = 'Error durante le addition de %s al lista de subscription de %s';
+$lang['subscr_subscribe_noaddress'] = 'Il non ha un adresse associate con tu conto. Tu non pote esser addite al lista de subscription.';
+$lang['subscr_unsubscribe_success'] = '%s removite del lista de subscription de %s';
+$lang['subscr_unsubscribe_error'] = 'Error durante le remotion de %s del lista de subscription de %s';
+$lang['subscr_already_subscribed'] = '%s es ja subscribite a %s';
+$lang['subscr_not_subscribed'] = '%s non es subscribite a %s';
+$lang['subscr_m_not_subscribed'] = 'Tu non es actualmente subscribite al pagina o spatio de nomines actual.';
+$lang['subscr_m_new_header'] = 'Adder subscription';
+$lang['subscr_m_current_header'] = 'Subscriptiones actual';
+$lang['subscr_m_unsubscribe'] = 'Cancellar subscription';
+$lang['subscr_m_subscribe'] = 'Subscriber';
+$lang['subscr_m_receive'] = 'Reciper';
+$lang['subscr_style_every'] = 'un message pro cata modification';
+$lang['subscr_style_digest'] = 'un digesto de modificationes pro cata pagina';
+$lang['subscr_style_list'] = 'lista de paginas modificate depost le ultime e-mail';
+$lang['authmodfailed'] = 'Configuration incorrecte de authentication de usator. Per favor informa le administrator de tu wiki.';
+$lang['authtempfail'] = 'Le authentication de usator temporarimente non es disponibile. Si iste situation persiste, per favor informa le administrator de tu wiki.';
+$lang['i_chooselang'] = 'Selige tu lingua';
+$lang['i_installer'] = 'Installator de DokuWiki';
+$lang['i_wikiname'] = 'Nomine del wiki';
+$lang['i_enableacl'] = 'Activar ACL (recommendate)';
+$lang['i_superuser'] = 'Superusator';
+$lang['i_problems'] = 'Le installator ha trovate alcun problemas, indicate hic infra. Tu debe resolver iste problemas pro poter continuar.';
+$lang['i_modified'] = 'Pro motivos de securitate, iste script functiona solmente con un installation de DokuWiki nove e non modificate.
+Tu debe re-extraher le files del pacchetto discargate, o consultar le <a href="http://dokuwiki.org/install">instructiones de installation</a> complete pro altere optiones.';
+$lang['i_funcna'] = 'Le function PHP <code>%s</code> non es disponibile. Pote esser que tu albergo web lo ha disactivate pro un ration o altere.';
+$lang['i_phpver'] = 'Le version de PHP <code>%s</code> es plus ancian que le version requisite <code>%s</code>. Es necessari actualisar le installation de PHP.';
+$lang['i_permfail'] = '<code>%s</code> non permitte le accesso de scriptura a DokuWiki. Tu debe reparar le permissiones de iste directorio!';
+$lang['i_confexists'] = '<code>%s</code> ja existe';
+$lang['i_writeerr'] = 'Impossibile crear <code>%s</code>. Tu debe verificar le permissiones de directorios/files e crear iste file manualmente.';
+$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>.';
+$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>.';
+$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)';
+$lang['i_pol2'] = 'Wiki claudite (lectura, scriptura e incargamento solmente pro usatores registrate)';
+$lang['i_retry'] = 'Reprobar';
+$lang['mu_intro'] = 'Hic tu pote incargar plure files insimul. Clicca super le button Navigar pro adder los al cauda. Preme Incargar quando tu ha finite.';
+$lang['mu_gridname'] = 'Nomine de file';
+$lang['mu_gridsize'] = 'Dimension';
+$lang['mu_gridstat'] = 'Stato';
+$lang['mu_namespace'] = 'Spatio de nomines';
+$lang['mu_browse'] = 'Navigar';
+$lang['mu_toobig'] = 'troppo grande';
+$lang['mu_ready'] = 'preste pro incargamento';
+$lang['mu_done'] = 'complete';
+$lang['mu_fail'] = 'fallite';
+$lang['mu_authfail'] = 'session expirate';
+$lang['mu_progress'] = '@PCT@% incargate';
+$lang['mu_filetypes'] = 'Typos de file permittite';
+$lang['mu_info'] = 'files incargate.';
+$lang['mu_lasterr'] = 'Ultime error:';
+$lang['recent_global'] = 'Tu observa actualmente le modificationes intra le spatio de nomines <b>%s</b>. Tu pote etiam <a href="%s">vider le modificationes recente de tote le wiki</a>.';
+$lang['years'] = '%d annos retro';
+$lang['months'] = '%d menses retro';
+$lang['weeks'] = '%d septimanas retro';
+$lang['days'] = '%d dies retro';
+$lang['hours'] = '%d horas retro';
+$lang['minutes'] = '%d minutas retro';
+$lang['seconds'] = '%d secundas retro';
diff --git a/inc/lang/ia/locked.txt b/inc/lang/ia/locked.txt
new file mode 100644
index 000000000..726aabb34
--- /dev/null
+++ b/inc/lang/ia/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina serrate ======
+
+Iste pagina es actualmente serrate proque un altere usator lo modifica in iste momento. Tu debe attender usque iste usator fini le modification o usque al expiration del serratura. \ No newline at end of file
diff --git a/inc/lang/ia/login.txt b/inc/lang/ia/login.txt
new file mode 100644
index 000000000..4c428f358
--- /dev/null
+++ b/inc/lang/ia/login.txt
@@ -0,0 +1,3 @@
+====== Aperir session ======
+
+Tu non es identificate! Entra tu credentiales de authentication pro aperir un session. Tu debe haber activate le cookies pro aperir un session. \ No newline at end of file
diff --git a/inc/lang/ia/mailtext.txt b/inc/lang/ia/mailtext.txt
new file mode 100644
index 000000000..14c1a3a60
--- /dev/null
+++ b/inc/lang/ia/mailtext.txt
@@ -0,0 +1,17 @@
+Un pagina in tu DokuWiki ha essite addite o modificate. Ecce le detalios:
+
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host : @HOSTNAME@
+Version ancian: @OLDPAGE@
+Version nove: @NEWPAGE@
+Summario: @SUMMARY@
+Usator : @USER@
+
+@DIFF@
+
+
+--
+Iste e-mail ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/newpage.txt b/inc/lang/ia/newpage.txt
new file mode 100644
index 000000000..8db7aa797
--- /dev/null
+++ b/inc/lang/ia/newpage.txt
@@ -0,0 +1,3 @@
+====== Iste topico non existe ancora ======
+
+Tu ha sequite un ligamine verso un topico que non existe ancora. Si tu ha le permission requisite, tu pote crear lo con le button "Crear iste pagina". \ No newline at end of file
diff --git a/inc/lang/ia/norev.txt b/inc/lang/ia/norev.txt
new file mode 100644
index 000000000..75e44b969
--- /dev/null
+++ b/inc/lang/ia/norev.txt
@@ -0,0 +1,3 @@
+====== Version non existe ======
+
+Le version specificate non existe. Usa le button "Versiones ancian" pro un lista de versiones ancian de iste documento. \ No newline at end of file
diff --git a/inc/lang/ia/password.txt b/inc/lang/ia/password.txt
new file mode 100644
index 000000000..9ad93d6ed
--- /dev/null
+++ b/inc/lang/ia/password.txt
@@ -0,0 +1,10 @@
+Salute @FULLNAME@!
+
+Ecce tu datos de usator pro @TITLE@ a @DOKUWIKIURL@
+
+Nomine de usator : @LOGIN@
+Contrasigno : @PASSWORD@
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/preview.txt b/inc/lang/ia/preview.txt
new file mode 100644
index 000000000..22b958baf
--- /dev/null
+++ b/inc/lang/ia/preview.txt
@@ -0,0 +1,3 @@
+====== Previsualisation ======
+
+Isto es un previsualisation de tu texto. Memora: le pagina **non** ha ancora essite salveguardate! \ No newline at end of file
diff --git a/inc/lang/ia/pwconfirm.txt b/inc/lang/ia/pwconfirm.txt
new file mode 100644
index 000000000..a490f7929
--- /dev/null
+++ b/inc/lang/ia/pwconfirm.txt
@@ -0,0 +1,14 @@
+Salute @FULLNAME@!
+
+Alcuno ha requestate un nove contrasigno pro tu conto de @TITLE@
+a @DOKUWIKIURL@
+
+Si tu non ha requestate un nove contrasigno, alora simplemente ignora iste message.
+
+Pro confirmar que le requesta realmente ha essite inviate per te, per favor usa le ligamine sequente.
+
+@CONFIRM@
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/read.txt b/inc/lang/ia/read.txt
new file mode 100644
index 000000000..e7e80dbfc
--- /dev/null
+++ b/inc/lang/ia/read.txt
@@ -0,0 +1 @@
+Iste pagina es pro lectura solmente. Tu pote vider le codice-fonte, ma non modificar lo. Contacta tu administrator si tu pensa que isto es errate. \ No newline at end of file
diff --git a/inc/lang/ia/recent.txt b/inc/lang/ia/recent.txt
new file mode 100644
index 000000000..ba39c3ff5
--- /dev/null
+++ b/inc/lang/ia/recent.txt
@@ -0,0 +1,3 @@
+====== Modificationes recente ======
+
+Le sequente paginas ha essite modificate recentemente. \ No newline at end of file
diff --git a/inc/lang/ia/register.txt b/inc/lang/ia/register.txt
new file mode 100644
index 000000000..22c4e4ada
--- /dev/null
+++ b/inc/lang/ia/register.txt
@@ -0,0 +1,3 @@
+====== Crear un nove conto de usator ======
+
+Completa tote le informationes hic infra pro crear un nove conto in iste wiki. Assecura te de fornir un **adresse de e-mail valide!** Si le systema non te demanda de entrar un contrasigno hic, un nove contrasigno essera inviate a iste adresse. Le nomine de usator debe esser un [[doku>pagename|nomine de pagina]] valide.
diff --git a/inc/lang/ia/registermail.txt b/inc/lang/ia/registermail.txt
new file mode 100644
index 000000000..c4e9d56bc
--- /dev/null
+++ b/inc/lang/ia/registermail.txt
@@ -0,0 +1,14 @@
+Un nove conto de usator ha essite create. Ecce le detalios:
+
+Nomine de usator : @NEWUSER@
+Nomine complete : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host : @HOSTNAME@
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/resendpwd.txt b/inc/lang/ia/resendpwd.txt
new file mode 100644
index 000000000..97bcac02a
--- /dev/null
+++ b/inc/lang/ia/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Inviar nove contrasigno ======
+
+Per favor entra tu nomine de usator in le formulario hic infra pro requestar un nove contrasigno pro tu conto in iste wiki. Un ligamine de confirmation essera inviate a tu adresse de e-mail registrate. \ No newline at end of file
diff --git a/inc/lang/ia/revisions.txt b/inc/lang/ia/revisions.txt
new file mode 100644
index 000000000..e914edb61
--- /dev/null
+++ b/inc/lang/ia/revisions.txt
@@ -0,0 +1,3 @@
+====== Versiones ancian ======
+
+Ecce le versiones ancian del documento presente. Pro reverter lo a un version ancian, selige un version del lista in basso, clicca "Modificar iste pagina" e salveguarda lo. \ No newline at end of file
diff --git a/inc/lang/ia/searchpage.txt b/inc/lang/ia/searchpage.txt
new file mode 100644
index 000000000..c53683371
--- /dev/null
+++ b/inc/lang/ia/searchpage.txt
@@ -0,0 +1,5 @@
+====== Recerca ======
+
+Le resultatos de tu recerca se trova hic infra. Si tu non ha trovate lo que tu cerca, tu pote crear o modificar le pagina nominate secundo tu consulta con le button appropriate.
+
+===== Resultatos ===== \ No newline at end of file
diff --git a/inc/lang/ia/showrev.txt b/inc/lang/ia/showrev.txt
new file mode 100644
index 000000000..60ee2a7f6
--- /dev/null
+++ b/inc/lang/ia/showrev.txt
@@ -0,0 +1,2 @@
+**Isto es un version ancian del documento!**
+---- \ No newline at end of file
diff --git a/inc/lang/ia/stopwords.txt b/inc/lang/ia/stopwords.txt
new file mode 100644
index 000000000..e3e513509
--- /dev/null
+++ b/inc/lang/ia/stopwords.txt
@@ -0,0 +1,38 @@
+# Isto es un lista de parolas que le generator de indices ignora, un parola per linea.
+# Si tu modifica iste file, assecura te de usar le fines de linea UNIX (newline singule).
+# Non es necessari includer parolas plus curte que 3 characteres - istes es ignorate in omne caso.
+a
+ab
+circa
+com
+como
+como
+con
+de
+e
+es
+essera
+esserea
+esseva
+essite
+ex
+illo
+in
+iste
+istes
+le
+le
+les
+lo
+lor
+o
+pro
+quando
+que
+qui
+super
+sur
+tu
+ubi
+un
+www
diff --git a/inc/lang/ia/subscr_digest.txt b/inc/lang/ia/subscr_digest.txt
new file mode 100644
index 000000000..ba7b92d8b
--- /dev/null
+++ b/inc/lang/ia/subscr_digest.txt
@@ -0,0 +1,20 @@
+Salute!
+
+Le pagina @PAGE@ in le wiki @TITLE@ ha cambiate.
+Ecce le modificationes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Version ancian: @OLDPAGE@
+Version nove: @NEWPAGE@
+
+Pro cancellar le notificationes de paginas, aperi un session al wiki a
+@DOKUWIKIURL@ postea visita
+@SUBSCRIBE@
+e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/subscr_form.txt b/inc/lang/ia/subscr_form.txt
new file mode 100644
index 000000000..f63a30d4c
--- /dev/null
+++ b/inc/lang/ia/subscr_form.txt
@@ -0,0 +1,4 @@
+====== Gestion de subscriptiones ======
+
+Iste pagina permitte gerer tu subscriptiones pro le pagina e spatio de nomines actual.
+ \ No newline at end of file
diff --git a/inc/lang/ia/subscr_list.txt b/inc/lang/ia/subscr_list.txt
new file mode 100644
index 000000000..9f93db252
--- /dev/null
+++ b/inc/lang/ia/subscr_list.txt
@@ -0,0 +1,17 @@
+Salute!
+
+Alcun paginas in le spatio de nomines @PAGE@ del wiki @TITLE@ ha cambiate.
+Ecce le paginas con modiicationes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pro cancellar le notificationes de paginas, aperi un session al wiki a
+@DOKUWIKIURL@ postea visita
+@SUBSCRIBE@
+e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/subscr_single.txt b/inc/lang/ia/subscr_single.txt
new file mode 100644
index 000000000..3d6ef7103
--- /dev/null
+++ b/inc/lang/ia/subscr_single.txt
@@ -0,0 +1,26 @@
+Salute!
+
+Le pagina @PAGE@ in le wiki @TITLE@ ha cambiate.
+Ecce le modificationes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Usator : @USER@
+Summario: @SUMMARY@
+Version ancian: @OLDPAGE@
+Version nove: @NEWPAGE@
+
+Pro cancellar le notificationes de paginas, aperi un session al wiki a
+@DOKUWIKIURL@ postea visita
+@NEWPAGE@
+e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
+--
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ia/updateprofile.txt b/inc/lang/ia/updateprofile.txt
new file mode 100644
index 000000000..3968d3cde
--- /dev/null
+++ b/inc/lang/ia/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualisa le profilo de tu conto ======
+
+Solmente es necessari completar le campos que tu vole cambiar. Non es possibile cambiar tu nomine de usator. \ No newline at end of file
diff --git a/inc/lang/ia/uploadmail.txt b/inc/lang/ia/uploadmail.txt
new file mode 100644
index 000000000..8f120f25b
--- /dev/null
+++ b/inc/lang/ia/uploadmail.txt
@@ -0,0 +1,14 @@
+Un file ha essite incargate in tu DokuWiki. Ecce le detalios:
+
+File : @MEDIA@
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host: @HOSTNAME@
+Dimension : @SIZE@
+Typo MIME : @MIME@
+Usator : @USER@
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/id/wordblock.txt b/inc/lang/id/wordblock.txt
deleted file mode 100644
index 1e40ce381..000000000
--- a/inc/lang/id/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM blocked ======
-
-Maaf, tulisan Anda **tidak disimpan** karena terdapat satu atau lebih kata-kata yang **tabu**. Jika Anda mencoba melakukan SPAM wiki ini -- Bangsat lu! Tetapi, jika Anda pikir ini adalah kesalahan sistem, harap hubungi administrator wiki ini.
-
diff --git a/inc/lang/it/adminplugins.txt b/inc/lang/it/adminplugins.txt
index 6a5a30573..4f17d6da4 100644
--- a/inc/lang/it/adminplugins.txt
+++ b/inc/lang/it/adminplugins.txt
@@ -1 +1 @@
-===== Plugin addizionali ===== \ No newline at end of file
+===== Plugin aggiuntivi ===== \ No newline at end of file
diff --git a/inc/lang/it/backlinks.txt b/inc/lang/it/backlinks.txt
index 452019db5..ad5a9c23b 100644
--- a/inc/lang/it/backlinks.txt
+++ b/inc/lang/it/backlinks.txt
@@ -1,4 +1,4 @@
====== Puntano qui ======
-Questa è una lista delle pagine che sembrano avere un collegamento alla pagina corrente.
+Questa è una lista delle pagine che sembrano avere un collegamento alla pagina attuale.
diff --git a/inc/lang/it/conflict.txt b/inc/lang/it/conflict.txt
index 44789a365..bcb90d28d 100644
--- a/inc/lang/it/conflict.txt
+++ b/inc/lang/it/conflict.txt
@@ -2,5 +2,5 @@
Esiste una versione più recente del documento che hai modificato. Questo può accadere quando un altro utente ha già modificato il documento durante le tue modifiche.
-Esamina le differenze mostrate di seguito, quindi decidi quale versione mantenere. Se scegli ''salva'', la tua versione verrà salvata. Clicca su ''annulla'' per mantenere la versione corrente.
+Esamina le differenze mostrate di seguito, quindi decidi quale versione mantenere. Se scegli ''Salva'', la tua versione verrà salvata. Clicca su ''Annulla'' per mantenere la versione attuale.
diff --git a/inc/lang/it/denied.txt b/inc/lang/it/denied.txt
index e87eeeada..c6ba610c4 100644
--- a/inc/lang/it/denied.txt
+++ b/inc/lang/it/denied.txt
@@ -1,5 +1,5 @@
====== Accesso negato ======
-Non hai i diritti per continuare. Hai forse dimenticato di effettuare il login?
+Non hai i diritti per continuare. Hai forse dimenticato di effettuare l'accesso?
diff --git a/inc/lang/it/diff.txt b/inc/lang/it/diff.txt
index 6b48ed44e..5a41eaaec 100644
--- a/inc/lang/it/diff.txt
+++ b/inc/lang/it/diff.txt
@@ -1,4 +1,4 @@
====== Differenze ======
-Queste sono le differenze tra la revisione selezionata e la versione corrente della pagina.
+Queste sono le differenze tra la revisione selezionata e la versione attuale della pagina.
diff --git a/inc/lang/it/draft.txt b/inc/lang/it/draft.txt
index 9932786ba..479d0fafc 100644
--- a/inc/lang/it/draft.txt
+++ b/inc/lang/it/draft.txt
@@ -2,5 +2,5 @@
La tua ultima sessione di modifica su questa pagina non è stata completata correttamente. DokuWiki ha salvato in automatico una bozza durante il tuo lavoro, che puoi ora utilizzare per continuare le tue modifiche. Di seguito puoi trovare i dati che sono stati salvati dalla tua ultima sessione.
-Decidi se vuoi //recuperare// la sessione di modifica, //cancellare// la bozza salavata in automatico oppure //annullare// le modifiche.
+Decidi se vuoi //recuperare// la sessione di modifica, //eliminare// la bozza salavata in automatico oppure //annullare// le modifiche.
diff --git a/inc/lang/it/edit.txt b/inc/lang/it/edit.txt
index fdfaf463e..8f2ba973a 100644
--- a/inc/lang/it/edit.txt
+++ b/inc/lang/it/edit.txt
@@ -1,2 +1,2 @@
-Modifica la pagina e clicca su ''Salva''. Vedi [[wiki:syntax]] per la sintassi riconosciuta da Wiki. Modifica questa pagina solo se puoi **apportare dei miglioramenti**. Se vuoi solo fare degli esperimenti ed imparare come fare i primi passi usa [[playground:playground]].
+Modifica la pagina e clicca su ''Salva''. Vedi [[wiki:syntax]] per la sintassi riconosciuta dal Wiki. Modifica questa pagina solo se puoi **apportare dei miglioramenti**. Se vuoi solo fare degli esperimenti ed imparare come fare i primi passi usa [[playground:playground]].
diff --git a/inc/lang/it/editrev.txt b/inc/lang/it/editrev.txt
index 0a309fa24..502320083 100644
--- a/inc/lang/it/editrev.txt
+++ b/inc/lang/it/editrev.txt
@@ -1,2 +1,2 @@
-**Hai caricato una precedente revisione del documento!** Se salvi questa pagina creerai una nuova versione con questi dati.
+**Hai caricato una revisione precedente del documento!** Se salvi questa pagina creerai una nuova versione con questi dati.
---- \ No newline at end of file
diff --git a/inc/lang/it/index.txt b/inc/lang/it/index.txt
index 8d5f00409..52c6fbc5d 100644
--- a/inc/lang/it/index.txt
+++ b/inc/lang/it/index.txt
@@ -1,4 +1,4 @@
====== Indice ======
-Questo è un indice di tutte le pagine disponibili ordinate per [[doku>namespaces|categoria]].
+Questo è un indice di tutte le pagine disponibili ordinate per [[doku>namespaces|categorie]].
diff --git a/inc/lang/it/install.html b/inc/lang/it/install.html
index 5bc4b0dc2..471734412 100644
--- a/inc/lang/it/install.html
+++ b/inc/lang/it/install.html
@@ -21,4 +21,4 @@ da amministrare.</p>
<p>Gli utenti esperti o con particolari esigenze di installazione dovrebbero far riferimento ai
seguenti link per i dettagli riguardanti
<a href="http://dokuwiki.org/install">istruzioni per l'installazione</a>
-and <a href="http://dokuwiki.org/config">parametri di configurazione</a>.</p>
+e i <a href="http://dokuwiki.org/config">parametri di configurazione</a>.</p>
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 827967d0f..1184083d1 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -12,6 +12,7 @@
* @author Lorenzo Breda <lbreda@gmail.com>
* @author snarchio@alice.it
* @author robocap <robocap1@gmail.com>
+ * @author Matteo Carnevali <rekstorm@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -40,29 +41,27 @@ $lang['btn_login'] = 'Entra';
$lang['btn_logout'] = 'Esci';
$lang['btn_admin'] = 'Amministrazione';
$lang['btn_update'] = 'Aggiorna';
-$lang['btn_delete'] = 'Cancella';
+$lang['btn_delete'] = 'Elimina';
$lang['btn_back'] = 'Indietro';
$lang['btn_backlink'] = 'Backlinks';
$lang['btn_backtomedia'] = 'Torna alla selezione file';
$lang['btn_subscribe'] = 'Sottoscrivi modifiche';
-$lang['btn_unsubscribe'] = 'Cancella sottoscrizione';
-$lang['btn_subscribens'] = 'Sottoscrivi modifiche della categoria';
-$lang['btn_unsubscribens'] = 'Cancella sottoscrizione modifiche della categoria';
$lang['btn_profile'] = 'Aggiorna profilo';
$lang['btn_reset'] = 'Annulla';
$lang['btn_resendpwd'] = 'Invia nuova password';
$lang['btn_draft'] = 'Modifica bozza';
$lang['btn_recover'] = 'Ripristina bozza';
-$lang['btn_draftdel'] = 'Cancella bozza';
+$lang['btn_draftdel'] = 'Elimina bozza';
+$lang['btn_revert'] = 'Ripristina';
$lang['loggedinas'] = 'Collegato come';
$lang['user'] = 'Nome utente';
$lang['pass'] = 'Password';
$lang['newpass'] = 'Nuova password';
-$lang['oldpass'] = 'Conferma password corrente';
+$lang['oldpass'] = 'Conferma password attuale';
$lang['passchk'] = 'Ripeti password';
$lang['remember'] = 'Ricorda automaticamente';
$lang['fullname'] = 'Nome completo';
-$lang['email'] = 'E-Mail';
+$lang['email'] = 'Email';
$lang['register'] = 'Registrazione';
$lang['profile'] = 'Profilo utente';
$lang['badlogin'] = 'Il nome utente o la password non sono validi.';
@@ -70,11 +69,11 @@ $lang['minoredit'] = 'Modifiche minori';
$lang['draftdate'] = 'Bozza salvata in automatico il';
$lang['nosecedit'] = 'La pagina nel frattempo è cambiata, la sezione info è scaduta, caricata invece la pagina intera.';
$lang['regmissing'] = 'Devi riempire tutti i campi.';
-$lang['reguexists'] = 'Il nome utente inserito esiste già .';
-$lang['regsuccess'] = 'L\'utente è stato creato. La password è stata spedita via e-mail.';
+$lang['reguexists'] = 'Il nome utente inserito esiste già.';
+$lang['regsuccess'] = 'L\'utente è stato creato. La password è stata spedita via email.';
$lang['regsuccess2'] = 'L\'utente è stato creato.';
-$lang['regmailfail'] = 'Sembra che ci sia stato un errore nell\'invio della e-mail. Per favore contatta il tuo amministratore!';
-$lang['regbadmail'] = 'L\'indirizzo e-mail fornito sembra essere non valido - se pensi che ci sia un errore contatta il tuo amministratore';
+$lang['regmailfail'] = 'Sembra che ci sia stato un errore nell\'invio della email. Contatta il tuo amministratore!';
+$lang['regbadmail'] = 'L\'indirizzo email fornito sembra essere non valido - se pensi che ci sia un errore contatta il tuo amministratore';
$lang['regbadpass'] = 'Le due password inserite non coincidono, prova di nuovo.';
$lang['regpwmail'] = 'La tua password DokuWiki';
$lang['reghere'] = 'Non hai ancora un accesso? Registrati qui.';
@@ -87,13 +86,15 @@ $lang['resendna'] = 'Questo wiki non supporta l\'invio di nuove pas
$lang['resendpwd'] = 'Invia nuova password per';
$lang['resendpwdmissing'] = 'Devi riempire tutti i campi.';
$lang['resendpwdnouser'] = 'Impossibile trovare questo utente nel database.';
-$lang['resendpwdbadauth'] = 'Spiacente, questo codice di autorizzazione non è valido. Assicurati di aver usato il link completo di conferma.';
+$lang['resendpwdbadauth'] = 'Spiacenti, questo codice di autorizzazione non è valido. Assicurati di aver usato il link completo di conferma.';
$lang['resendpwdconfirm'] = 'Un link di conferma è stato spedito via email.';
$lang['resendpwdsuccess'] = 'La nuova password è stata spedita via email.';
$lang['license'] = 'Ad eccezione da dove è diversamente indicato, il contenuto di questo wiki è sotto la seguente licenza:';
$lang['licenseok'] = 'Nota: modificando questa pagina accetti di rilasciare il contenuto sotto la seguente licenza:';
+$lang['searchmedia'] = 'Cerca nome file:';
+$lang['searchmedia_in'] = 'Cerca in &s';
$lang['txt_upload'] = 'Seleziona un file da caricare';
-$lang['txt_filename'] = 'Inserisci un "wikiname" (opzionale)';
+$lang['txt_filename'] = 'Carica come (opzionale)';
$lang['txt_overwrt'] = 'Sovrascrivi file esistente';
$lang['lockedby'] = 'Attualmente bloccato da';
$lang['lockexpire'] = 'Il blocco scade alle';
@@ -111,28 +112,53 @@ $lang['uploadbadcontent'] = 'Il contenuto caricato non corrisponde all\'est
$lang['uploadspam'] = 'Il caricamento è stato bloccato dalla lista nera di spam.';
$lang['uploadxss'] = 'Il caricamento è stato bloccato perchè il contenuto potrebbe essere malizioso.';
$lang['uploadsize'] = 'Il file caricato è troppo grande. (massimo %s)';
-$lang['deletesucc'] = 'Il file "%s" è stato cancellato.';
-$lang['deletefail'] = '"%s" non può essere cancellato - verifica i permessi.';
-$lang['mediainuse'] = 'Il file "%s" non è stato cancellato - è ancora in uso.';
+$lang['deletesucc'] = 'Il file "%s" è stato eliminato.';
+$lang['deletefail'] = '"%s" non può essere eliminato - verifica i permessi.';
+$lang['mediainuse'] = 'Il file "%s" non è stato eliminato - è ancora in uso.';
$lang['namespaces'] = 'Categorie';
$lang['mediafiles'] = 'File disponibili in';
+$lang['js']['searchmedia'] = 'Cerca file';
$lang['js']['keepopen'] = 'Tieni la finestra aperta durante la selezione';
$lang['js']['hidedetails'] = 'Nascondi Dettagli';
+$lang['js']['mediatitle'] = 'Impostazioni link';
+$lang['js']['mediadisplay'] = 'Tipo link';
+$lang['js']['mediaalign'] = 'Allineamento';
+$lang['js']['mediasize'] = 'Dimensioni immagine';
+$lang['js']['mediatarget'] = 'Target del link';
+$lang['js']['mediaclose'] = 'Chiudi';
+$lang['js']['mediainsert'] = 'Inserisci';
+$lang['js']['mediadisplayimg'] = 'Mostra l\'immagine.';
+$lang['js']['mediadisplaylnk'] = 'Mostra solo il link.';
+$lang['js']['mediasmall'] = 'Versione piccola';
+$lang['js']['mediamedium'] = 'Versione media';
+$lang['js']['medialarge'] = 'Versione grande';
+$lang['js']['mediaoriginal'] = 'Versione originale';
+$lang['js']['medialnk'] = 'Link alla pagina dei dettagli';
+$lang['js']['mediadirect'] = 'Link all\'originale';
+$lang['js']['medianolnk'] = 'No link';
+$lang['js']['medianolink'] = 'Non linkare l\'immagine.';
+$lang['js']['medialeft'] = 'Allinea l\'immagine a sinistra.';
+$lang['js']['mediaright'] = 'Allinea l\'immagine a destra.';
+$lang['js']['mediacenter'] = 'Allinea l\'immagine al centro.';
+$lang['js']['medianoalign'] = 'Non allineare.';
$lang['js']['nosmblinks'] = 'I collegamenti con le risorse condivise di Windows funzionano solo con Microsoft Internet Explorer.
Puoi fare un copia/incolla di questo collegamento.';
+$lang['js']['linkwiz'] = 'Collegamento guidato';
+$lang['js']['linkto'] = 'Collega a:';
+$lang['js']['del_confirm'] = 'Eliminare veramente questa voce?';
$lang['js']['mu_btn'] = 'Carica più di un file alla volta';
$lang['mediausage'] = 'Usa la seguente sintassi per riferirti a questo file:';
$lang['mediaview'] = 'Mostra file originale';
$lang['mediaroot'] = 'directory principale';
-$lang['mediaupload'] = 'Carica un file nella categoria corrente. Per creare sottocategorie, falle precedere al nome del file nella casella "Carica come", separandole da due punti (:).';
+$lang['mediaupload'] = 'Carica un file nella categoria attuale. Per creare sottocategorie, falle precedere dal nome del file nella casella "Carica come", separandole da due punti (:).';
$lang['mediaextchange'] = 'Estensione del file modificata da .%s a .%s!';
$lang['reference'] = 'Riferimenti a';
-$lang['ref_inuse'] = 'Il file non può essere cancellato in quanto è ancora utilizzato dalle seguenti pagine:';
+$lang['ref_inuse'] = 'Il file non può essere eliminato in quanto è ancora utilizzato dalle seguenti pagine:';
$lang['ref_hidden'] = 'Sono presenti alcuni riferimenti a pagine per le quali non hai i permessi di lettura';
$lang['hits'] = 'Occorrenze trovate';
$lang['quickhits'] = 'Pagine trovate';
$lang['toc'] = 'Indice';
-$lang['current'] = 'versione corrente';
+$lang['current'] = 'versione attuale';
$lang['yours'] = 'la tua versione';
$lang['diff'] = 'differenze con la versione attuale';
$lang['diff2'] = 'differenze tra le versioni selezionate';
@@ -141,7 +167,7 @@ $lang['breadcrumb'] = 'Traccia';
$lang['youarehere'] = 'Ti trovi qui';
$lang['lastmod'] = 'Ultima modifica';
$lang['by'] = 'da';
-$lang['deleted'] = 'cancellata';
+$lang['deleted'] = 'eliminata';
$lang['created'] = 'creata';
$lang['restored'] = 'versione precedente ripristinata';
$lang['external_edit'] = 'modifica esterna';
@@ -150,7 +176,8 @@ $lang['noflash'] = 'E\' necessario <a href="http://www.adobe.com/p
$lang['download'] = 'Scarica lo "snippet"';
$lang['mail_newpage'] = 'pagina aggiunta:';
$lang['mail_changed'] = 'pagina modificata:';
-$lang['mail_new_user'] = 'Nuovo utente:';
+$lang['mail_subscribe_list'] = 'pagine modificate nella categoria:';
+$lang['mail_new_user'] = 'nuovo utente:';
$lang['mail_upload'] = 'file caricato:';
$lang['qb_bold'] = 'Grassetto';
$lang['qb_italic'] = 'Corsivo';
@@ -176,7 +203,7 @@ $lang['qb_media'] = 'Inserisci immagini o altri file';
$lang['qb_sig'] = 'Inserisci la firma';
$lang['qb_smileys'] = 'Smiley';
$lang['qb_chars'] = 'Caratteri speciali';
-$lang['js']['del_confirm'] = 'Cancellare questa voce?';
+$lang['upperns'] = 'vai alla categoria principale';
$lang['admin_register'] = 'Aggiungi un nuovo utente';
$lang['metaedit'] = 'Modifica metadati';
$lang['metasaveerr'] = 'Scrittura metadati fallita';
@@ -192,13 +219,24 @@ $lang['img_copyr'] = 'Copyright';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Camera';
$lang['img_keywords'] = 'Parole chiave';
-$lang['subscribe_success'] = '%s è stato aggiunto alla lista di sottoscrizione per la pagina %s';
-$lang['subscribe_error'] = 'Si è verificato un errore durante l\'aggiunta di %s alla lista di sottoscrizione per la pagina %s';
-$lang['subscribe_noaddress'] = 'Non c\'è alcun indirizzo associato con il tuo profilo, non puoi sottoscriverti ad alcuna lista';
-$lang['unsubscribe_success'] = '%s è stato rimosso dalla lista di sottoscrizione per la pagina %s';
-$lang['unsubscribe_error'] = 'Si è verificato un errore durante la rimozione di %s dalla lista di sottoscrizione per la pagina %s';
-$lang['authmodfailed'] = 'La configurazione dell\'autenticazione non è corretta. Per favore informa l\'amministratore di questo Wiki.';
-$lang['authtempfail'] = 'L\'autenticazione è temporaneamente non disponibile. Se questa situazione persiste, per favore informa l\'amministratore di questo Wiki.';
+$lang['subscr_subscribe_success'] = 'Aggiunto %s alla lista di sottoscrizione %s';
+$lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sottoscrizione %s';
+$lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizione';
+$lang['subscr_unsubscribe_success'] = 'Rimosso %s dalla lista di sottoscrizione %s';
+$lang['subscr_unsubscribe_error'] = 'Impossibile rimuovere %s dalla lista di sottoscrizione %s';
+$lang['subscr_already_subscribed'] = '% è già iscritto a %s';
+$lang['subscr_not_subscribed'] = '% non è iscritto a %s';
+$lang['subscr_m_not_subscribed'] = 'Attualmente non sei iscritto alla pagina o categoria corrente';
+$lang['subscr_m_new_header'] = 'Aggiungi sottoscrizione';
+$lang['subscr_m_current_header'] = 'Sottoscrizioni attuali';
+$lang['subscr_m_unsubscribe'] = 'Rimuovi sottoscrizione';
+$lang['subscr_m_subscribe'] = 'Sottoscrivi';
+$lang['subscr_m_receive'] = 'Ricevi';
+$lang['subscr_style_every'] = 'email per ogni modifica';
+$lang['subscr_style_digest'] = 'email riassuntiva delle modifiche di ogni pagina';
+$lang['subscr_style_list'] = 'elenco delle pagine modificate dall\'ultima email';
+$lang['authmodfailed'] = 'La configurazione dell\'autenticazione non è corretta. Informa l\'amministratore di questo Wiki.';
+$lang['authtempfail'] = 'L\'autenticazione è temporaneamente non disponibile. Se questa situazione persiste, informa l\'amministratore di questo Wiki.';
$lang['i_chooselang'] = 'Scegli la lingua';
$lang['i_installer'] = 'Installazione DokuWiki';
$lang['i_wikiname'] = 'Nome Wiki';
@@ -206,35 +244,43 @@ $lang['i_enableacl'] = 'Abilita ACL (consigliato)';
$lang['i_superuser'] = 'Amministratore';
$lang['i_problems'] = 'Si sono verificati problemi durante l\'installazione, indicati di seguito. Non è possibile continuare finché non saranno risolti.';
$lang['i_modified'] = 'Per motivi di sicurezza questa procedura funziona solamente con un\'installazione Dokuwiki nuova e non modificata.
- Dovresti ri-estrarre i file dal pacchetto scaricato oppure consultare tutte le
- <a href="http://dokuwiki.org/install">istruzioni per l\'installazione di Dokuwiki</a>';
-$lang['i_funcna'] = 'La funzione PHP <code>%s</code> non è disponibile. Forse il tuo provider l\'ha disabilitata per qualche motivo?';
+Dovresti ri-estrarre i file dal pacchetto scaricato oppure consultare tutte le
+<a href="http://dokuwiki.org/install">istruzioni per l\'installazione di Dokuwiki</a>';
+$lang['i_funcna'] = 'La funzione PHP <code>%s</code> non è disponibile. Forse è stata disabilitata dal tuo provider per qualche motivo?';
$lang['i_phpver'] = 'La versione di PHP <code>%s</code> è inferiore a quella richiesta <code>%s</code>. Devi aggiornare l\'installazione di PHP.';
$lang['i_permfail'] = 'DokuWiki non può scrivere <code>%s</code>. E\' necessario correggere i permessi per questa directory!';
$lang['i_confexists'] = '<code>%s</code> esiste già';
$lang['i_writeerr'] = 'Impossibile creare <code>%s</code>. E\' necessario verificare i permessi della directory/file e creare il file manualmente.';
$lang['i_badhash'] = 'dokuwiki.php (hash=<code>%s</code>) non riconosciuto o modificato';
$lang['i_badval'] = '<code>%s</code> - valore vuoto o non valido';
-$lang['i_success'] = 'La configurazione è stata completata correttamente. E\' ora possibile cancellare il file install.php. Continuare con
- <a href="doku.php">il nuovo DokuWiki</a>.';
+$lang['i_success'] = 'La configurazione è stata completata correttamente. Ora è possibile eliminare il file install.php. Continuare con
+<a href="doku.php">il nuovo DokuWiki</a>.';
$lang['i_failure'] = 'Si sono verificati errori durante la scrittura dei file di configurazione. Potrebbe essere necessario correggerli manualmente prima di poter utilizzare <a href="doku.php">il nuovo DokuWiki</a>.';
-$lang['i_policy'] = 'Policy di accesso iniziali';
+$lang['i_policy'] = 'Regole di accesso iniziali';
$lang['i_pol0'] = 'Wiki Aperto (lettura, scrittura, caricamento file per tutti)';
$lang['i_pol1'] = 'Wiki Pubblico (lettura per tutti, scrittura e caricamento file per gli utenti registrati)';
$lang['i_pol2'] = 'Wiki Chiuso (lettura, scrittura, caricamento file solamente per gli utenti registrati)';
$lang['i_retry'] = 'Riprova';
-$lang['mu_intro'] = 'Qui si possono caricare più di un file alla volta. Cliccare su "Sfoglia..." per aggiungere i file in coda. Cliccare "Carica" quando si è pronti.';
-$lang['mu_gridname'] = 'Nome del file';
+$lang['mu_intro'] = 'Qui si possono caricare più di un file alla volta. Cliccare su "Sfoglia..." per aggiungere i file in coda. Fai click su "Invia file" quando si è pronti.';
+$lang['mu_gridname'] = 'Nome file';
$lang['mu_gridsize'] = 'Dimensione';
$lang['mu_gridstat'] = 'Stato';
-$lang['mu_namespace'] = 'Namespace';
-$lang['mu_browse'] = 'Sfoglia...';
+$lang['mu_namespace'] = 'Categoria';
+$lang['mu_browse'] = 'Sfoglia';
$lang['mu_toobig'] = 'troppo grande';
-$lang['mu_ready'] = 'pronto per l\'upload';
+$lang['mu_ready'] = 'pronto per caricare';
$lang['mu_done'] = 'completo';
$lang['mu_fail'] = 'fallito';
$lang['mu_authfail'] = 'sessione scaduta';
$lang['mu_progress'] = '@PCT@% caricato';
$lang['mu_filetypes'] = 'Tipi di file permessi';
$lang['mu_info'] = 'file caricati.';
+$lang['mu_lasterr'] = 'Ultimo errore:';
$lang['recent_global'] = 'Stai attualmente vedendo le modifiche dentro l\'area <b>%s</b>. Puoi anche <a href="%s">vedere le modifiche recenti dell\'intero wiki</a>.';
+$lang['years'] = '%d anni fa';
+$lang['months'] = '%d mesi fa';
+$lang['weeks'] = '%d settimane fa';
+$lang['days'] = '%d giorni fa';
+$lang['hours'] = '%d ore fa';
+$lang['minutes'] = '%d minuti fa';
+$lang['seconds'] = '%d secondi fa';
diff --git a/inc/lang/it/login.txt b/inc/lang/it/login.txt
index 6487c8537..c6fd97b6f 100644
--- a/inc/lang/it/login.txt
+++ b/inc/lang/it/login.txt
@@ -1,4 +1,4 @@
-====== Login ======
+====== Accesso ======
Non sei ancora collegato! Inserisci il tuo nome utente e la tua password per autenticarti. E' necessario che il tuo browser abbia i cookie abilitati.
diff --git a/inc/lang/it/mailtext.txt b/inc/lang/it/mailtext.txt
index ee6e958b9..a4506e951 100644
--- a/inc/lang/it/mailtext.txt
+++ b/inc/lang/it/mailtext.txt
@@ -12,5 +12,5 @@ Oggetto della modifica : @SUMMARY@
--
-Questa e-mail è stata generata da DokuWiki su
+Questa email è stata generata dal DokuWiki di
@DOKUWIKIURL@
diff --git a/inc/lang/it/password.txt b/inc/lang/it/password.txt
index a14ce6078..d57c78913 100644
--- a/inc/lang/it/password.txt
+++ b/inc/lang/it/password.txt
@@ -1,4 +1,4 @@
-Ciao, @FULLNAME@!
+Ciao @FULLNAME@!
Questi sono i tuoi dati di accesso per @TITLE@ su @DOKUWIKIURL@
@@ -6,5 +6,5 @@ Nome utente : @LOGIN@
Password : @PASSWORD@
--
-Questa e-mail è stata generata da DokuWiki su
+Questa email è stata generata dal DokuWiki di
@DOKUWIKIURL@
diff --git a/inc/lang/it/pwconfirm.txt b/inc/lang/it/pwconfirm.txt
index 5437d077c..dfcd8a346 100644
--- a/inc/lang/it/pwconfirm.txt
+++ b/inc/lang/it/pwconfirm.txt
@@ -1,15 +1,15 @@
Ciao @FULLNAME@!
-Qualcuno ha richiesto una nuova password per il tuo @TITLE@
-login su @DOKUWIKIURL@
+Qualcuno ha richiesto una nuova password per il tuo accesso
+@TITLE@ a @DOKUWIKIURL@
Se non hai richiesto tu la nuova password ignora questa email.
-Per confermare che la richiesta è stata realmente inviata da te per favore usa il
-seguente link.
+Per confermare che la richiesta è stata realmente inviata da te usa il
+seguente collegamento.
@CONFIRM@
--
-Questa mail è stata generata da DokuWiki su
+Questa email è stata generata dal DokuWiki di
@DOKUWIKIURL@
diff --git a/inc/lang/it/register.txt b/inc/lang/it/register.txt
index 973aead78..74f57094d 100644
--- a/inc/lang/it/register.txt
+++ b/inc/lang/it/register.txt
@@ -1,4 +1,4 @@
====== Registrazione nuovo utente ======
-Riempi tutte le informazioni seguenti per creare un nuovo account in questo wiki. Assicurati di inserire un **indirizzo e-mail valido** - la tua nuova password ti sarà inviata con un messaggio di posta elettronica. La login dovrebbe essere un [[doku>pagename|nome di pagina]] valido.
+Riempi tutte le informazioni seguenti per creare un nuovo account in questo wiki. Assicurati di inserire un **indirizzo email valido** - la tua nuova password ti sarà inviata con un messaggio di posta elettronica. L'account dovrebbe essere un [[doku>pagename|nome di pagina]] valido.
diff --git a/inc/lang/it/registermail.txt b/inc/lang/it/registermail.txt
index 5a9f89344..e8af0d323 100644
--- a/inc/lang/it/registermail.txt
+++ b/inc/lang/it/registermail.txt
@@ -2,7 +2,7 @@ Un nuovo utente è stato registrato. Ecco i dettagli:
Nome utente : @NEWUSER@
Nome completo : @NEWNAME@
-E-Mail : @NEWEMAIL@
+EMail : @NEWEMAIL@
Data : @DATE@
Browser : @BROWSER@
@@ -10,5 +10,5 @@ Indirizzo IP : @IPADDRESS@
Nome macchina : @HOSTNAME@
--
-Questa mail è stata generata da DokuWiki su
+Questa email è stata generata dal DokuWiki di
@DOKUWIKIURL@
diff --git a/inc/lang/it/revisions.txt b/inc/lang/it/revisions.txt
index 984b4a068..19c501b07 100644
--- a/inc/lang/it/revisions.txt
+++ b/inc/lang/it/revisions.txt
@@ -1,3 +1,3 @@
====== Versione precedente ======
-Queste sono le precedenti versioni del documento corrente. Per ripristinare una versione precedente, seleziona la versione, modificala usando il pulsante ''Modifica questa pagina'' e salvala.
+Queste sono le versioni precedenti del documento attuale. Per ripristinare una versione precedente, seleziona la versione, modificala usando il pulsante ''Modifica questa pagina'' e salvala.
diff --git a/inc/lang/it/stopwords.txt b/inc/lang/it/stopwords.txt
index a6aa1cfc6..e91aa3b55 100644
--- a/inc/lang/it/stopwords.txt
+++ b/inc/lang/it/stopwords.txt
@@ -1,7 +1,7 @@
-# This is a list of words the indexer ignores, one word per line
-# When you edit this file be sure to use UNIX line endings (single newline)
-# No need to include words shorter than 3 chars - these are ignored anyway
-# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+# Questo è un elenco di parole che l'indicizzatore ignora, una parola per riga
+# Quando modifichi questo file fai attenzione ad usare la chiusura della riga in stile UNIX (nuova linea singola)
+# Non è necessario includere parole più brevi di 3 caratteri - queste vengono in ogni caso ignorate
+# Questo elenco è basato su quello trovato in http://www.ranks.nl/stopwords/
adesso
alla
allo
diff --git a/inc/lang/it/subscr_digest.txt b/inc/lang/it/subscr_digest.txt
new file mode 100644
index 000000000..8656f8536
--- /dev/null
+++ b/inc/lang/it/subscr_digest.txt
@@ -0,0 +1,20 @@
+Ciao!
+
+La pagina @PAGE@ nel wiki @TITLE@ è cambiata.
+Queste sono le modifiche:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vecchia revisione: @OLDPAGE@
+Nuova revisione: @NEWPAGE@
+
+Per annullare la pagina delle notifiche collegati al
+wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
+e rimuovi la sottoscrizione alle modifiche delle
+pagine e/o categorie.
+
+--
+Questa email è stata generata dal DokuWiki di
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/it/subscr_form.txt b/inc/lang/it/subscr_form.txt
new file mode 100644
index 000000000..54f66e44a
--- /dev/null
+++ b/inc/lang/it/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gestione iscrizioni ======
+
+Questa pagina permette di gestire le tue iscrizioni alla pagina e catogoria attuale. \ No newline at end of file
diff --git a/inc/lang/it/subscr_list.txt b/inc/lang/it/subscr_list.txt
new file mode 100644
index 000000000..e42f7d1ad
--- /dev/null
+++ b/inc/lang/it/subscr_list.txt
@@ -0,0 +1,18 @@
+Ciao!
+
+Le pagine nella categoria @PAGE@ del wiki @TITLE@ sono
+cambiate.
+Queste sono le pagine modificate:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Per annullare la pagina delle notifiche collegati al
+wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
+e rimuovi la sottoscrizione alle modifiche delle
+pagine e/o categorie.
+
+--
+Questa email è stata generata dal DokuWiki di
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/it/subscr_single.txt b/inc/lang/it/subscr_single.txt
new file mode 100644
index 000000000..2c4d5cbb8
--- /dev/null
+++ b/inc/lang/it/subscr_single.txt
@@ -0,0 +1,23 @@
+Ciao!
+
+La pagina @PAGE@ nel wiki @TITLE@ è cambiata.
+Queste sono le modifiche:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Utente : @USER@
+Sommario modifica: @SUMMARY@
+Vecchia revisione: @OLDPAGE@
+Nuova revisione: @NEWPAGE@
+
+Per annullare la pagina delle notifiche collegati al
+wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
+e rimuovi la sottoscrizione alle modifiche delle
+pagine e/o categorie.
+
+--
+Questa email è stata generata dal DokuWiki di
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/it/uploadmail.txt b/inc/lang/it/uploadmail.txt
index 56cebc6b1..d8d17a378 100644
--- a/inc/lang/it/uploadmail.txt
+++ b/inc/lang/it/uploadmail.txt
@@ -6,7 +6,7 @@ Browser : @BROWSER@
Indirizzo IP : @IPADDRESS@
Hostname : @HOSTNAME@
Dimensione : @SIZE@
-MIME Type : @MIME@
+Tipo MIME : @MIME@
Utente : @USER@
--
diff --git a/inc/lang/it/wordblock.txt b/inc/lang/it/wordblock.txt
deleted file mode 100644
index 510d6521d..000000000
--- a/inc/lang/it/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Modifica bloccata ======
-
-Le tue modifiche **non sono state salvate** perché contengono una o più parole vietate. Se hai cercato di spammare il Wiki -- bambino cattivo! Se pensi che sia un errore contatta l'amministratore di questo Wiki.
-
diff --git a/inc/lang/ja/wordblock.txt b/inc/lang/ja/wordblock.txt
deleted file mode 100644
index d7edd8765..000000000
--- a/inc/lang/ja/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== スパム ブロック ======
-
-除外する単語が含まれているため、変更は**保存されませんでした**。 もし意図したスパム行為でないのであれば、管理者に連絡してください。
-
diff --git a/inc/lang/ko/wordblock.txt b/inc/lang/ko/wordblock.txt
deleted file mode 100644
index 35e251187..000000000
--- a/inc/lang/ko/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== 스팸 차단 ======
-
-하나 혹은 그 이상의 차단된 단어가 포함되어 있으므로 변경 내용이 저장되지 **않았습니다.** 나쁜 로봇 같으니! 스팸이나 추가하려 하고! 만일 로봇이 아니라 사람이고, 오류라고 생각하신다면, 관리자에게 문의하십시오.
-
diff --git a/inc/lang/ku/wordblock.txt b/inc/lang/ku/wordblock.txt
deleted file mode 100644
index f0f7d759d..000000000
--- a/inc/lang/ku/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM blocked ======
-
-Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
-
diff --git a/inc/lang/lb/admin.txt b/inc/lang/lb/admin.txt
new file mode 100644
index 000000000..08f8b2fec
--- /dev/null
+++ b/inc/lang/lb/admin.txt
@@ -0,0 +1,3 @@
+====== Administratioun ======
+
+Hei ënnendrënner fënns de eng Lëscht mat administrativen Aufgaben déi am Dokuwiki zuer Verfügung stinn.
diff --git a/inc/lang/lb/adminplugins.txt b/inc/lang/lb/adminplugins.txt
new file mode 100644
index 000000000..95814007d
--- /dev/null
+++ b/inc/lang/lb/adminplugins.txt
@@ -0,0 +1 @@
+===== Zousätzlech Pluginen ===== \ No newline at end of file
diff --git a/inc/lang/lb/backlinks.txt b/inc/lang/lb/backlinks.txt
new file mode 100644
index 000000000..8b8fbd4ec
--- /dev/null
+++ b/inc/lang/lb/backlinks.txt
@@ -0,0 +1,3 @@
+====== Linken zeréck ======
+
+Dëst ass eng Lëscht mat Säiten déi schéngen op déi aktuell Säit zeréck ze verlinken.
diff --git a/inc/lang/lb/conflict.txt b/inc/lang/lb/conflict.txt
new file mode 100644
index 000000000..3a84e722f
--- /dev/null
+++ b/inc/lang/lb/conflict.txt
@@ -0,0 +1,5 @@
+====== Et gëtt méi eng nei Versioun ======
+
+Et gëtt méi eng nei Versioun vum Dokument wats de g'ännert hues. Dat geschitt wann en anere Benotzer dat selwecht Dokument ännert wärenddeems du et änners.
+
+Ënnersich d'Ënnerscheeder déi hei ënnendrënner ugewise gi grëndlech. Wanns de ''Späicheren'' auswiels, da gëtt deng Version gespäicher. Dréck op ''Ofbriechen'' fir déi aktuell Versioun ze halen.
diff --git a/inc/lang/lb/denied.txt b/inc/lang/lb/denied.txt
new file mode 100644
index 000000000..487bf2198
--- /dev/null
+++ b/inc/lang/lb/denied.txt
@@ -0,0 +1,3 @@
+======Erlaabnis verweigert======
+
+Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. Hues de vläicht vergiess dech anzeloggen?
diff --git a/inc/lang/lb/diff.txt b/inc/lang/lb/diff.txt
new file mode 100644
index 000000000..7838b9808
--- /dev/null
+++ b/inc/lang/lb/diff.txt
@@ -0,0 +1,3 @@
+====== Ënnerscheeder ======
+
+Hei sinn d'Ënnerscheeder zwëscht 2 Versiounen vun der Säit.
diff --git a/inc/lang/lb/draft.txt b/inc/lang/lb/draft.txt
new file mode 100644
index 000000000..2e2fc9daa
--- /dev/null
+++ b/inc/lang/lb/draft.txt
@@ -0,0 +1,5 @@
+====== Entworf fond ======
+
+Deng lescht Ännersessioun op dëser Säit gouf net richteg ofgeschloss. DokuWiki huet automatesch en Entworf wärend denger Aarbecht gespäichert deens de elo kanns benotzen fir mat dengen Ännerunge weiderzefueren. Hei ënnendrënner gesäiss de wat vun denger leschter Sessioun gespäichert gouf.
+
+Decidéier w.e.g. obs de deng verlueren Ännerungssessioun //zeréckhuelen//, den Entworf //läschen// oder d'Änneren //ofbrieche// wëlls.
diff --git a/inc/lang/lb/edit.txt b/inc/lang/lb/edit.txt
new file mode 100644
index 000000000..ca039d16f
--- /dev/null
+++ b/inc/lang/lb/edit.txt
@@ -0,0 +1 @@
+Änner d'Säit an dréck ''Späicheren''. Kuck [[wiki:syntax]] fir d'Wiki-Syntax. Änner d'Säit w.e.g. nëmme wanns de se **verbessere** kanns. Wanns de Saache probéiere wëlls, da léier deng éischt Schréck an der [[playground:playground|Sandkaul]].
diff --git a/inc/lang/lb/editrev.txt b/inc/lang/lb/editrev.txt
new file mode 100644
index 000000000..6d7a12929
--- /dev/null
+++ b/inc/lang/lb/editrev.txt
@@ -0,0 +1,2 @@
+**Du hues eng al Versioun vum Dokument gelueden!** Wanns de se änners, mëss de eng nei Versioun mat dësen Daten.
+---- \ No newline at end of file
diff --git a/inc/lang/lb/index.txt b/inc/lang/lb/index.txt
new file mode 100644
index 000000000..183e07a0f
--- /dev/null
+++ b/inc/lang/lb/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Dëst ass em Index vun all de Säiten gesënnert no [[doku>namespaces|namespaces]].
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
new file mode 100644
index 000000000..b3d3989ca
--- /dev/null
+++ b/inc/lang/lb/lang.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['doublequoteopening'] = '“';
+$lang['doublequoteclosing'] = '”';
+$lang['singlequoteopening'] = '‘';
+$lang['singlequoteclosing'] = '’';
+$lang['apostrophe'] = '\'';
+$lang['btn_edit'] = 'Dës Säit änneren';
+$lang['btn_source'] = 'Säitequell weisen';
+$lang['btn_show'] = 'Säit weisen';
+$lang['btn_create'] = 'Dës Säit uleeën';
+$lang['btn_search'] = 'Sichen';
+$lang['btn_save'] = 'Späicheren';
+$lang['btn_preview'] = 'Kucken ouni ofzespäicheren';
+$lang['btn_top'] = 'Zréck no uewen';
+$lang['btn_newer'] = '<< méi rezent';
+$lang['btn_older'] = 'manner rezent >>';
+$lang['btn_revs'] = 'Al Versiounen';
+$lang['btn_recent'] = 'Kierzlech Ännerungen';
+$lang['btn_upload'] = 'Eroplueden';
+$lang['btn_cancel'] = 'Ofbriechen';
+$lang['btn_index'] = 'Index';
+$lang['btn_secedit'] = 'Änneren';
+$lang['btn_login'] = 'Login';
+$lang['btn_logout'] = 'Logout';
+$lang['btn_admin'] = 'Admin';
+$lang['btn_update'] = 'Update';
+$lang['btn_delete'] = 'Läschen';
+$lang['btn_back'] = 'Zeréck';
+$lang['btn_backlink'] = 'Linker zeréck';
+$lang['btn_backtomedia'] = 'Zeréck bei d\'Auswiel vun de Mediadateien';
+$lang['btn_profile'] = 'Profil aktualiséieren';
+$lang['btn_reset'] = 'Zerécksetzen';
+$lang['btn_resendpwd'] = 'Nei Passwuert schécken';
+$lang['btn_draft'] = 'Entworf änneren';
+$lang['btn_recover'] = 'Entworf zeréckhuelen';
+$lang['btn_draftdel'] = 'Entworf läschen';
+$lang['loggedinas'] = 'Ageloggt als';
+$lang['user'] = 'Benotzernumm';
+$lang['pass'] = 'Passwuert';
+$lang['newpass'] = 'Nei Passwuert';
+$lang['oldpass'] = 'Aktuell Passwuert confirméieren';
+$lang['passchk'] = 'nach eng Kéier';
+$lang['remember'] = 'Verhal mech';
+$lang['fullname'] = 'Richtegen Numm';
+$lang['email'] = 'E-Mail';
+$lang['register'] = 'Registréieren';
+$lang['profile'] = 'Benotzerprofil';
+$lang['badlogin'] = 'Entschëllegt, de Benotzernumm oder d\'Passwuert war falsch';
+$lang['minoredit'] = 'Kleng Ännerungen';
+$lang['draftdate'] = 'Entworf automatesch gespäichert den';
+$lang['nosecedit'] = 'D\'Säit gouf an Zwëschenzäit g\'ännert, Sektiounsinfo veralt. Ganz Säit gouf aplaz gelueden.';
+$lang['regmissing'] = 'Du muss all d\'Felder ausfëllen.';
+$lang['reguexists'] = 'Et get schonn e Benotzer mat deem Numm.';
+$lang['regsuccess'] = 'De Benotzer gouf erstallt an d\'Passwuert via Email geschéckt.';
+$lang['regsuccess2'] = 'De Benotzer gouf erstallt.';
+$lang['regmailfail'] = 'Et gesäit aus wéi wann e Feeler beim schécke vun der Passwuertmail virkomm wier. Kontaktéier den Admin w.e.g.!';
+$lang['regbadmail'] = 'Déi Emailadress gesäit ongëlteg aus - wanns de mengs dat wier e Feeler, da kontaktéier den Admin w.e.g.';
+$lang['regbadpass'] = 'Déi 2 Passwieder si net t\'selwecht. Probéier nach eng Kéier w.e.g.';
+$lang['regpwmail'] = 'Däin DokuWiki Passwuert';
+$lang['reghere'] = 'Hues du nach keen Account? Da maach der een';
+$lang['profna'] = 'Dëse Wiki ënnestëtzt keng Ännerunge vum Profil';
+$lang['profnochange'] = 'Keng Ännerungen. Näischt ze man.';
+$lang['profnoempty'] = 'En eidele Numm oder Emailadress ass net erlaabt.';
+$lang['profchanged'] = 'Benotzerprofil erfollegräicht aktualiséiert.';
+$lang['pwdforget'] = 'Passwuert vergiess? Fro der e Neit';
+$lang['resendna'] = 'Dëse Wiki ënnerstëtzt net d\'Neiverschécke vu Passwieder.';
+$lang['resendpwd'] = 'Nei Passwuert schécke fir';
+$lang['resendpwdmissing'] = 'Du muss all Felder ausfëllen.';
+$lang['resendpwdnouser'] = 'Kann dëse Benotzer net an der Datebank fannen.';
+$lang['resendpwdbadauth'] = 'Den "Auth"-Code ass ongëlteg. Kuck no obs de dee ganze Konfirmationslink benotzt hues.';
+$lang['resendpwdconfirm'] = 'De Konfirmatiounslink gouf iwwer Email geschéckt.';
+$lang['resendpwdsuccess'] = 'Däi nei Passwuert gouf iwwer Email geschéckt.';
+$lang['license'] = 'Wann näischt anescht do steet, ass den Inhalt vun dësem Wiki ënner folgender Lizenz:';
+$lang['licenseok'] = 'Pass op: Wanns de dës Säit änners, bass de dermat averstan dass den Inhalt ënner folgender Lizenz lizenzéiert gëtt:';
+$lang['txt_upload'] = 'Wiel eng Datei fir eropzelueden';
+$lang['txt_filename'] = 'Eroplueden als (optional)';
+$lang['txt_overwrt'] = 'Bestehend Datei iwwerschreiwen';
+$lang['lockedby'] = 'Am Moment gespaart vun';
+$lang['lockexpire'] = 'D\'Spär leeft of ëm';
+$lang['willexpire'] = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
+$lang['notsavedyet'] = 'Net gespäicher Ännerunge gi verluer.\nWierklech weiderfueren?';
+$lang['rssfailed'] = 'Et ass e Feeler virkomm beim erofluede vun dësem Feed: ';
+$lang['nothingfound'] = 'Näischt fond.';
+$lang['mediaselect'] = 'Mediadateien';
+$lang['fileupload'] = 'Mediadateien eroplueden';
+$lang['uploadsucc'] = 'Upload erfollegräich';
+$lang['uploadfail'] = 'Feeler beim Upload. Vläicht falsch Rechter?';
+$lang['uploadwrong'] = 'Eroplueden net erlaabt. Dës Dateiendung ass verbueden!';
+$lang['uploadexist'] = 'Datei gët et schonn. Näischt gemaach.';
+$lang['uploadbadcontent'] = 'Den eropgeluedenen Inhalt stëmmt net mat der Dateiendung %s iwwereneen.';
+$lang['uploadspam'] = 'D\'Eropluede gouf duerch d\'Schwaarz Spamlëscht blockéiert.';
+$lang['uploadxss'] = 'D\'Eropluede gouf wéinst méiglechem béisaartegem Inhalt blockéiert.';
+$lang['uploadsize'] = 'Déi eropgelueden Datei war ze grouss. (max. %s)';
+$lang['deletesucc'] = 'D\'Datei "%s" gouf geläscht.';
+$lang['deletefail'] = '"%s" konnt net geläscht ginn. Kontroléier d\'Rechter.';
+$lang['mediainuse'] = 'D\'Datei "%s" gouf net geläscht - se ass nach am Gebrauch.';
+$lang['namespaces'] = 'Namespaces';
+$lang['mediafiles'] = 'Verfügbar Dateien am';
+$lang['js']['keepopen'] = 'Fënster beim Auswielen oploossen';
+$lang['js']['hidedetails'] = 'Deteiler verstoppen';
+$lang['mediausage'] = 'Benotz folgend Syntax fir dës Datei ze referenzéieren:';
+$lang['mediaview'] = 'Originaldatei weisen';
+$lang['mediaroot'] = 'root';
+$lang['mediaextchange'] = 'Dateiendung vun .%s op .%s g\'ännert!';
+$lang['reference'] = 'Referenzen fir';
+$lang['ref_inuse'] = 'D\'Datei ka net geläscht ginn wëll se nach ëmmer vu folgende Säite gebraucht gëtt:';
+$lang['ref_hidden'] = 'Verschidde Referenze sinn op Säiten wous de keng Rechter hues fir se ze kucken';
+$lang['hits'] = 'Treffer';
+$lang['quickhits'] = 'Säitenimm déi iwwereneestëmmen';
+$lang['toc'] = 'Inhaltsverzeechnes';
+$lang['current'] = 'aktuell';
+$lang['yours'] = 'Deng Versioun';
+$lang['diff'] = 'Weis d\'Ënnerscheeder zuer aktueller Versioun';
+$lang['diff2'] = 'Weis d\'Ënnerscheeder zwescht den ausgewielte Versiounen';
+$lang['line'] = 'Linn';
+$lang['breadcrumb'] = 'Spuer';
+$lang['youarehere'] = 'Du bass hei';
+$lang['lastmod'] = 'Fir d\'lescht g\'ännert';
+$lang['by'] = 'vun';
+$lang['deleted'] = 'geläscht';
+$lang['created'] = 'erstallt';
+$lang['restored'] = 'al Versioun zeréckgeholl';
+$lang['external_edit'] = 'extern Ännerung';
+$lang['summary'] = 'Resumé vun den Ännerungen';
+$lang['noflash'] = 'Den <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> get gebraucht fir dësen Inhalt unzeweisen.';
+$lang['mail_newpage'] = 'Säit bäigesat:';
+$lang['mail_changed'] = 'Säit geännert:';
+$lang['mail_subscribe_list'] = 'g\'ännert Säiten am Namespace:';
+$lang['mail_new_user'] = 'Neie Benotzer:';
+$lang['mail_upload'] = 'Datei eropgelueden:';
+$lang['qb_bold'] = 'Fetten Text';
+$lang['qb_italic'] = 'Schiefen Text';
+$lang['qb_underl'] = 'Ënnerstrachenen Text';
+$lang['qb_code'] = 'Code Text';
+$lang['qb_strike'] = 'Duerchgestrachenen Text';
+$lang['qb_h1'] = 'Iwwerschrëft vum 1. Niveau';
+$lang['qb_h2'] = 'Iwwerschrëft vum 2. Niveau';
+$lang['qb_h3'] = 'Iwwerschrëft vum 3. Niveau';
+$lang['qb_h4'] = 'Iwwerschrëft vum 4. Niveau';
+$lang['qb_h5'] = 'Iwwerschrëft vum 5. Niveau';
+$lang['qb_h'] = 'Iwwerschrëft';
+$lang['qb_hs'] = 'Iwwerschrëft auswielen';
+$lang['qb_hplus'] = 'Méi grouss Iwwerschrëft';
+$lang['qb_hminus'] = 'Méi kleng Iwwerschrëft';
+$lang['qb_hequal'] = 'Iwwerschrëft vum selwechte Niveau';
+$lang['qb_link'] = 'Interne Link';
+$lang['qb_extlink'] = 'Externe Link';
+$lang['qb_hr'] = 'Horizontale Stréch';
+$lang['qb_ol'] = 'Nummeréiert Lëscht';
+$lang['qb_ul'] = 'Onnummeréiert Lëscht';
+$lang['qb_media'] = 'Biller an aner Dateie bäisetzen';
+$lang['qb_sig'] = 'Ënnerschrëft afügen';
+$lang['qb_smileys'] = 'Smilien';
+$lang['qb_chars'] = 'Spezialzeechen';
+$lang['upperns'] = 'An de Namespace uewendriwwer sprangen';
+$lang['admin_register'] = 'Neie Benotzer bäisetzen';
+$lang['metaedit'] = 'Metadaten änneren';
+$lang['metasaveerr'] = 'Feeler beim Schreiwe vun de Metadaten';
+$lang['metasaveok'] = 'Metadate gespäichert';
+$lang['img_backto'] = 'Zeréck op';
+$lang['img_title'] = 'Titel';
+$lang['img_caption'] = 'Beschreiwung';
+$lang['img_date'] = 'Datum';
+$lang['img_fname'] = 'Dateinumm';
+$lang['img_fsize'] = 'Gréisst';
+$lang['img_artist'] = 'Fotograf';
+$lang['img_copyr'] = 'Copyright';
+$lang['img_format'] = 'Format';
+$lang['img_camera'] = 'Kamera';
+$lang['img_keywords'] = 'Schlësselwieder';
+$lang['authmodfailed'] = 'Falsch Konfiguratioun vun der Benotzerautentifikatioun. Informéier w.e.g. de Wiki Admin.';
+$lang['authtempfail'] = 'D\'Benotzerautentifikatioun ass de Moment net verfügbar. Wann dës Situatioun unhält, dann informéier w.e.g. de Wiki Admin.';
+$lang['i_chooselang'] = 'Wiel deng Sprooch';
+$lang['i_installer'] = 'DokuWiki Installer';
+$lang['i_wikiname'] = 'Numm vum Wiki';
+$lang['i_enableacl'] = 'ACL uschalten (rekommandéiert)';
+$lang['i_problems'] = 'Den Installer huet Problemer fond. Se stinn hei ënnendrënner. Du kanns net weiderfueren bis de se behuewen hues.';
+$lang['i_modified'] = 'Aus Sécherheetsgrënn funktionnéiert dëse Script nëmme mat enger neier an onverännerter Dokuwiki Installatioun. Entweder muss de d\'Dateie frësch extrahéieren oder kuck d\'komplett <a href="http://dokuwiki.org/install">Dokuwiki Installatiounsinstruktiounen</a>';
+$lang['i_funcna'] = 'PHP-Funktioun <code>%s</code> ass net verfügbar. Vläicht huet däi Provider se aus iergend engem Grond ausgeschalt.';
+$lang['i_phpver'] = 'Deng PHP-Versioun <code>%s</code> ass méi kleng wéi déi gebrauchte Versioun <code>%s</code>. Du muss deng PHP-Installatioun aktualiséieren. ';
+$lang['i_pol0'] = 'Oppene Wiki (liese, schreiwen an eroplueden fir jidfereen)';
+$lang['i_pol1'] = 'Ëffentleche Wiki (liesen fir jidfereen, schreiwen an eroplueden fir registréiert Benotzer)';
+$lang['i_pol2'] = 'Zouene Wiki (liesen, schreiwen, eroplueden nëmme fir registréiert Benotzer)';
+$lang['i_retry'] = 'Nach eng Kéier probéieren';
+$lang['mu_intro'] = 'Hei kanns de méi Dateie mateneen eroplueden. Klick op den Duerchsiche-Knäppchen fir se an d\'Schlaang ze setzen. Dréck op Eroplueden wanns de fäerdeg bass.';
+$lang['mu_gridname'] = 'Dateinumm';
+$lang['mu_gridsize'] = 'Gréisst';
+$lang['mu_gridstat'] = 'Status';
+$lang['mu_namespace'] = 'Namespace';
+$lang['mu_browse'] = 'Duerchsichen';
+$lang['mu_toobig'] = 'ze grouss';
+$lang['mu_ready'] = 'prett fir eropzelueden';
+$lang['mu_done'] = 'fäerdeg';
+$lang['mu_fail'] = 'feelgeschloen';
+$lang['mu_authfail'] = 'Sessioun ofgelaf';
+$lang['mu_progress'] = '@PCT@% eropgelueden';
+$lang['mu_filetypes'] = 'Erlaabten Dateitypen';
+$lang['mu_info'] = 'Dateien eropgelueden.';
+$lang['mu_lasterr'] = 'Leschte Feeler:';
+$lang['recent_global'] = 'Du kucks am Moment d\'Ännerungen innerhalb vum <b>%s</b> Namespace. Du kanns och <a href="%s">d\'Kierzilech Ännerungen vum ganze Wiki kucken</a>.';
+$lang['years'] = 'virun %d Joer';
+$lang['months'] = 'virun % Méint';
+$lang['weeks'] = 'virun %d Wochen';
+$lang['days'] = 'virun %d Deeg';
+$lang['hours'] = 'virun %d Stonnen';
+$lang['minutes'] = 'virun %d Minutten';
+$lang['seconds'] = 'virun %d Sekonnen';
diff --git a/inc/lang/lb/locked.txt b/inc/lang/lb/locked.txt
new file mode 100644
index 000000000..944efb251
--- /dev/null
+++ b/inc/lang/lb/locked.txt
@@ -0,0 +1,3 @@
+====== Säit gespaart ======
+
+Dës Säit ass am Moment duerch en anere Benotzer fir Ännerunge gespart. Du muss waarde bis e mat sengen Ännerunge fäerdeg ass oder d'Spär ofleeft. \ No newline at end of file
diff --git a/inc/lang/lb/login.txt b/inc/lang/lb/login.txt
new file mode 100644
index 000000000..7d0548ee7
--- /dev/null
+++ b/inc/lang/lb/login.txt
@@ -0,0 +1,3 @@
+====== Aloggen ======
+
+Du bass am Moment net ageloggt! Gëff deng Autoriséierungsinformatiounen hei ënnendrënner an. Du muss d'Cookien erlaabt hunn fir dech kënnen anzeloggen.
diff --git a/inc/lang/lb/mailtext.txt b/inc/lang/lb/mailtext.txt
new file mode 100644
index 000000000..520cd8483
--- /dev/null
+++ b/inc/lang/lb/mailtext.txt
@@ -0,0 +1,17 @@
+Et gouf eng Säit an dengem DokuWiki g'ännert oder nei erstallt. Hei sinn d'Detailer:
+
+Datum : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+Al Versioun : @OLDPAGE@
+Nei Versioun : @NEWPAGE@
+Zesummefaassung: @SUMMARY@
+Benotzer : @USER@
+
+@DIFF@
+
+
+--
+Dës Mail gouf generéiert vum DokuWiki op
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lb/newpage.txt b/inc/lang/lb/newpage.txt
new file mode 100644
index 000000000..93917614d
--- /dev/null
+++ b/inc/lang/lb/newpage.txt
@@ -0,0 +1,4 @@
+======Dësen Thema gëtt et nach net======
+
+Du hues op e Link vun enger Säit geklickt, déi et nach net gëtt. Wanns de déi néideg Rechter hues, da kanns de dës Säit uleeën andeems de op ''Dës Säit uleeën'' klicks.
+
diff --git a/inc/lang/lb/norev.txt b/inc/lang/lb/norev.txt
new file mode 100644
index 000000000..45a36ee91
--- /dev/null
+++ b/inc/lang/lb/norev.txt
@@ -0,0 +1,3 @@
+====== Keng sou Versioun ======
+
+Déi Versioun gëtt et net. Benotz de Kneppchen ''Al Versiounen'' fir eng Lëscht vun ale Versiounen vun dësem Dokument.
diff --git a/inc/lang/lb/password.txt b/inc/lang/lb/password.txt
new file mode 100644
index 000000000..bd8062e42
--- /dev/null
+++ b/inc/lang/lb/password.txt
@@ -0,0 +1,10 @@
+Moien @FULLNAME@!
+
+Hei sinn deng Benotzerdaten fir @TITLE@ op @DOKUWIKIURL@
+
+Benotzernumm : @LOGIN@
+Passwuert : @PASSWORD@
+
+--
+Dës Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lb/preview.txt b/inc/lang/lb/preview.txt
new file mode 100644
index 000000000..f131cdad8
--- /dev/null
+++ b/inc/lang/lb/preview.txt
@@ -0,0 +1,3 @@
+======Net gespäichert Versioun======
+
+Dëst ass nëmmen eng net gespäichert Versioun; d'Ännerunge sinn nach **net** gespäichert!
diff --git a/inc/lang/lb/pwconfirm.txt b/inc/lang/lb/pwconfirm.txt
new file mode 100644
index 000000000..11246572b
--- /dev/null
+++ b/inc/lang/lb/pwconfirm.txt
@@ -0,0 +1,15 @@
+Moien @FULLNAME@!
+
+Iergendeen huet e neit Passwuert fir däin @TITLE@
+login op @DOKUWIKIURL@ gefrot
+
+Wanns de kee nei Passwuert gefrot hues, dann ignoréier dës Mail.
+
+Fir ze konfirméieren dass du wierklech en neit Passwuert gefrot hues,
+klick op folgende Link.
+
+@CONFIRM@
+
+--
+Des Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lb/read.txt b/inc/lang/lb/read.txt
new file mode 100644
index 000000000..3f52bd679
--- /dev/null
+++ b/inc/lang/lb/read.txt
@@ -0,0 +1 @@
+Dës Säit ass nëmme fir ze kucken. Du kanns d'Quell kucken, mee net änneren. Fro däin Administrator wanns de mengs dat wier falsch.
diff --git a/inc/lang/lb/recent.txt b/inc/lang/lb/recent.txt
new file mode 100644
index 000000000..c7359e202
--- /dev/null
+++ b/inc/lang/lb/recent.txt
@@ -0,0 +1,4 @@
+====== Rezent Ännerungen ======
+
+Folgend Säite goufen an der lescht g'ännert.
+
diff --git a/inc/lang/lb/register.txt b/inc/lang/lb/register.txt
new file mode 100644
index 000000000..1e017e997
--- /dev/null
+++ b/inc/lang/lb/register.txt
@@ -0,0 +1,4 @@
+====== Als neie Benotzer registréieren ======
+
+Fëll alles hei ënnendrënner aus fir en neie Kont op dësem Wiki unzeleeën. Pass op dass de eng **gëlteg Emailadress** ugëss - wanns de net gefrot gëss hei e Passwuert anzeginn, da kriss de e neit op déi Adress geschéckt. De Benotzernumm soll e gëltege [[doku>pagename|Säitenumm]] sinn.
+
diff --git a/inc/lang/lb/registermail.txt b/inc/lang/lb/registermail.txt
new file mode 100644
index 000000000..0f4fee8ec
--- /dev/null
+++ b/inc/lang/lb/registermail.txt
@@ -0,0 +1,14 @@
+Et huet sech e neie Benotzer registréiert. Hei sinn d'Deteiler:
+
+Benotzernumm: @NEWUSER@
+Ganze Numm : @NEWNAME@
+Email : @NEWEMAIL@
+
+Datum : @DATE@
+Browser : @BROWSER@
+IP-Adress : @IPADDRESS@
+Hostnumm : @HOSTNAME@
+
+--
+Des Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lb/resendpwd.txt b/inc/lang/lb/resendpwd.txt
new file mode 100644
index 000000000..6ca4518dc
--- /dev/null
+++ b/inc/lang/lb/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Nei Passwuert schécken ======
+
+Gëff w.e.g. däi Benotzernumm an de Formulär hei ënnendrënner an fir e neit Passwuert fir dëse Wiki unzefroen. E Konfirmatiounslink gëtt dann op deng registréiert Emailadress geschéckt.
diff --git a/inc/lang/lb/revisions.txt b/inc/lang/lb/revisions.txt
new file mode 100644
index 000000000..7dec32759
--- /dev/null
+++ b/inc/lang/lb/revisions.txt
@@ -0,0 +1,3 @@
+====== Al Versiounen ======
+
+Hei sinn déi al Versiounen vun dësem Dokument. Fir op eng al Versioun zeréckzegoen, wiel se hei ënnendrënner eraus, klick ''Dës Säit änneren'' a späicher se.
diff --git a/inc/lang/lb/searchpage.txt b/inc/lang/lb/searchpage.txt
new file mode 100644
index 000000000..5e15a2c60
--- /dev/null
+++ b/inc/lang/lb/searchpage.txt
@@ -0,0 +1,5 @@
+======Sich======
+
+Hei ënnendrënner sinn d'Resultater vun der Sich. Wanns de net fënns wats de gesicht hues kanns de eng nei Säit mam Numm vun denger Sich uleeën.
+
+=====Resultater===== \ No newline at end of file
diff --git a/inc/lang/lb/showrev.txt b/inc/lang/lb/showrev.txt
new file mode 100644
index 000000000..f6e2deee8
--- /dev/null
+++ b/inc/lang/lb/showrev.txt
@@ -0,0 +1,2 @@
+**Dat hei ass eng al Versioun vum Document!**
+---- \ No newline at end of file
diff --git a/inc/lang/lb/updateprofile.txt b/inc/lang/lb/updateprofile.txt
new file mode 100644
index 000000000..326d62217
--- /dev/null
+++ b/inc/lang/lb/updateprofile.txt
@@ -0,0 +1,4 @@
+====== Profil aktualiséieren ======
+
+Du brauchs just d'Felder auszefëllen déis de wëlls änneren. Du kanns däi Benotzernumm net änneren.
+
diff --git a/inc/lang/lb/uploadmail.txt b/inc/lang/lb/uploadmail.txt
new file mode 100644
index 000000000..3c2587cb4
--- /dev/null
+++ b/inc/lang/lb/uploadmail.txt
@@ -0,0 +1,14 @@
+Eng Datei gouf op däin DokuWiki eropgelueden. Hei sinn d'Deteiler:
+
+Datei : @MEDIA@
+Datum : @DATE@
+Browser : @BROWSER@
+IP-Adress : @IPADDRESS@
+Hostnumm : @HOSTNAME@
+Gréisst : @SIZE@
+MIME Typ : @MIME@
+Benotzer : @USER@
+
+--
+Dës Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@
diff --git a/inc/lang/lt/wordblock.txt b/inc/lang/lt/wordblock.txt
deleted file mode 100644
index 43ac79bbf..000000000
--- a/inc/lang/lt/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== NESPAM'INK! ======
-
-Jūsų pakeitimai **nebuvo išsaugoti**, nes juose rasta vienas ar daugiau užblokuotų žodžių. Jeigu manote, kad tai klaida, susisiekite su administracija. Jeigu sugalvojote čia spam'inti - pyzdink nachui iš čia, byby bled!
-
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 5de7a0cc6..9e31cc54e 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -37,9 +37,6 @@ $lang['btn_back'] = 'Atpakaļ';
$lang['btn_backlink'] = 'Norādes uz lapu';
$lang['btn_backtomedia'] = 'Atpakaļ uz mēdiju failu izvēli';
$lang['btn_subscribe'] = 'Abonēt izmaiņu paziņojumus';
-$lang['btn_unsubscribe'] = 'Atteikties no izmaiņu paziņojumiem';
-$lang['btn_subscribens'] = 'Abonēt nodaļas izmaiņu paziņojumus';
-$lang['btn_unsubscribens'] = 'Atteikties no nodaļas izmaiņu paziņojumiem';
$lang['btn_profile'] = 'Labot savu profilu';
$lang['btn_reset'] = 'Atsaukt izmaiņas';
$lang['btn_resendpwd'] = 'Nosūtīt jaunu paroli';
@@ -114,6 +111,27 @@ $lang['mediafiles'] = 'Pieejamie faili';
$lang['js']['searchmedia'] = 'Meklēt failus';
$lang['js']['keepopen'] = 'Pēc faila izvēles logu paturēt atvērtu';
$lang['js']['hidedetails'] = 'Slēpt detaļas';
+$lang['js']['mediatitle'] = 'Saites īpašības';
+$lang['js']['mediadisplay'] = 'Saites tips';
+$lang['js']['mediaalign'] = 'Slēgums';
+$lang['js']['mediasize'] = 'Attēla izmērs';
+$lang['js']['mediatarget'] = 'Saite ved uz ';
+$lang['js']['mediaclose'] = 'Aizvērt';
+$lang['js']['mediainsert'] = 'Ievietot';
+$lang['js']['mediadisplayimg'] = 'Rādīt attēlu';
+$lang['js']['mediadisplaylnk'] = 'Rādīt tikai saiti';
+$lang['js']['mediasmall'] = 'Mazs';
+$lang['js']['mediamedium'] = 'Vidējs';
+$lang['js']['medialarge'] = 'Liels';
+$lang['js']['mediaoriginal'] = 'Oriģināls';
+$lang['js']['medialnk'] = 'Saite uz detaļām';
+$lang['js']['mediadirect'] = 'Tieša saite uz oriģinālu';
+$lang['js']['medianolnk'] = 'Bez saites';
+$lang['js']['medianolink'] = 'Bez saites uz attēlu';
+$lang['js']['medialeft'] = 'kreisais';
+$lang['js']['mediaright'] = 'labais';
+$lang['js']['mediacenter'] = 'centra';
+$lang['js']['medianoalign'] = 'neizlīdzināt';
$lang['js']['nosmblinks'] = 'Saites uz Windows resursiem darbojas tikai Microsoft Internet Explorer.
Protams, ka vari saiti kopēt un iespraust citā programmā.';
$lang['js']['linkwiz'] = 'Saišu vednis';
@@ -148,6 +166,7 @@ $lang['summary'] = 'Anotācija';
$lang['noflash'] = 'Lai attēlotu lapas saturu, vajag <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
$lang['mail_newpage'] = 'lapa pievienota:';
$lang['mail_changed'] = 'lapa mainīta:';
+$lang['mail_subscribe_list'] = 'Nodaļā mainītās lapas:';
$lang['mail_new_user'] = 'Jauns lietotājs:';
$lang['mail_upload'] = 'augšupielādētais fails:';
$lang['qb_bold'] = 'Trekninājums';
@@ -190,11 +209,22 @@ $lang['img_copyr'] = 'Autortiesības';
$lang['img_format'] = 'Formāts';
$lang['img_camera'] = 'Fotoaparāts';
$lang['img_keywords'] = 'Atslēgvārdi';
-$lang['subscribe_success'] = '%s pievienots %s abonentu sarakstam';
-$lang['subscribe_error'] = 'Kļūme pievienojot %s %s abonentu sarakstam';
-$lang['subscribe_noaddress'] = 'Nav zināma adrese, ko pievienot abonentu sarakstam';
-$lang['unsubscribe_success'] = ' %s svītrots no %s abonentu saraksta';
-$lang['unsubscribe_error'] = 'Kļūme svītrojot %s no %s abonentu saraksta';
+$lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam';
+$lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.';
+$lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.';
+$lang['subscr_unsubscribe_success'] = '%s abonements uz %s atsaukts';
+$lang['subscr_unsubscribe_error'] = 'Kļūme svītrojot %s no %s abonēšanas saraksta';
+$lang['subscr_already_subscribed'] = '%s jau abonē %s';
+$lang['subscr_not_subscribed'] = '%s neabonē %s';
+$lang['subscr_m_not_subscribed'] = 'Šī lapa vai nodaļa nav abonēta';
+$lang['subscr_m_new_header'] = 'Pievienot abonementu';
+$lang['subscr_m_current_header'] = 'Patlaban ir abonēts';
+$lang['subscr_m_unsubscribe'] = 'Atteikties no abonēšanas';
+$lang['subscr_m_subscribe'] = 'Abonēt';
+$lang['subscr_m_receive'] = 'Saņemt';
+$lang['subscr_style_every'] = 'vēstuli par katru izmaiņu';
+$lang['subscr_style_digest'] = 'kopsavilkumu par katru lapu';
+$lang['subscr_style_list'] = 'kopš pēdējās vēstules notikušo labojumu sarakstu';
$lang['authmodfailed'] = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzo ziņo Wiki administratoram.';
$lang['authtempfail'] = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.';
$lang['i_chooselang'] = 'Izvēlies valodu';
diff --git a/inc/lang/lv/subscr_digest.txt b/inc/lang/lv/subscr_digest.txt
new file mode 100644
index 000000000..98784050c
--- /dev/null
+++ b/inc/lang/lv/subscr_digest.txt
@@ -0,0 +1,19 @@
+Labdien!
+
+@TITLE@ viki nodaļā @PAGE@ ir mainījušās šadas lapas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vecā versija: @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+
+Lai atceltu izmaiņu paziņošanu, ielogojieties
+@DOKUWIKIURL@, apmeklējiet
+@SUBSCRIBE@
+un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
+
+--
+Šo vēstuli izveidoja DokuWiki no
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lv/subscr_form.txt b/inc/lang/lv/subscr_form.txt
new file mode 100644
index 000000000..9e3145f8e
--- /dev/null
+++ b/inc/lang/lv/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abonementu pārvaldnieks ======
+
+Te varat mainīt savu lapas vai nodaļas abonementu. \ No newline at end of file
diff --git a/inc/lang/lv/subscr_list.txt b/inc/lang/lv/subscr_list.txt
new file mode 100644
index 000000000..986b3786a
--- /dev/null
+++ b/inc/lang/lv/subscr_list.txt
@@ -0,0 +1,16 @@
+Labdien!
+
+@TITLE@ viki nodaļā @PAGE@ ir mainījušās šadas lapas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Lai atceltu izmaiņu paziņošanu, ielogojieties
+@DOKUWIKIURL@, apmeklējiet
+@SUBSCRIBE@
+un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
+
+--
+Šo vēstuli izveidoja DokuWiki no
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lv/subscr_single.txt b/inc/lang/lv/subscr_single.txt
new file mode 100644
index 000000000..ca6177809
--- /dev/null
+++ b/inc/lang/lv/subscr_single.txt
@@ -0,0 +1,23 @@
+Labdien!
+
+@TITLE@ viki nodaļā @PAGE@ ir mainījušās šadas lapas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datums : @DATE@
+Lietotājs : @USER@
+Izmaiņu anotācija: @SUMMARY@
+Vecā versija: @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+
+
+Lai atceltu izmaiņu paziņošanu, ielogojieties
+@DOKUWIKIURL@, apmeklējiet
+@SUBSCRIBE@
+un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
+
+--
+Šo vēstuli izveidoja DokuWiki no
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/lv/wordblock.txt b/inc/lang/lv/wordblock.txt
deleted file mode 100644
index aa7051c8d..000000000
--- a/inc/lang/lv/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAMs bloķēts ======
-
-Tavas izmaiņas **nav** saglabātas, jo satur vienu vai vairākus aizliegtos vārdus. Ja uzskati, ka tā ir kļūda, sazinies ar administratoru.
-
diff --git a/inc/lang/mg/wordblock.txt b/inc/lang/mg/wordblock.txt
deleted file mode 100644
index 581d67d16..000000000
--- a/inc/lang/mg/wordblock.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-====== SPAM Voasakana ======
-
-Tsy voarakitra ny fanovana nataonao satria misy teny voarara ao. Raha nanandrana nandefa spam ny wiki ianao dia -- Alika maty! Raha heverinao fa error dia ilazao ny Admin.
-
-
diff --git a/inc/lang/mk/adminplugins.txt b/inc/lang/mk/adminplugins.txt
new file mode 100644
index 000000000..28e2cc1d3
--- /dev/null
+++ b/inc/lang/mk/adminplugins.txt
@@ -0,0 +1 @@
+===== Додатни приклучоци ===== \ No newline at end of file
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
new file mode 100644
index 000000000..b33bea1a3
--- /dev/null
+++ b/inc/lang/mk/lang.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * mk 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/MessagesMk.php?view=co
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['doublequoteopening'] = '„';
+$lang['doublequoteclosing'] = '“';
+$lang['apostrophe'] = '\'';
+$lang['btn_edit'] = 'Уреди ја страницата';
+$lang['btn_source'] = 'Прикажи ја изворната страница';
+$lang['btn_show'] = 'Прикажи страница';
+$lang['btn_create'] = 'Креирај ја оваа страница';
+$lang['btn_search'] = 'Барај';
+$lang['btn_save'] = 'Зачувај';
+$lang['btn_preview'] = 'Преглед';
+$lang['btn_top'] = 'Назад до врв';
+$lang['btn_newer'] = '<< понови';
+$lang['btn_older'] = 'постари >>';
+$lang['btn_revs'] = 'Стари ревизии';
+$lang['btn_recent'] = 'Скорешни промени';
+$lang['btn_upload'] = 'Крени';
+$lang['btn_cancel'] = 'Откажи';
+$lang['btn_index'] = 'Индекс';
+$lang['btn_secedit'] = 'Уреди';
+$lang['btn_login'] = 'Најава';
+$lang['btn_logout'] = 'Одјава';
+$lang['btn_admin'] = 'Админ';
+$lang['btn_update'] = 'Ажурирај';
+$lang['btn_delete'] = 'Избриши';
+$lang['btn_back'] = 'Назад';
+$lang['btn_backlink'] = 'Повратни врски';
+$lang['btn_backtomedia'] = 'Назад до изборот за медиа-датотека';
+$lang['btn_subscribe'] = 'Менаџирај претплати';
+$lang['btn_profile'] = 'Ажурирај профил';
+$lang['btn_reset'] = 'Ресет';
+$lang['btn_resendpwd'] = 'Испрати нов пасворд';
+$lang['btn_draft'] = 'Уреди скица';
+$lang['btn_recover'] = 'Поврати скица';
+$lang['btn_draftdel'] = 'Избриши скица';
+$lang['btn_revert'] = 'Обнови';
+$lang['loggedinas'] = 'Најавен/а како';
+$lang['user'] = 'Корисничко име';
+$lang['pass'] = 'Лозинка';
+$lang['newpass'] = 'Нова лозинка';
+$lang['oldpass'] = 'Потврдете ја сегашната лозинка';
+$lang['passchk'] = 'уште еднаш';
+$lang['remember'] = 'Запомни ме';
+$lang['fullname'] = 'Вистинско име';
+$lang['email'] = 'Е-пошта';
+$lang['register'] = 'Регистрирај се';
+$lang['profile'] = 'Кориснички профил';
+$lang['badlogin'] = 'Жалам, корисничкото име или лозинката се погрешни.';
+$lang['minoredit'] = 'Мали измени';
+$lang['draftdate'] = 'Скицата е само-снимена на';
+$lang['nosecedit'] = 'Во меѓувреме страницата беше променета, информацискиот дел е со истечен период затоа се вчита целата страница.';
+$lang['regmissing'] = 'Жалам, мора да ги пополнеш сите полиња.';
+$lang['reguexists'] = 'Жалам, корисник со ова корисничко име веќе постои.';
+$lang['regsuccess'] = 'Корисникот е креиран и лозинката е испратена по е-пошта.';
+$lang['regsuccess2'] = 'Корисникот е креиран.';
+$lang['regmailfail'] = 'Изгледа дека се појави грешка при испраќањето на е-пошта со лозинката. Ве молам контактирајте го администраторот!';
+$lang['regbadmail'] = 'Дадената адреса за е-пошта изгледа невалидна - ако мислите дека ова е грешка, контактирајте го администраторот';
+$lang['regbadpass'] = 'Двете наведени лозинки не се исти, ве молам пробајте повторно.';
+$lang['regpwmail'] = 'Вашата DokuWiki лозинка';
+$lang['reghere'] = 'Се уште немаш сметка? Направи веќе една';
+$lang['profna'] = 'Ова вики не поддржува измена на профилот';
+$lang['profnochange'] = 'Нема промени, ништо за правење.';
+$lang['profnoempty'] = 'Празно име или адреса за е-пошта не е дозволено.';
+$lang['profchanged'] = 'Корисничкиот профил е успешно ажуриран.';
+$lang['pwdforget'] = 'Ја заборавивте лозинката? Добијте нова';
+$lang['resendna'] = 'Ова вики не поддржува повторно испраќање на лозинка.';
+$lang['resendpwd'] = 'Испрати нова лозинка за';
+$lang['resendpwdmissing'] = 'Жалам, морате да ги пополните сите полиња.';
+$lang['resendpwdnouser'] = 'Жалам, таков корисник не постои во нашата база со податоци.';
+$lang['resendpwdbadauth'] = 'Жалам, овај код за валидација не е валиден. Проверете повторно дали ја искористивте целосната врска за потврда.';
+$lang['resendpwdconfirm'] = 'Врска за потврда е испратена по е-пошта.';
+$lang['resendpwdsuccess'] = 'Вашата нова лозинка е испратена по е-пошта.';
+$lang['license'] = 'Освен каде што е наведено поинаку, содржината на ова вики е лиценцирано по следнава лиценца:';
+$lang['licenseok'] = 'Забелешка: со уредување на оваа страница се согласувате да ја лиценцирате вашата содржина под следнава лиценца:';
+$lang['searchmedia'] = 'Барај име на датотека:';
+$lang['searchmedia_in'] = 'Барај во %s';
+$lang['txt_upload'] = 'Избери датотека за качување';
+$lang['txt_filename'] = 'Качи како (неморално)';
+$lang['txt_overwrt'] = 'Пребриши ја веќе постоечката датотека';
+$lang['lockedby'] = 'Моментално заклучена од';
+$lang['lockexpire'] = 'Клучот истекува на';
+$lang['willexpire'] = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
+$lang['notsavedyet'] = 'Незачуваните промени ќе бидат изгубени.\nСакате да продолжите?';
+$lang['rssfailed'] = 'Се појави грешка при повлекувањето на овој канал:';
+$lang['nothingfound'] = 'Ништо не е пронајдено.';
+$lang['mediaselect'] = 'Медиа датотеки';
+$lang['fileupload'] = 'Качување на медиа датотеки';
+$lang['uploadsucc'] = 'Качувањето е успешно';
+$lang['uploadfail'] = 'Качувањето не е успешно. Можеби има погрешни пермисии?';
+$lang['uploadwrong'] = 'Качувањето е одбиено. Наставката на датотеката е забранета!';
+$lang['uploadexist'] = 'Датотеката веќе постои. Ништо не е направено.';
+$lang['uploadbadcontent'] = 'Качената содржина не се совпаѓа со наставката %s на датотеката.';
+$lang['uploadspam'] = 'Качувањето беше блокирано од црната листа за спам.';
+$lang['uploadxss'] = 'Качувањето беше блокирано за можна злонамерна содржина.';
+$lang['uploadsize'] = 'Датотеката за качување е премногу голема. (макс. %s)';
+$lang['deletesucc'] = 'Датотеката „%s“ е избришана.';
+$lang['deletefail'] = '„%s“ не може да се избрише - проверете пермисии.';
+$lang['mediainuse'] = 'Датотеката „%s“ не е избришана - се уште е во употреба.';
+$lang['mediafiles'] = 'Достапни датотеки во';
+$lang['js']['searchmedia'] = 'Барај датотеки';
+$lang['js']['keepopen'] = 'Задржи го прозорецот отворен на означеното место';
+$lang['js']['hidedetails'] = 'Скриј детали';
+$lang['js']['nosmblinks'] = 'Поврзувањето со Windows Shares работи само со Microsoft Internet Explorer. Сепак можете да ја копирате и вметнете врската.';
+$lang['js']['linkwiz'] = 'Волшебник за врски';
+$lang['js']['linkto'] = 'Врска до:';
+$lang['js']['del_confirm'] = 'Дали навистина да ги избришам избраните датотеки?';
+$lang['js']['mu_btn'] = 'Качете повеќе датотеки наеднаш';
+$lang['mediausage'] = 'Користете ја следнава синтакса за референцирање кон оваа датотека:';
+$lang['mediaview'] = 'Види ја оригиналната датотека';
+$lang['mediaroot'] = 'root';
+$lang['mediaextchange'] = 'Наставката на датотеката е сменета од .%s во .%s!';
+$lang['reference'] = 'Референци за';
+$lang['ref_inuse'] = 'Датотеката не може да биде избришана бидејќи се уште се користи од следниве страници:';
+$lang['ref_hidden'] = 'Некои референци се на страници на кои немате пермисии за читање';
+$lang['hits'] = 'Прегледи';
+$lang['quickhits'] = 'Совпаѓачки имиња на страници';
+$lang['toc'] = 'Содржина';
+$lang['current'] = 'сегашно';
+$lang['yours'] = 'Вашата верзија';
+$lang['diff'] = 'Прикажи разлики со сегашната верзија';
+$lang['diff2'] = 'Прикажи разлики помеѓу избраните ревизии';
+$lang['line'] = 'Линија';
+$lang['breadcrumb'] = 'Следи';
+$lang['youarehere'] = 'Вие сте тука';
+$lang['lastmod'] = 'Последно изменета';
+$lang['by'] = 'од';
+$lang['deleted'] = 'отстранета';
+$lang['created'] = 'креирана';
+$lang['restored'] = 'обновена е стара ревизија';
+$lang['external_edit'] = 'надворешно уредување';
+$lang['summary'] = 'Уреди го изводот';
+$lang['noflash'] = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash приклучокот</a> е потребен за да се прикаже оваа содржина.';
+$lang['download'] = 'Симни Snippe';
+$lang['mail_newpage'] = 'додадена е страницата:';
+$lang['mail_changed'] = 'променета е страницата:';
+$lang['mail_new_user'] = 'нов корисник:';
+$lang['mail_upload'] = 'качена е датотеката:';
+$lang['qb_bold'] = 'Задебелен текст';
+$lang['qb_italic'] = 'Накосен текст';
+$lang['qb_underl'] = 'Подвлечен текст';
+$lang['qb_code'] = 'Текст за код';
+$lang['qb_strike'] = 'Прецртан текст';
+$lang['qb_h1'] = 'Заглавие од 1-во ниво';
+$lang['qb_h2'] = 'Заглавие од 2-ро ниво';
+$lang['qb_h3'] = 'Заглавие од 3-то ниво';
+$lang['qb_h4'] = 'Заглавие од 4-то ниво';
+$lang['qb_h5'] = 'Заглавие од 5-то ниво';
+$lang['qb_h'] = 'Заглавие';
+$lang['qb_hs'] = 'Избери заглавие';
+$lang['qb_hplus'] = 'Зголеми заглавие';
+$lang['qb_hminus'] = 'Намали заглавие';
+$lang['qb_hequal'] = 'Заглавие од исто ниво';
+$lang['qb_link'] = 'Внатрешна врска';
+$lang['qb_extlink'] = 'Надворешна врска';
+$lang['qb_hr'] = 'Хоризонтален линијар';
+$lang['qb_media'] = 'Додај слики и други датотеки';
+$lang['qb_sig'] = 'Внеси потпис';
+$lang['qb_smileys'] = 'Смајлиња';
+$lang['qb_chars'] = 'Специјални знаци';
+$lang['admin_register'] = 'Додај нов корисник';
+$lang['metaedit'] = 'Уреди мета-податоци';
+$lang['metasaveerr'] = 'Запишување на мета-податоците не успеа';
+$lang['metasaveok'] = 'Мета-податоците се зачувани';
+$lang['img_backto'] = 'Назад до';
+$lang['img_title'] = 'Насловна линија';
+$lang['img_caption'] = 'Наслов';
+$lang['img_date'] = 'Датум';
+$lang['img_fname'] = 'Име на датотека';
+$lang['img_fsize'] = 'Големина';
+$lang['img_artist'] = 'Фотограф';
+$lang['img_copyr'] = 'Авторско право';
+$lang['img_format'] = 'Формат';
+$lang['img_camera'] = 'Камера';
+$lang['img_keywords'] = 'Клучни зборови';
+$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'] = 'е-пошта со преглед од промените за секоја страница';
+$lang['subscr_style_list'] = 'листа на променети страници од последната е-пошта';
+$lang['authmodfailed'] = 'Лоша конфигурација за автентикација на корисник. Ве молам информирајте го вики администратор.';
+$lang['authtempfail'] = 'Автентикација на корисник е привремено недостапна. Ако оваа ситуација истрајува, ве молам известете го вики администратор.';
+$lang['i_chooselang'] = 'Избере јазик';
+$lang['i_installer'] = 'Инсталер за DokuWiki';
+$lang['i_wikiname'] = 'вики име';
+$lang['i_enableacl'] = 'Овозможи ACL (препорачано)';
+$lang['i_superuser'] = 'Супер корисник';
+$lang['i_problems'] = 'Инсталерот пронајде неколку проблеми кои се прикажани подолу. Не можете да продолжите понатаму се додека не ги поправите.';
+$lang['i_modified'] = 'За безбедносни причини оваа скрипта ќе работи само со нова и неизменета инсталација од DokuWiki. Или извадете ги повторно датотеките од симнатиот пакет или консултирајте се со комплетните <a href="http://dokuwiki.org/install">Dokuwiki инструкции за инсталација</a>';
+$lang['i_funcna'] = 'PHP функцијата <code>%s</code> не е достапна. Можеби вашиот хостинг провајдер ја оневозможил со причина?';
+$lang['i_phpver'] = 'Вашата верзија на PHP <code>%s</code> е пониска од потребната <code>%s</code>. Треба да ја надградите вашата PHP инсталација.';
+$lang['i_permfail'] = '<code>%s</code> не е запишлива од DokuWiki. Треба да ги поправите подесувањата за пермисии на овој директориум!';
+$lang['i_confexists'] = '<code>%s</code> веќе постои';
+$lang['i_writeerr'] = 'Не може да се креира <code>%s</code>. Треба да ги проверите пермисиите на директориумот/датотеката и рачно да ја креирате датотеката.';
+$lang['i_badhash'] = 'непозната или изменете dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval'] = '<code>%s</code> - нелегална или празна вредност';
+$lang['i_success'] = 'Конфигурацијата успешно заврши. Сега можете да ја избришете датотеката install.php. Продолжете до <a href="doku.php">вашето ново DokuWiki</a>.';
+$lang['i_failure'] = 'Се појавија некои грешки при запишувањето на конфигурациските датотеки. Можеби треба да ги поравите рачно пред да можете да го користите <a href="doku.php">вашето ново DokuWiki</a>.';
+$lang['i_policy'] = 'Почетна ACL политика';
+$lang['i_pol0'] = 'Отвори вики (читај, запиши, качи за сите)';
+$lang['i_pol1'] = 'Јавно вики (читај за сите, запиши и качи за регистрирани корисници)';
+$lang['i_pol2'] = 'Затворено вики (читај, запиши, качи само за регистрирани корисници)';
+$lang['i_retry'] = 'Пробај повторно';
+$lang['mu_intro'] = 'Овде можете да прикачите повеќе датотеки од еднаш. Кликнете на копчето за пребарување за да ги додадете во редица. Притиснете на качи кога е готово.';
+$lang['mu_gridname'] = 'Име на датотека';
+$lang['mu_gridsize'] = 'Големина';
+$lang['mu_gridstat'] = 'Состојба';
+$lang['mu_browse'] = 'Пребарај';
+$lang['mu_toobig'] = 'премногу голема';
+$lang['mu_ready'] = 'спремна за качување';
+$lang['mu_done'] = 'комплетно';
+$lang['mu_fail'] = 'неуспешно';
+$lang['mu_authfail'] = 'сесијата истече';
+$lang['mu_progress'] = '@PCT@% качено';
+$lang['mu_filetypes'] = 'Дозволено типови на датотеки';
+$lang['mu_info'] = 'качени датотеки.';
+$lang['mu_lasterr'] = 'Последна грешка: ';
+$lang['years'] = 'пред %d години';
+$lang['months'] = 'пред %d месеци';
+$lang['weeks'] = 'пред %d недели';
+$lang['days'] = 'пред %d денови';
+$lang['hours'] = 'пред %d часа';
+$lang['minutes'] = 'пред %d минути';
+$lang['seconds'] = 'пред %d секунди';
diff --git a/inc/lang/mk/read.txt b/inc/lang/mk/read.txt
new file mode 100644
index 000000000..8c8726eea
--- /dev/null
+++ b/inc/lang/mk/read.txt
@@ -0,0 +1 @@
+Оваа страница е само за читање. Можете да го гледате изворот, но не можете да ја менувате. Ако мислите дека ова е погрешно, контактирајте го администраторот. \ No newline at end of file
diff --git a/inc/lang/mk/recent.txt b/inc/lang/mk/recent.txt
new file mode 100644
index 000000000..cfbba4aa2
--- /dev/null
+++ b/inc/lang/mk/recent.txt
@@ -0,0 +1,3 @@
+====== Скорешни промени ======
+
+Следниве страници беа скорешно променети. \ No newline at end of file
diff --git a/inc/lang/mk/showrev.txt b/inc/lang/mk/showrev.txt
new file mode 100644
index 000000000..a0ca7353e
--- /dev/null
+++ b/inc/lang/mk/showrev.txt
@@ -0,0 +1,2 @@
+**Ова е стара ревизија од документото!**
+---- \ No newline at end of file
diff --git a/inc/lang/mr/wordblock.txt b/inc/lang/mr/wordblock.txt
deleted file mode 100644
index e885cbed9..000000000
--- a/inc/lang/mr/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== भंकस रोखली ======
-
-तुमचे बदल सुरक्षित केलेले ** नाहीत ** कारण त्यामधे एक किंवा अधिक निषिद्ध शब्द आहेत. जर तुम्ही मुद्दामच विकिवर भंकस करण्याचा प्रयत्न केला असेल तर असले चाळे बंद करा ! आणि समजा तुम्हाला असा वाटत असेल की हा मजकूर निषिद्ध समजण्याचे काही कारण नाही तर तुमच्या विकी व्यवस्थापकाशी संपर्क साधा. \ No newline at end of file
diff --git a/inc/lang/nl/wordblock.txt b/inc/lang/nl/wordblock.txt
deleted file mode 100644
index d887d7318..000000000
--- a/inc/lang/nl/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM geblokkeerd ======
-
-Je wijzigingen zijn **niet** opgeslagen omdat ze een of meer geblokkeerde woorden bevatten. Als je probeerde de Wiki te spammen -- Foei stouterd! Als je denkt dat dit een fout is neem dan contact op met de beheerder van deze Wiki.
-
diff --git a/inc/lang/no/wordblock.txt b/inc/lang/no/wordblock.txt
deleted file mode 100644
index 30c4c31ce..000000000
--- a/inc/lang/no/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Ordsperre ======
-
-Dine endringer har **ikke** blitt lagret på grunn av at de inneholder ett eller flere ord som er sperret. Hvis du har forsøkt å lagre søppel, eller såkalt ''spam'' -- Fy deg! Hvis du anser denne beskjeden som feilaktig kan du kontakte administratoren til denne wikien.
-
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 882806577..408093a59 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -7,6 +7,8 @@
* @author Mariusz Kujawski <marinespl@gmail.com>
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -40,9 +42,6 @@ $lang['btn_back'] = 'Wstecz';
$lang['btn_backlink'] = 'Odnośniki';
$lang['btn_backtomedia'] = 'Powrót do wyboru pliku';
$lang['btn_subscribe'] = 'Subskrybuj zmiany';
-$lang['btn_unsubscribe'] = 'Zaprzestań subskrypcji zmian';
-$lang['btn_subscribens'] = 'Subskrybuj zmiany w katalogu';
-$lang['btn_unsubscribens'] = 'Zaprzestań subskrypcji zmian w katalogu';
$lang['btn_profile'] = 'Aktualizuj profil';
$lang['btn_reset'] = 'Resetuj';
$lang['btn_resendpwd'] = 'Prześlij nowe hasło';
@@ -152,6 +151,7 @@ $lang['noflash'] = 'Plugin <a href="http://www.adobe.com/products/
$lang['download'] = 'Pobierz zrzut';
$lang['mail_newpage'] = 'Strona dodana:';
$lang['mail_changed'] = 'Strona zmieniona:';
+$lang['mail_subscribe_list'] = 'Zmienione strony w katalogu:';
$lang['mail_new_user'] = 'Nowy użytkownik:';
$lang['mail_upload'] = 'Umieszczono plik:';
$lang['qb_bold'] = 'Pogrubienie';
@@ -194,11 +194,22 @@ $lang['img_copyr'] = 'Prawa autorskie';
$lang['img_format'] = 'Format';
$lang['img_camera'] = 'Aparat';
$lang['img_keywords'] = 'Słowa kluczowe';
-$lang['subscribe_success'] = 'Dodano %s do listy subskrypcji strony %s';
-$lang['subscribe_error'] = 'Błąd przy dodawaniu %s do listy subskrypcji strony %s';
-$lang['subscribe_noaddress'] = 'Nie podałeś adresu e-mail przy rejestracji, nie możesz zostać dodany do listy subskrypcji.';
-$lang['unsubscribe_success'] = 'Usunięto %s z listy subskrypcji strony %s';
-$lang['unsubscribe_error'] = 'Błąd przy usuwaniu %s z listy subskrypcji strony %s';
+$lang['subscr_subscribe_success'] = 'Dodano %s do listy subskrypcji %s';
+$lang['subscr_subscribe_error'] = 'Błąd podczas dodawania %s do listy subskrypcji %s';
+$lang['subscr_subscribe_noaddress'] = 'Brak adresu skojarzonego z twoim loginem, nie możesz zostać dodany(a) do listy subskrypcji';
+$lang['subscr_unsubscribe_success'] = 'Usunięto %s z listy subskrypcji %s';
+$lang['subscr_unsubscribe_error'] = 'Błąd podczas usuwania %s z listy subskrypcji %s';
+$lang['subscr_already_subscribed'] = '%s jest już subskrybowany(a) przez %s';
+$lang['subscr_not_subscribed'] = '%s nie jest subskrybowany(a) przez %s';
+$lang['subscr_m_not_subscribed'] = 'Obecnie nie subskrybujesz bieżącej strony lub katalogu.';
+$lang['subscr_m_new_header'] = 'Dodaj subskrypcję';
+$lang['subscr_m_current_header'] = 'Aktualne subskrypcje';
+$lang['subscr_m_unsubscribe'] = 'Zrezygnuj z subskrypcji';
+$lang['subscr_m_subscribe'] = 'Subskrybuj';
+$lang['subscr_m_receive'] = 'Otrzymuj';
+$lang['subscr_style_every'] = 'email przy każdej zmianie';
+$lang['subscr_style_digest'] = 'email ze streszczeniem zmian dla każdej ze stron';
+$lang['subscr_style_list'] = 'lista zmienionych stron od czasu ostatniego emaila';
$lang['authmodfailed'] = 'Błąd uwierzytelnienia. Powiadom administratora tego wiki.';
$lang['authtempfail'] = 'Uwierzytelnienie użytkownika jest w tej chwili niemożliwe. Jeśli ta sytuacja się powtórzy, powiadom administratora tego wiki.';
$lang['i_chooselang'] = 'Wybierz język';
diff --git a/inc/lang/pl/subscr_digest.txt b/inc/lang/pl/subscr_digest.txt
new file mode 100644
index 000000000..2b1f63c1b
--- /dev/null
+++ b/inc/lang/pl/subscr_digest.txt
@@ -0,0 +1,21 @@
+Witaj!
+
+Treść strony @PAGE@ na wiki @TITLE@ uległa
+następującym zmianom:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Stara wersja: @OLDPAGE@
+Nowa wersja: @NEWPAGE@
+
+Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
+@DOKUWIKIURL@, a następnie odwiedź
+@SUBSCRIBE@
+i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
+katalogach.
+
+--
+Ta wiadomość została wygenerowana przez DokuWiki na
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pl/subscr_form.txt b/inc/lang/pl/subscr_form.txt
new file mode 100644
index 000000000..59fdbdb89
--- /dev/null
+++ b/inc/lang/pl/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Zarządzanie Subskrypcją ======
+
+Ta strona pozwala Tobie na zarządzanie Twoimi subskrypcjami dla obecnej strony i katalogu. \ No newline at end of file
diff --git a/inc/lang/pl/subscr_list.txt b/inc/lang/pl/subscr_list.txt
new file mode 100644
index 000000000..9a74d757b
--- /dev/null
+++ b/inc/lang/pl/subscr_list.txt
@@ -0,0 +1,18 @@
+Witaj!
+
+Strony w katalogu @PAGE@ na wiki @TITLE@ uległy
+następującym zmianom:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
+@DOKUWIKIURL@, a następnie odwiedź
+@SUBSCRIBE@
+i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
+katalogach.
+
+--
+Ta wiadomość została wygenerowana przez DokuWiki na
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pl/subscr_single.txt b/inc/lang/pl/subscr_single.txt
new file mode 100644
index 000000000..3f4bc7314
--- /dev/null
+++ b/inc/lang/pl/subscr_single.txt
@@ -0,0 +1,24 @@
+Witaj!
+
+Treść strony @PAGE@ na wiki @TITLE@ uległa
+następującym zmianom:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data: @DATE@
+Użytkownik: @USER@
+Podsumowanie zmian: @SUMMARY@
+Stara wersja: @OLDPAGE@
+Nowa wersja: @NEWPAGE@
+
+Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
+@DOKUWIKIURL@, a następnie odwiedź
+@SUBSCRIBE@
+i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
+katalogach.
+
+--
+Ta wiadomość została wygenerowana przez DokuWiki na
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/pl/wordblock.txt b/inc/lang/pl/wordblock.txt
deleted file mode 100644
index 09edb25dd..000000000
--- a/inc/lang/pl/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Blokowanie niedozwolonych treści i spamu ======
-
-Twoje zmiany **nie** zostały zapisane, ponieważ zawierają niedozwolone słowa. Jeśli próbowałeś(aś) umieścić niedozwolone treści to wstydź się!
-
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index ed7224c14..8b7493cc6 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -16,6 +16,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -49,9 +50,6 @@ $lang['btn_back'] = 'Voltar';
$lang['btn_backlink'] = 'Links reversos';
$lang['btn_backtomedia'] = 'Voltar à seleção do arquivo de mídia';
$lang['btn_subscribe'] = 'Monitorar alterações na página';
-$lang['btn_unsubscribe'] = 'Cancelar monitoramento da página';
-$lang['btn_subscribens'] = 'Monitorar alterações no espaço de nomes';
-$lang['btn_unsubscribens'] = 'Cancelar monitoramento do espaço de nomes';
$lang['btn_profile'] = 'Atualizar o perfil';
$lang['btn_reset'] = 'Limpar';
$lang['btn_resendpwd'] = 'Enviar uma nova senha';
@@ -97,6 +95,8 @@ $lang['resendpwdconfirm'] = 'Um link de confirmação foi enviado por e-mai
$lang['resendpwdsuccess'] = 'Sua nova senha foi enviada por e-mail.';
$lang['license'] = 'Exceto onde for informado ao contrário, o conteúdo neste wiki está sob a seguinte licença:';
$lang['licenseok'] = 'Observe: editando esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
+$lang['searchmedia'] = 'Buscar arquivo:';
+$lang['searchmedia_in'] = 'Buscar em %s';
$lang['txt_upload'] = 'Selecione o arquivo a ser enviado';
$lang['txt_filename'] = 'Enviar como (opcional)';
$lang['txt_overwrt'] = 'Substituir o arquivo existente';
@@ -121,10 +121,12 @@ $lang['deletefail'] = 'Não foi possível excluir "%s" - verifique as
$lang['mediainuse'] = 'O arquivo "%s" não foi excluído - ele ainda está em uso.';
$lang['namespaces'] = 'Espaços de nome';
$lang['mediafiles'] = 'Arquivos disponíveis em';
+$lang['js']['searchmedia'] = 'Buscar por arquivos';
$lang['js']['keepopen'] = 'Manter a janela aberta na seleção';
$lang['js']['hidedetails'] = 'Esconder detalhes';
$lang['js']['nosmblinks'] = 'Atalhos para pastas compartilhadas do Windows funcionam apenas no Microsoft Internet Explorer.
Entretanto, você ainda pode copiar e colar o atalho.';
+$lang['js']['linkwiz'] = 'Link Wizard';
$lang['js']['linkto'] = 'Link para:';
$lang['js']['del_confirm'] = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
$lang['js']['mu_btn'] = 'Enviar vários arquivos de uma vez';
@@ -156,6 +158,7 @@ $lang['summary'] = 'Resumo da edição';
$lang['noflash'] = 'O <a href="http://www.adobe.com/products/flashplayer/">plug-in Adobe Flash</a> é necessário para exibir este conteúdo.';
$lang['mail_newpage'] = 'página adicionada:';
$lang['mail_changed'] = 'página modificada:';
+$lang['mail_subscribe_list'] = 'páginas alteradas no namespace:';
$lang['mail_new_user'] = 'novo usuário:';
$lang['mail_upload'] = 'arquivo enviado:';
$lang['qb_bold'] = 'Texto em negrito';
@@ -169,6 +172,10 @@ $lang['qb_h3'] = 'Cabeçalho de nível 3';
$lang['qb_h4'] = 'Cabeçalho de nível 4';
$lang['qb_h5'] = 'Cabeçalho de nível 5';
$lang['qb_h'] = 'Cabeçalho';
+$lang['qb_hs'] = 'Escolha o cabeçalho';
+$lang['qb_hplus'] = 'Cabeçalho de nível mais alto';
+$lang['qb_hminus'] = 'Cabeçalho de nível mais baixo';
+$lang['qb_hequal'] = 'Cabeçalho de mesmo nível';
$lang['qb_link'] = 'Link interno';
$lang['qb_extlink'] = 'Link externo';
$lang['qb_hr'] = 'Linha horizontal';
@@ -178,6 +185,7 @@ $lang['qb_media'] = 'Adicionar imagens e/ou outros arquivos';
$lang['qb_sig'] = 'Inserir assinatura';
$lang['qb_smileys'] = 'Carinhas';
$lang['qb_chars'] = 'Caracteres especiais';
+$lang['upperns'] = 'Pular para namespace acima';
$lang['admin_register'] = 'Adicionar novo usuário';
$lang['metaedit'] = 'Editar metadados';
$lang['metasaveerr'] = 'Não foi possível escrever os metadados';
@@ -193,11 +201,9 @@ $lang['img_copyr'] = 'Direitos autorais';
$lang['img_format'] = 'Formato';
$lang['img_camera'] = 'Câmera';
$lang['img_keywords'] = 'Palavras-chave';
-$lang['subscribe_success'] = '%s foi adicionado à lista de monitoramento de %s';
-$lang['subscribe_error'] = 'Ocorreu um erro ao tentar adicionar %s à lista de monitoramento de %s';
-$lang['subscribe_noaddress'] = 'Não existe nenhum endereço de e-mail associado ao seu usuário, você não pode ser adicionado à lista de monitoramento.';
-$lang['unsubscribe_success'] = '%s foi removido da lista de monitoramento de %s';
-$lang['unsubscribe_error'] = 'Ocorreu um erro ao tentar remover %s da lista de monitoramento de %s';
+$lang['subscr_subscribe_success'] = 'Adicionado %s para a lista de inscrição para %s';
+$lang['subscr_subscribe_error'] = 'Erro adicionando %s para a lista de inscrição para %s';
+$lang['subscr_subscribe_noaddress'] = 'Não há endereço associado com seu login, você não pode ser adicionado à lista de inscrição';
$lang['authmodfailed'] = 'A configuração da autenticação de usuário está com problemas. Por favor, informe ao administrador do wiki.';
$lang['authtempfail'] = 'A autenticação de usuários está temporariamente desabilitada. Se essa situação persistir, por favor, informe ao administrador do Wiki.';
$lang['i_chooselang'] = 'Selecione o seu idioma';
diff --git a/inc/lang/pt-br/wordblock.txt b/inc/lang/pt-br/wordblock.txt
deleted file mode 100644
index c2c9cbdb0..000000000
--- a/inc/lang/pt-br/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Bloqueio de SPAM ======
-
-Suas modificações **não** foram salvas porque elas contém uma ou mais palavras bloqueadas. Se você tentou enviar //spam// para o //wiki//, isso é feio, muito feio! Agora, se você acha que esse bloqueio foi indevido, por favor entre em contato com o administrador desse wiki.
-
diff --git a/inc/lang/pt/wordblock.txt b/inc/lang/pt/wordblock.txt
deleted file mode 100644
index a88063c9b..000000000
--- a/inc/lang/pt/wordblock.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-====== Bloquear SPAM ======
-
-As suas alterações foram **bloqueadas**, porque contêm uma ou mais palavras consideradas abusivas (SPAM).
-
-Se pensa que isto não está correcto, por favor contacte o administrador deste site Wiki.
-
-----
diff --git a/inc/lang/ro/wordblock.txt b/inc/lang/ro/wordblock.txt
deleted file mode 100644
index 1fa7bd6cd..000000000
--- a/inc/lang/ro/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM blocat ======
-
-Modificările **nu** au fost salvate deoarece conţin unul sau mai multe cuvinte nepermise. Daca ai încercat să spamezi Wiki-ul -- Eşti un om rău! Dacă crezi că asta e o eroare, contactează administratorul acestui Wiki.
-
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index f6cec8170..3b722aea6 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -15,6 +15,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['encoding'] = ' utf-8';
$lang['direction'] = 'ltr';
@@ -48,9 +49,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'] = 'Послать новый пароль';
@@ -125,6 +123,27 @@ $lang['mediafiles'] = 'Доступные файлы';
$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 работает только из Интернет Эксплорера
Но Вы можете скопировать ссылку.';
$lang['js']['linkwiz'] = 'Мастер ссылок';
@@ -160,6 +179,7 @@ $lang['noflash'] = 'Для просмотра этого соде
$lang['download'] = 'Скачать код';
$lang['mail_newpage'] = 'страница добавлена:';
$lang['mail_changed'] = 'страница изменена:';
+$lang['mail_subscribe_list'] = 'изменились страницы в пространстве имен:';
$lang['mail_new_user'] = 'новый пользователь:';
$lang['mail_upload'] = 'файл закачан:';
$lang['qb_bold'] = 'Полужирный шрифт';
@@ -202,11 +222,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'] = 'сводка изменений по каждой странице';
+$lang['subscr_style_list'] = 'перечислять изменившиеся страницы с прошлого уведомления';
$lang['authmodfailed'] = 'Неправильная конфигурация аутентификации пользователя. Пожалуйста, сообщите об этом вашему администратору вики.';
$lang['authtempfail'] = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом вашему администратору вики.';
$lang['i_chooselang'] = 'Выберите Ваш язык/Language';
diff --git a/inc/lang/ru/subscr_digest.txt b/inc/lang/ru/subscr_digest.txt
new file mode 100644
index 000000000..0e1ce5dce
--- /dev/null
+++ b/inc/lang/ru/subscr_digest.txt
@@ -0,0 +1,20 @@
+Привет!
+
+Страница @PAGE@ в вики @TITLE@ изменилась.
+Список изменений:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Старая версия: @OLDPAGE@
+Новая версия: @NEWPAGE@
+
+Чтобы отписаться от уведомлений об изменениях, войдите в вики
+@DOKUWIKIURL@ в раздел
+@SUBSCRIBE@
+и отмените подписку на страницу и/или пространство имен.
+
+--
+Это письмо создано DokuWiki с сайта
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ru/subscr_form.txt b/inc/lang/ru/subscr_form.txt
new file mode 100644
index 000000000..03998cc87
--- /dev/null
+++ b/inc/lang/ru/subscr_form.txt
@@ -0,0 +1,3 @@
+ ====== Управление подписками ======
+
+Здесь вы можете управлять подписками для текущей страницы и пространства имен. \ No newline at end of file
diff --git a/inc/lang/ru/subscr_list.txt b/inc/lang/ru/subscr_list.txt
new file mode 100644
index 000000000..b543f8da9
--- /dev/null
+++ b/inc/lang/ru/subscr_list.txt
@@ -0,0 +1,17 @@
+Привет!
+
+Страницы в пространстве имен @PAGE@ в вики @TITLE@ были изменены.
+Список изменившихся страниц:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Чтобы отписаться от уведомлений об изменениях, войдите в вики
+@DOKUWIKIURL@ в раздел
+@SUBSCRIBE@
+и отмените подписку на страницу и/или пространство имен.
+
+--
+Это письмо создано DokuWiki с сайта
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/ru/subscr_single.txt b/inc/lang/ru/subscr_single.txt
new file mode 100644
index 000000000..22277f0c8
--- /dev/null
+++ b/inc/lang/ru/subscr_single.txt
@@ -0,0 +1,23 @@
+Привет!
+
+Страница @PAGE@ в вики @TITLE@ изменилась.
+Список изменений:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Дата : @DATE@
+Автор : @USER@
+Примечание: @SUMMARY@
+Старая версия: @OLDPAGE@
+Новая версия: @NEWPAGE@
+
+Чтобы отписаться от уведомлений об изменениях, войдите в вики
+@DOKUWIKIURL@ в раздел
+@SUBSCRIBE@
+и отмените подписку на страницу и/или пространство имен.
+
+--
+Это письмо создано DokuWiki с сайта
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sk/wordblock.txt b/inc/lang/sk/wordblock.txt
deleted file mode 100644
index 4901b2aab..000000000
--- a/inc/lang/sk/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAM nebol povolený ======
-
-Vaše zmeny **neboli uložené**, pretože obsahujú jedno alebo viacej nepovolených slov. Wiki si nepotrpí na spam! Pokiaľ sa domnievate, že ide o omyl, kontaktujte správcu.
diff --git a/inc/lang/sl/wordblock.txt b/inc/lang/sl/wordblock.txt
deleted file mode 100644
index c9d9c1ca0..000000000
--- a/inc/lang/sl/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Blokiran SPAM ======
-
-Vaše spremembe **niso** bile shranjene, ker so vsebovale eno ali več prepovedanih besed. Če ste poskusili nasmetiti Wiki -- Fuj Fido! Če mislite da je to napaka, stopite v stik z administratorjem.
-
diff --git a/inc/lang/sq/admin.txt b/inc/lang/sq/admin.txt
new file mode 100644
index 000000000..6edbf8a19
--- /dev/null
+++ b/inc/lang/sq/admin.txt
@@ -0,0 +1,3 @@
+====== Administrimi ======
+
+Poshtë është një listë e punëve administrative të disponueshme në DokuWiki. \ No newline at end of file
diff --git a/inc/lang/sq/adminplugins.txt b/inc/lang/sq/adminplugins.txt
new file mode 100644
index 000000000..f87626c8e
--- /dev/null
+++ b/inc/lang/sq/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin-e Shtesë ===== \ No newline at end of file
diff --git a/inc/lang/sq/backlinks.txt b/inc/lang/sq/backlinks.txt
new file mode 100644
index 000000000..b25df00be
--- /dev/null
+++ b/inc/lang/sq/backlinks.txt
@@ -0,0 +1,3 @@
+====== Linke të kthyeshëm ======
+
+Kjo është një listë e faqeve që duket se lidhen mbrapsht te kjo faqe aktuale. \ No newline at end of file
diff --git a/inc/lang/sq/conflict.txt b/inc/lang/sq/conflict.txt
new file mode 100644
index 000000000..9c6cc940d
--- /dev/null
+++ b/inc/lang/sq/conflict.txt
@@ -0,0 +1,5 @@
+====== Ekziston një version më i ri ======
+
+Ekziston një version më i ri i dokumentit që ju redaktuat. Kjo ndodh kur një përdorues tjetër e ndryshoi dokumentin ndërkohë që ju po e redaktonit atë.
+
+Gjeni ndryshimet e treguara më poshtë dhe pastaj vendosni se kë version doni të mbani. Nëse zgjidhni "ruaj", versioni juaj do të ruhet. Klikon "fshi" për të mbajtur versioni aktual. \ No newline at end of file
diff --git a/inc/lang/sq/denied.txt b/inc/lang/sq/denied.txt
new file mode 100644
index 000000000..03e10527f
--- /dev/null
+++ b/inc/lang/sq/denied.txt
@@ -0,0 +1,3 @@
+====== Leja Refuzohet ======
+
+Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. Mbase harruat të hyni? \ No newline at end of file
diff --git a/inc/lang/sq/diff.txt b/inc/lang/sq/diff.txt
new file mode 100644
index 000000000..ab03a283f
--- /dev/null
+++ b/inc/lang/sq/diff.txt
@@ -0,0 +1,3 @@
+====== Ndryshimet ======
+
+Kjo tregon ndryshimet midis dy versioneve të faqes. \ No newline at end of file
diff --git a/inc/lang/sq/draft.txt b/inc/lang/sq/draft.txt
new file mode 100644
index 000000000..80634a780
--- /dev/null
+++ b/inc/lang/sq/draft.txt
@@ -0,0 +1,5 @@
+====== Skedari skicë u gjend ======
+
+Sesioni juaj i fundit i redaktimit në këtë faqe nuk përfundoi me sukses. DokuWiki ruajti automatikisht një skicë gjatë punës tuaj të cilën mund ta përdorni tani për të vazhduar redaktimin tuaj. Më poshtë mund të shihni të dhënat që janë ruajtur nga sesioni juaj i fundit.
+
+Ju lutem vendosni nëse doni të //rekuperoni// sesionin tuaj të humbur të redaktimit, //fshini// skicën e ruajtur automatikisht ose //dilni// nga proçesi i redaktimit. \ No newline at end of file
diff --git a/inc/lang/sq/edit.txt b/inc/lang/sq/edit.txt
new file mode 100644
index 000000000..1f038ead7
--- /dev/null
+++ b/inc/lang/sq/edit.txt
@@ -0,0 +1 @@
+Redaktoni faqen dhe shtypni "Ruaj". Shikoni [[wiki:syntax]] për sintaksën e Wiki-t. Nëse doni të provoni disa gjëra, mësoni të hidhni hapat e parë në [[playground:playground|playground]]. \ No newline at end of file
diff --git a/inc/lang/sq/editrev.txt b/inc/lang/sq/editrev.txt
new file mode 100644
index 000000000..08792eafb
--- /dev/null
+++ b/inc/lang/sq/editrev.txt
@@ -0,0 +1,2 @@
+**Keni ngarkuar një rishikim të vjetër të dokumentit!** Nëse e ruani, do të krijoni një version të ri me këto të dhëna.
+---- \ No newline at end of file
diff --git a/inc/lang/sq/index.txt b/inc/lang/sq/index.txt
new file mode 100644
index 000000000..6daef1c30
--- /dev/null
+++ b/inc/lang/sq/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Ky është një index mbi të gjitha faqet e disponueshme të renditura sipas [[doku>namespaces|namespaces]]. \ No newline at end of file
diff --git a/inc/lang/sq/install.html b/inc/lang/sq/install.html
new file mode 100644
index 000000000..f9f69f473
--- /dev/null
+++ b/inc/lang/sq/install.html
@@ -0,0 +1,8 @@
+<p>Kjo faqe ndihmon në instalimin dhe konfigurimin për herë të parë të <a href="http://dokuwiki.org">Dokuwiki-t</a>. Më shumë informacion mbi këtë installer gjendet në <a href="http://dokuwiki.org/installer">faqen e tij të dokumentimit</a>.</p>
+
+<p>Dokuwiki përdor skedarë të zakonshëm për ruajtjen e faqeve wiki dhe informacioneve të tjera të lidhura me ato faqe (psh imazhe, indekse kërkimi, rishikime të vjetra etj). Në mënyrë që të funksionojë me sukses DokuWiki <strong>duhet</strong> të ketë akses shkrimi mbi direktoritë që mbajnë këto skedarë. Ky installer nuk është në gjendje të vendosë leje mbi direktoritë. Kjo normalisht duhet bërë drejtpërdrejt nga një command shell ose nëse jeni duke përdorur hostimin, nëpërmjet FTP ose panelit të kontrollit të hostit (psh cPanel).</p>
+
+<p>Ky installer do të instalojë konfigurimin e DokuWiki-t tuaj
+për <acronym title="access control list">ACL</acronym>, që në këmbim lejon hyrje si administrator dhe akses të menusë së administrimit të DokuWiki-t për të instaluar plugin-e, menaxhuar përdoruesit, menaxhuar akses në faqet wiki dhe ndryshim të konfigurimeve. Nuk është e domosdoshme për DokuWiki-n të funksionojë, megjithatë do ta bëjë DokuWiki-n më të lehtë për tu administruar.</p>
+
+<p>Përduruesit me përvojë ose përdoruesit me kërkesa speciale për instalim duhet të përdorin këto linke për detaje mbi <a href="http://dokuwiki.org/install">instruksionet e instalimit</a> dhe <a href="http://dokuwiki.org/config">konfigurimeve</a>.</p> \ No newline at end of file
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
new file mode 100644
index 000000000..a41a6bd6e
--- /dev/null
+++ b/inc/lang/sq/lang.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * sq 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/MessagesSq.php?view=co
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['doublequoteopening'] = '"';
+$lang['doublequoteclosing'] = '"';
+$lang['singlequoteopening'] = '\'';
+$lang['singlequoteclosing'] = '\'';
+$lang['apostrophe'] = '\'';
+$lang['btn_edit'] = 'Redaktoni këtë faqe';
+$lang['btn_source'] = 'Trego kodin burim të faqes';
+$lang['btn_show'] = 'Trego faqen';
+$lang['btn_create'] = 'Krijo këtë faqe';
+$lang['btn_search'] = 'Kërko';
+$lang['btn_save'] = 'Ruaj';
+$lang['btn_preview'] = 'Shikim paraprak';
+$lang['btn_top'] = 'Kthehu ne krye';
+$lang['btn_newer'] = '<< më të hershme';
+$lang['btn_older'] = 'më të vonshme';
+$lang['btn_revs'] = 'Shqyrtime të vjetra';
+$lang['btn_recent'] = 'Ndryshime së fundmi';
+$lang['btn_upload'] = 'Ngarko';
+$lang['btn_cancel'] = 'Harroji';
+$lang['btn_index'] = 'Kreu';
+$lang['btn_secedit'] = 'Redaktoni';
+$lang['btn_login'] = 'Hyrje';
+$lang['btn_logout'] = 'Dalje';
+$lang['btn_admin'] = 'Admin';
+$lang['btn_update'] = 'Përditëso';
+$lang['btn_delete'] = 'Fshi';
+$lang['btn_back'] = 'Mbrapa';
+$lang['btn_backlink'] = 'Lidhjet këtu';
+$lang['btn_backtomedia'] = 'Mbrapa tek Përzgjedhja e Media-ve';
+$lang['btn_subscribe'] = 'Menaxho Abonimet';
+$lang['btn_profile'] = 'Përditëso Profilin';
+$lang['btn_reset'] = 'Rivendos';
+$lang['btn_resendpwd'] = 'Dërgo fjalëkalim të ri';
+$lang['btn_draft'] = 'Redakto skicën';
+$lang['btn_recover'] = 'Rekupero skicën';
+$lang['btn_draftdel'] = 'Fshi skicën';
+$lang['btn_revert'] = 'Kthe si më parë';
+$lang['loggedinas'] = 'Regjistruar si ';
+$lang['user'] = 'Nofka e përdoruesit:';
+$lang['pass'] = 'Fjalëkalimi';
+$lang['newpass'] = 'Fjalëkalim i ri';
+$lang['oldpass'] = 'Konfirmo fjalëkalimin aktual';
+$lang['passchk'] = 'Edhe një herë';
+$lang['remember'] = 'Më mbaj mend';
+$lang['fullname'] = 'Emri i vërtetë';
+$lang['email'] = 'Adresa e email-it*';
+$lang['register'] = 'Regjsitrohuni';
+$lang['profile'] = 'Profili i përdoruesit';
+$lang['badlogin'] = 'Na vjen keq, emri ose fjalëkalimi është gabim.';
+$lang['minoredit'] = 'Ndryshime të Vogla';
+$lang['draftdate'] = 'Skica u ruajt automatikisht në';
+$lang['nosecedit'] = 'Faqja u ndryshua ndëwrkohë, informacioni i kwtij seksioni ishte i vjetër, u ngarkua faqja e tërë në vend të saj.';
+$lang['regmissing'] = 'Na vjen keq, duhet të plotësoni të gjitha fushat.';
+$lang['reguexists'] = 'Na vjen keq, ekziston një përdorues tjetër me të njëjtin emër.';
+$lang['regsuccess'] = 'Përdoruesi u regjistrua dhe fjalëkalimi u dërgua me email.';
+$lang['regsuccess2'] = 'Llogarija e Përdoruesit u krijua';
+$lang['regmailfail'] = 'Duket se ka ndodhur një gabim gjatë dërgimit të fjalëkalimit me e-mail. Ju lutemi kontaktoni administratorin!';
+$lang['regbadmail'] = 'Adresa email e dhënë nuk mund të pranohet sepse nuk duket e rregullt. Ju lutem fusni një adresë të rregullt ose boshatisni kutinë e shtypit.';
+$lang['regbadpass'] = 'Dy fjalëkalimet e dhëna nuk janë njësoj, ju lutemi provoni përsëri.';
+$lang['regpwmail'] = 'Fjalëkalimi juaj i DokuWiki-it.';
+$lang['reghere'] = 'Ende nuk keni llogari? Hap një';
+$lang['profna'] = 'Ky wiki nuk e lejon ndryshimin e profilit.';
+$lang['profnochange'] = 'Asnjë ndryshim, asgjë për të bërë.';
+$lang['profnoempty'] = 'Një emër bosh ose adresë email-i bosh nuk lejohet.';
+$lang['profchanged'] = 'Profili i përdoruesit u përditësua me sukses.';
+$lang['pwdforget'] = 'E harruat fjalëkalimin? Merni një të ri';
+$lang['resendna'] = 'Ky wiki nuk e lejon ridërgimin e fjalëkalimeve.';
+$lang['resendpwd'] = 'Dërgo një fjalëkalim të ri për';
+$lang['resendpwdmissing'] = 'Na vjen keq, duhet t\'i plotësoni të gjitha fushat.';
+$lang['resendpwdnouser'] = 'Na vjen keq, nuk mund ta gjejmë këtë përdorues në bazën tonë të të dhënave.';
+$lang['resendpwdbadauth'] = 'Na vjen keq, ky kod autorizimi nuk është i vlefshëm. Sigurohuni që përdoret linkun e plotë të konfirmimit.';
+$lang['resendpwdconfirm'] = 'U dërgua një link konfirmimi nëpërmjet eMail-it.';
+$lang['resendpwdsuccess'] = 'Fjalëkalimi juaj i ri u dërgua nëpërmjet eMail-it.';
+$lang['license'] = 'Përveç rasteve të përcaktuara, përmbajtja në këtë wiki është e liçnsuar nën liçensën e mëposhtme:';
+$lang['licenseok'] = 'Shënim: Duke redaktuar këtë faqe ju bini dakort të liçensoni përmbajtjen tuaj nën liçensën e mëposhtme:';
+$lang['searchmedia'] = 'Kërko emrin e skedarit:';
+$lang['searchmedia_in'] = 'Kërko në %s';
+$lang['txt_upload'] = 'Zgjidh skedarin për ngarkim';
+$lang['txt_filename'] = 'Ngarko si (alternative)';
+$lang['txt_overwrt'] = 'Zëvendëso skedarin ekzistues';
+$lang['lockedby'] = 'Kyçur momentalisht nga';
+$lang['lockexpire'] = 'Kyçi skadon në';
+$lang['willexpire'] = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
+$lang['notsavedyet'] = 'Ndryshimet e paruajtura do të humbasin.\nVazhdo me të vërtetë?';
+$lang['rssfailed'] = 'Ndoshi një gabim gjatë kapjes së këtij lajmi:';
+$lang['nothingfound'] = 'Nuk u gjet asgjë.';
+$lang['mediaselect'] = 'Skedarët e Medias';
+$lang['fileupload'] = 'Ngarkoje';
+$lang['uploadsucc'] = 'Ngarkim i suksesshëm';
+$lang['uploadfail'] = 'Ngarkimi dështoi. Ndoshta leje të gabuara?';
+$lang['uploadwrong'] = 'Ngarkimi u refuzua! Prapashtesa e skedarit është e ndaluar!';
+$lang['uploadexist'] = 'Skedari ekziston. Nuk u bë asgjë.';
+$lang['uploadbadcontent'] = 'Përmbajtja e ngarkimit nuk përkoi me prapshtesën e skedarit %s';
+$lang['uploadspam'] = 'Ngarkimi u bllokua nga lista e zezë e spam-eve.';
+$lang['uploadxss'] = 'Ngarkimi u bllokua për dyshim përmbajtjeje jo të sigurt.';
+$lang['uploadsize'] = 'Skedari i ngarkuar ishte tepër i madh. (maksimumi %s)';
+$lang['deletesucc'] = 'Skedari "%s" u fshi.';
+$lang['deletefail'] = '"%s" nuk mundi të fshihej. Kontrollo lejet.';
+$lang['mediainuse'] = 'Skedari "%s" nuk u fshi - është ende në përdorim.';
+$lang['namespaces'] = 'Hapësirat e Emrave';
+$lang['mediafiles'] = 'Skedarët e disponueshëm në';
+$lang['js']['searchmedia'] = 'Kërko për skedarë';
+$lang['js']['keepopen'] = 'Mbaje dritaren të hapur gjatë përzgjedhjes';
+$lang['js']['hidedetails'] = 'Fshih Detajet';
+$lang['js']['nosmblinks'] = 'Lidhja te Windows shares funksionon vetëm në Microsoft Internet Explorer. Ju prapë mund ta kopjoni dhe ngjitni linkun.';
+$lang['js']['linkwiz'] = 'Magjistari i Link';
+$lang['js']['linkto'] = 'Lidh tek:';
+$lang['js']['del_confirm'] = 'Fshiji vërtetë objektet e përzgjedhura?';
+$lang['js']['mu_btn'] = 'Ngarko shumë skedarë njëkohësisht';
+$lang['mediausage'] = 'Përdor sintaksën e mëposhtme për të referuar këtë skedar:';
+$lang['mediaview'] = 'Shiko skedarin origjinal';
+$lang['mediaroot'] = 'rrënja';
+$lang['mediaupload'] = 'Ngarko një skedar tek hapësira e emrit aktuale këtu. Për të krijuaj nënhapësira emri, bashkangjiti ato pas emrit të skedarit "Ngarko Si" duke e ndarë me dy pika (:).';
+$lang['mediaextchange'] = 'Prapashtesa e skedarit u ndërrua nga .%s në .%s!';
+$lang['reference'] = 'Referenca për:';
+$lang['ref_inuse'] = 'Skedari nuk mund të fshihet, sepse është duke u përdorur ende nga faqet e mëposhtme:';
+$lang['ref_hidden'] = 'Disa referenca janë në faqe të cilat ju nuk keni leje t\'i lexoni.';
+$lang['hits'] = 'Pamje';
+$lang['quickhits'] = 'Emrat e faqeve që përkojnë';
+$lang['toc'] = 'Tabela e Përmbajtjeve';
+$lang['current'] = 'aktuale';
+$lang['yours'] = 'Versioni Juaj';
+$lang['diff'] = 'Trego ndryshimet nga rishikimet aktuale';
+$lang['diff2'] = 'Trego ndryshimet mes rishikimeve të përzgjedhura';
+$lang['line'] = 'Vijë';
+$lang['breadcrumb'] = 'Gjurmë';
+$lang['youarehere'] = 'Ju jeni këtu';
+$lang['lastmod'] = 'Redaktuar për herë të fundit';
+$lang['by'] = 'nga';
+$lang['deleted'] = 'u fshi';
+$lang['created'] = 'u krijua';
+$lang['restored'] = 'Kthehu tek një version i vjetër';
+$lang['external_edit'] = 'redaktim i jashtëm';
+$lang['summary'] = 'Përmbledhja redaktimit';
+$lang['noflash'] = 'Nevojitet <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> për të paraqitur këtë përmbajtje.';
+$lang['download'] = 'Shkarko Copën';
+$lang['mail_newpage'] = 'faqje u shtua:';
+$lang['mail_changed'] = 'faqja u ndryshua:';
+$lang['mail_subscribe_list'] = 'faqet u ndryshuan në hapësirën e emrave:';
+$lang['mail_new_user'] = 'përdorues i ri:';
+$lang['mail_upload'] = 'skedari u ngarkua:';
+$lang['qb_bold'] = 'Tekst i Theksuar';
+$lang['qb_italic'] = 'Tekst i Pjerrët';
+$lang['qb_underl'] = 'Tekst i Nënvijëzuar';
+$lang['qb_code'] = 'Tekst Kodi';
+$lang['qb_strike'] = 'Tekst me Vijë Mespërmes';
+$lang['qb_h1'] = 'Titull me Nivel 1';
+$lang['qb_h2'] = 'Titull me Nivel 2';
+$lang['qb_h3'] = 'Titull me Nivel 3';
+$lang['qb_h4'] = 'Titull me Nivel 4';
+$lang['qb_h5'] = 'Titull me Nivel 5';
+$lang['qb_h'] = 'Titull';
+$lang['qb_hs'] = 'Përzgjidh Titull';
+$lang['qb_hplus'] = 'Titull Më i Lartë';
+$lang['qb_hminus'] = 'Titull Më i Ulët';
+$lang['qb_hequal'] = 'Titull i të Njëjtit Nivel';
+$lang['qb_link'] = 'Lidhje e Brendshme';
+$lang['qb_extlink'] = 'Lidhje e Jashtme ';
+$lang['qb_hr'] = 'Vijë Horizontale';
+$lang['qb_ol'] = 'Listë Objektesh të Renditur';
+$lang['qb_ul'] = 'Listë Objektesh të Parenditura';
+$lang['qb_media'] = 'Shto imazhe dhe skedarë të tjerë';
+$lang['qb_sig'] = 'Fut Firmën';
+$lang['qb_smileys'] = 'Smileys';
+$lang['qb_chars'] = 'Karaktere Speciale';
+$lang['upperns'] = 'kërce tek hapësira e emrit prind';
+$lang['admin_register'] = 'Shto Përdorues të Ri';
+$lang['metaedit'] = 'Redakto Metadata';
+$lang['metasaveerr'] = 'Shkrimi i metadata-ve dështoi';
+$lang['metasaveok'] = 'Metadata u ruajt';
+$lang['img_backto'] = 'Mbrapa te';
+$lang['img_title'] = 'Titulli ';
+$lang['img_caption'] = 'Titra';
+$lang['img_date'] = 'Data';
+$lang['img_fname'] = 'Emri Skedarit';
+$lang['img_fsize'] = 'Madhësia';
+$lang['img_artist'] = 'Autor';
+$lang['img_copyr'] = 'Mbajtësi i të drejtave të autorit';
+$lang['img_format'] = 'Formati';
+$lang['img_camera'] = 'Kamera';
+$lang['img_keywords'] = 'Fjalë Kyçe';
+$lang['subscr_subscribe_success'] = 'Iu shtua %s listës së abonimeve për %s';
+$lang['subscr_subscribe_error'] = 'Gabim gjatë shtimit të %s listës së abonimeve për %s';
+$lang['subscr_subscribe_noaddress'] = 'Nuk ekziston asnjë adresë e lidhur me regjistrimin tuaj, ju nuk mund t\'i shtoheni listës së abonimeve.';
+$lang['subscr_unsubscribe_success'] = 'U hoq %s nga lista e abonimeve për %s';
+$lang['subscr_unsubscribe_error'] = 'Gabim në heqjen e %s nga lista e abonimeve për %s';
+$lang['subscr_already_subscribed'] = '%s është abonuar njëherë te %s';
+$lang['subscr_not_subscribed'] = '%s nuk është abonuar te %s';
+$lang['subscr_m_not_subscribed'] = 'Momentalisht ju nuk jeni i abonuar në faqen aktuale apo hapësirën e emrit aktual.';
+$lang['subscr_m_new_header'] = 'Shto abonim';
+$lang['subscr_m_current_header'] = 'Abonimet aktuale';
+$lang['subscr_m_unsubscribe'] = 'Fshi Abonimin';
+$lang['subscr_m_subscribe'] = 'Abonohu';
+$lang['subscr_m_receive'] = 'Mer';
+$lang['subscr_style_every'] = 'email mbi çdo ndryshim';
+$lang['subscr_style_digest'] = 'pasqyro email-e ndryshimi pér çdo faqe';
+$lang['subscr_style_list'] = 'listë e faqeve të ndryshuara që nga emaili i fundit';
+$lang['authmodfailed'] = 'Konfigurim i gabuar i autentikimit të përdoruesit. Ju lutem informoni Administratorin tuaj të Wiki-it.';
+$lang['authtempfail'] = 'Autentikimi i përdoruesve është përkohësisht i padisponueshëm. Nëse kjo gjendje vazhdon, ju lutemi të informoni Administratorin tuaj të Wiki-it.';
+$lang['i_chooselang'] = 'Zgjidhni gjuhën tuaj';
+$lang['i_installer'] = 'Installer-i DokuWiki';
+$lang['i_wikiname'] = 'Emri Wiki-it';
+$lang['i_enableacl'] = 'Aktivizo ACL (rekomanduar)';
+$lang['i_superuser'] = 'Superpërdorues';
+$lang['i_problems'] = 'Installer-i gjeti disa probleme, të shfaqura më poshtë. Nuk mund të vazhdoni derisa t\'i keni rregulluar.';
+$lang['i_modified'] = 'Për arsye sigurie ky skript do të punojë vetëm me një instalim të ri dhe të pamodifikuar DokuWiki.
+Ose duhet të ekstraktoni skedarët nga e para nga pakoja e shkarkimit ose konsultohuni me <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
+$lang['i_funcna'] = 'Funksioni PHP <code>%s</code> nuk është i disponueshëm. Mbase siguruesi juaj i host-it e ka çaktivizuar për ndonjë arsye?';
+$lang['i_phpver'] = 'Versioni juaj i PHP <code>%s</code> është më i vogël se ai i duhuri <code>%s</code>. Duhet të përditësoni instalimin tuaj të PHP-së.';
+$lang['i_permfail'] = '<code>%s</code> nuk është e shkruajtshme nga DokuWiki. Duhet të rregulloni lejet e përdorimit për këtë direktori.';
+$lang['i_confexists'] = '<code>%s</code> ekziston njëherë';
+$lang['i_writeerr'] = '<code>%s</code> nuk mundi të krijohej. Duhet të kontrolloni lejet e dirkektorisë/skedarit dhe ta krijoni skedarin manualisht.';
+$lang['i_badhash'] = 'dokuwiki.php e panjohur ose e ndryshuar (hash=code>%s</code>)';
+$lang['i_badval'] = '<code>%s</code> - vlerë e palejuar ose boshe';
+$lang['i_success'] = 'Konfigurimi u mbarua me sukses. Tani mund ta fshini skedarin install.php. Vazhdoni tek <a href="doku.php">DokuWiki juaj i ri.</a>.';
+$lang['i_failure'] = 'Ndodhën disa gabime gjatë shkrimit të skedarit të konfigurimit. Do t\'ju duhet t\'i rregulloni manualisht para se të përdorni <a href="doku.php">DokuWiki-in tuaj të ri.</a>.';
+$lang['i_policy'] = 'Veprimi fillestar ACL';
+$lang['i_pol0'] = 'Wiki i Hapur (lexim, shkrim, ngarkim për këdo)';
+$lang['i_pol1'] = 'Wiki Publike (lexim për këdo, shkrim dhe ngarkim për përdoruesit e regjistruar)';
+$lang['i_pol2'] = 'Wiki e Mbyllur (lexim, shkrim, ngarkim vetëm për përdoruesit e regjistruar)';
+$lang['i_retry'] = 'Provo Përsëri';
+$lang['mu_intro'] = 'Këtu mund të ngarkoni disa skedarë njëkohësisht. Klikoni butonin e shfletuesit për t\'i shtuar ata në radhë. Klikoni Ngarko kur të keni mbaruar.';
+$lang['mu_gridname'] = 'Emri Skedari';
+$lang['mu_gridsize'] = 'Madhësia';
+$lang['mu_gridstat'] = 'Statusi';
+$lang['mu_namespace'] = 'Hapësira Emrit';
+$lang['mu_browse'] = 'Shfleto';
+$lang['mu_toobig'] = 'shumë i/e madhe';
+$lang['mu_ready'] = 'gati për ngarkim';
+$lang['mu_done'] = 'përfundoi';
+$lang['mu_fail'] = 'dështoi';
+$lang['mu_authfail'] = 'sesioni skadoi';
+$lang['mu_progress'] = '@PCT@% u ngarkua';
+$lang['mu_filetypes'] = 'Tipet e Skedarëve të Lejuar';
+$lang['mu_info'] = 'skedarët e ngarkuar';
+$lang['mu_lasterr'] = 'Gabimi i fundit:';
+$lang['recent_global'] = 'Momentalisht jeni duke parë ndryshimet brenda hapësirës së emrit <b>%s</b>. Gjithashtu mund <a href="%s">të shihni ndryshimet më të fundit në të gjithë wiki-n</a>.';
+$lang['years'] = '%d vite më parë';
+$lang['months'] = '%d muaj më parë';
+$lang['weeks'] = '%d javë më parë';
+$lang['days'] = '%d ditë më parë';
+$lang['hours'] = '%d orë më parë';
+$lang['minutes'] = '%d minuta më parë';
+$lang['seconds'] = '%d sekonda më parë';
diff --git a/inc/lang/sq/locked.txt b/inc/lang/sq/locked.txt
new file mode 100644
index 000000000..8c86c8be0
--- /dev/null
+++ b/inc/lang/sq/locked.txt
@@ -0,0 +1,3 @@
+====== Faqe e kyçur ======
+
+Kjo faqe është përkohësisht e kyçur për redaktim nga një përdorues tjetër. Duhet të prisni derisa ky përdorues të mbarojë redaktimin ose çelësi të skadojë. \ No newline at end of file
diff --git a/inc/lang/sq/login.txt b/inc/lang/sq/login.txt
new file mode 100644
index 000000000..843e47652
--- /dev/null
+++ b/inc/lang/sq/login.txt
@@ -0,0 +1,3 @@
+====== Hyrje ======
+
+Momentalisht nuk jeni të futur në Wiki! Futni informacionet tuaja të autentikimit më poshtë për të hyrë. Duhet t'i keni cookies të aktivizuara për të hyrë. \ No newline at end of file
diff --git a/inc/lang/sq/mailtext.txt b/inc/lang/sq/mailtext.txt
new file mode 100644
index 000000000..0746ca42c
--- /dev/null
+++ b/inc/lang/sq/mailtext.txt
@@ -0,0 +1,16 @@
+Një faqe në DokuWiki-n tuaj u shtua ose u ndryshua. Këto janë detajet:
+
+Data: @DATE@
+Shfletuesi: @BROWSER@
+Adresa IP: @IPADDRESS@
+Emri Hostit: @HOSTNAME@
+Rishikimi i vjetër: @OLDPAGE@
+Rishikimi i ri: @NEWPAGE@
+Përmbledhja redaktimit: @SUMMARY@
+Përdoruesi: @USER@
+
+@DIFF@
+
+---
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/newpage.txt b/inc/lang/sq/newpage.txt
new file mode 100644
index 000000000..1db750d00
--- /dev/null
+++ b/inc/lang/sq/newpage.txt
@@ -0,0 +1,3 @@
+====== Kjo temë nuk ekziston ende ======
+
+Keni ndjekur një link për në një temë që nuk ekziston ende. Nëse ua lejojnë të drejtat, mund ta krijoni duke klikuar butonin "Krijo këtë faqe". \ No newline at end of file
diff --git a/inc/lang/sq/norev.txt b/inc/lang/sq/norev.txt
new file mode 100644
index 000000000..0e73223a9
--- /dev/null
+++ b/inc/lang/sq/norev.txt
@@ -0,0 +1,3 @@
+====== Nuk ekzistion një rishikim i tillë ======
+
+Rishikimi i specifikuar nuk ekziston. Përdor buttonin "Rishikime të vjetra" për një listë të rishikimeve të vjetra të këtij dokumenti. \ No newline at end of file
diff --git a/inc/lang/sq/password.txt b/inc/lang/sq/password.txt
new file mode 100644
index 000000000..1c8a8694a
--- /dev/null
+++ b/inc/lang/sq/password.txt
@@ -0,0 +1,10 @@
+Përshëndetje @FULLNAME@!
+
+Këtu janë të dhënat e përdoruesit për @TITLE@ në @DOKUWIKIURL@
+
+Hyrje: @LOGIN@
+Fjalëkalimi: @PASSWORD@
+
+---
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/preview.txt b/inc/lang/sq/preview.txt
new file mode 100644
index 000000000..07148b842
--- /dev/null
+++ b/inc/lang/sq/preview.txt
@@ -0,0 +1,3 @@
+====== Shikim Paraprak ======
+
+Ky është një shikim paraprak i tekstit tuaj. Kujtohuni: **Nuk** është ruajtur ende! \ No newline at end of file
diff --git a/inc/lang/sq/pwconfirm.txt b/inc/lang/sq/pwconfirm.txt
new file mode 100644
index 000000000..44d6c2dfe
--- /dev/null
+++ b/inc/lang/sq/pwconfirm.txt
@@ -0,0 +1,13 @@
+Përshëndetje @FULLNAME@!
+
+Dikush kërkoi një fjalëkalim të ri për hyrjen tuaj @TITLE@ në @DOKUWIKIURL@
+
+Nëse nuk kërkuat një fjalëkalim të ri atëherë thjesht injorojeni këtë email.
+
+Për të konfirmuar që kërkesa u dërgua me të vërtetë nga ju, ju lutemi përdorni link-un e mëposhtëm.
+
+@CONFIRM@
+
+--
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/read.txt b/inc/lang/sq/read.txt
new file mode 100644
index 000000000..cbb028048
--- /dev/null
+++ b/inc/lang/sq/read.txt
@@ -0,0 +1 @@
+Kjo faqe është vetëm për lexim. Mund të shihni kodin burim, por nuk mund ta ndryshoni atë. Kontaktoni administratorin nëse mendoni se kjo është e gabuar. \ No newline at end of file
diff --git a/inc/lang/sq/recent.txt b/inc/lang/sq/recent.txt
new file mode 100644
index 000000000..4b3bdf48d
--- /dev/null
+++ b/inc/lang/sq/recent.txt
@@ -0,0 +1,3 @@
+====== Ndryshimet e kohëve të fundit ======
+
+Faqet e mëposhtme janë ndryshuar së fundmi. \ No newline at end of file
diff --git a/inc/lang/sq/register.txt b/inc/lang/sq/register.txt
new file mode 100644
index 000000000..d4a3ca36b
--- /dev/null
+++ b/inc/lang/sq/register.txt
@@ -0,0 +1,3 @@
+====== Regjistrohuni si një përdorues i ri ======
+
+Plotësoni të gjitha informacionet e mëposhtme për të krijuar një llogari në këtë wiki. Sigorohuni që të jepni një **adresë email-i të vlefshme**. Nëse nuk ju kërkohet të futni një fjalëkalim këtu, një fjalëkalim i ri do t'ju dërgohet në adresën e email-it që specifikuat. Emri i hyrjes duhet të një [[doku>pagename|pagename]] e vlefshme. \ No newline at end of file
diff --git a/inc/lang/sq/registermail.txt b/inc/lang/sq/registermail.txt
new file mode 100644
index 000000000..ef90e455e
--- /dev/null
+++ b/inc/lang/sq/registermail.txt
@@ -0,0 +1,14 @@
+Një përdorues i ri u regjistrua. Këto janë detajet:
+
+Emri përdoruesit: @NEWUSER@
+Emri i plotë i përdoruesit: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Data: @DATE@
+Shfletuesi: @BROWSER@
+Adresa IP: @IPADDRESS@
+Emri Hostit: @HOSTNAME@
+
+--
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/resendpwd.txt b/inc/lang/sq/resendpwd.txt
new file mode 100644
index 000000000..79d0b3e8e
--- /dev/null
+++ b/inc/lang/sq/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Dërgo fjalëkalim të ri ======
+
+Ju lutemi futni emrin tuaj të përdorimit në formën e mëposhtme për të kërkuar një fjalëkalim të ri për llogarinë tuaj në këtë wiki. Një link konfirmimi do të dërgohet në adresën tuaj të eMail-it. \ No newline at end of file
diff --git a/inc/lang/sq/revisions.txt b/inc/lang/sq/revisions.txt
new file mode 100644
index 000000000..349631ffb
--- /dev/null
+++ b/inc/lang/sq/revisions.txt
@@ -0,0 +1,3 @@
+====== Rishikime të vjetra ======
+
+Këto janë rishikimet e vjetra të dokumentit aktual. Për t'u kthyer në një rishikim të vjetër, zgjidhni nga këtu poshtë, klikoni "Redaktoni këtë faqe" dhe ruajeni atë.
diff --git a/inc/lang/sq/searchpage.txt b/inc/lang/sq/searchpage.txt
new file mode 100644
index 000000000..2f34cabb9
--- /dev/null
+++ b/inc/lang/sq/searchpage.txt
@@ -0,0 +1,5 @@
+====== Kërko ======
+
+Mund të gjeni rezultatet e kërkimit tuaj më poshtë. Nëse nuk e gjetët atë që po kërkonit, mund të krijoni ose redaktoni një faqe pas pyetjes suaj me butonin përkatës.
+
+===== Rezultate ===== \ No newline at end of file
diff --git a/inc/lang/sq/showrev.txt b/inc/lang/sq/showrev.txt
new file mode 100644
index 000000000..9c1f761dc
--- /dev/null
+++ b/inc/lang/sq/showrev.txt
@@ -0,0 +1,2 @@
+**Ky është një rishikim i vjetër i dokumentit!**
+---- \ No newline at end of file
diff --git a/inc/lang/sq/stopwords.txt b/inc/lang/sq/stopwords.txt
new file mode 100644
index 000000000..e35669410
--- /dev/null
+++ b/inc/lang/sq/stopwords.txt
@@ -0,0 +1,39 @@
+# Kjo është një listë e fjalëve që indexer-i injoron, një fjalë për rresht
+# Kur të redaktoni këtë faqe sigurohuni që të përdorni fund-rreshtash UNIX (rresht i ri i vetëm)
+# Nuk është nevoja të përfshini fjalë më të shkurtra se tre karaktere - këtë injorohen gjithsesi
+# Kjo listë bazohet mbi ato që gjenden në http://www.ranks.nl/stopwords/
+about
+are
+as
+an
+and
+you
+your
+them
+their
+com
+for
+from
+into
+if
+in
+is
+it
+how
+of
+on
+or
+that
+the
+this
+to
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www \ No newline at end of file
diff --git a/inc/lang/sq/subscr_digest.txt b/inc/lang/sq/subscr_digest.txt
new file mode 100644
index 000000000..41404cff9
--- /dev/null
+++ b/inc/lang/sq/subscr_digest.txt
@@ -0,0 +1,20 @@
+Përshëndetje!
+
+Faqja @PAGE@ në wiki-n @TITLE@ ndryshoi.
+Këtu janë ndryshimet:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Rishikimi i vjetër: @OLDPAGE@
+Rishikimi i ri: @NEWPAGE@
+
+Për të fshirë lajmërimet e faqes, mund të hyni tek wiki në
+@DOKUWIKIURL@ pastaj vizitoni
+@SUBSCRIBE@
+dhe ç'regjistro faqen dhe/ose ndryshimet e hapësirës së emrit.
+
+--
+Ky eMail është gjeneruar nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/subscr_form.txt b/inc/lang/sq/subscr_form.txt
new file mode 100644
index 000000000..7c71a4c73
--- /dev/null
+++ b/inc/lang/sq/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Menaxhimi i Abonimeve ======
+
+Kjo faqe lejon menaxhimin e abonimeve tuaja për faqen dhe hapësirën e emrit aktual. \ No newline at end of file
diff --git a/inc/lang/sq/subscr_list.txt b/inc/lang/sq/subscr_list.txt
new file mode 100644
index 000000000..cb10d4223
--- /dev/null
+++ b/inc/lang/sq/subscr_list.txt
@@ -0,0 +1,13 @@
+Përshëndetje!
+
+Faqet në hapësirën e emrit @PAGE@ të wiki-t @TITLE@ ndryshuan. Këto janë faqet e ndryshuara:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Për të fshirë lajmërimet e faqes, hyni në wiki-n tek @DOKUWIKIURL@ dhe pastaj vizitoni @SUBSCRIBE@ dhe fshini ndryshimet e faqes dhe/ose të hapësirës së emrit.
+
+--
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/subscr_single.txt b/inc/lang/sq/subscr_single.txt
new file mode 100644
index 000000000..90520be4f
--- /dev/null
+++ b/inc/lang/sq/subscr_single.txt
@@ -0,0 +1,23 @@
+Përshëndetje!
+
+Faqja @PAGE@ në wiki-n @TITLE@ ndryshoi.
+Këto janë ndryshimet:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Përdoruesi : @USER@
+Përmbledhja redaktimit: @SUMMARY@
+Rishikimi i vjetër: @OLDPAGE@
+Rishikimi i ri: @NEWPAGE@
+
+Për të fshirë lajmërimet e faqes, hyni në wiki tek
+@DOKUWIKIURL@ dhe pastaj vizitoni
+@NEWPAGE@
+dhe fshini ndryshimet e faqes dhe/ose hapësirës së emrit.
+
+--
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sq/updateprofile.txt b/inc/lang/sq/updateprofile.txt
new file mode 100644
index 000000000..ba76beb1f
--- /dev/null
+++ b/inc/lang/sq/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Përditësoni profilin e llogarisë tuaj ======
+
+Duhet vetëm të plotësoni ato fusha që doni të ndryshoni. Mund të mos e ndryshoni emrin tuaj të përdoruesit. \ No newline at end of file
diff --git a/inc/lang/sq/uploadmail.txt b/inc/lang/sq/uploadmail.txt
new file mode 100644
index 000000000..e7c62df15
--- /dev/null
+++ b/inc/lang/sq/uploadmail.txt
@@ -0,0 +1,14 @@
+Një skedar u ngarkua në DokuWiki-n tënd. Detajet janë:
+
+Skedar: @MEDIA@
+Data: @DATE@
+Shfletuesi: @BROWSER@
+Adresa IP: @IPADDRESS@
+Emri Hostit: @HOSTNAME@
+Madhësia: @SIZE@
+Tipi MIME: @MIME@
+Përdoruesi: @USER@
+
+---
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@ \ No newline at end of file
diff --git a/inc/lang/sr/wordblock.txt b/inc/lang/sr/wordblock.txt
deleted file mode 100644
index 56ecde3fd..000000000
--- a/inc/lang/sr/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== СПАМ је блокиран ======
-
-Ваше измене **нису** сачуване јер садрже једну или више блокираних речи. Ако сте покушали да спамујете вики -- надрљаћете! Ако мислите да је ово грешка, контактирајте администратора овог викија.
-
diff --git a/inc/lang/sv/wordblock.txt b/inc/lang/sv/wordblock.txt
deleted file mode 100644
index e1b632ce4..000000000
--- a/inc/lang/sv/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Stoppade SPAM ======
-
-Dina ändringar har **inte** sparats på grund av att de innehåller ett eller flera ord som spärrats. Om du har försökt att spara skräp, s k ''spam'' -- Fyyy på dig! Om du anser att det här beror på ett fel, kontakta wikins administratör.
-
diff --git a/inc/lang/th/wordblock.txt b/inc/lang/th/wordblock.txt
deleted file mode 100644
index 653e341e7..000000000
--- a/inc/lang/th/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== สแปมถูกกีดกัน ======
-
-การเปลี่ยนแปลงของคุณ **ไม่**ได้รับการบันทึกเพราะมันมีหนึ่งข้อความต้องห้ามหรือมากกว่า ถ้าคุณพยายามสแปมวิกินี้ --คุณไม่น่ารักเลยนะ เด็กโง่! แต่ถ้าคุณคิดว่านี่เป็นข้อผิดพลาดแล้วละก็ ช่วยติดต่อผู้ดูแลวิกินี้ให้ด้วย \ No newline at end of file
diff --git a/inc/lang/tr/wordblock.txt b/inc/lang/tr/wordblock.txt
deleted file mode 100644
index 506cbc793..000000000
--- a/inc/lang/tr/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== SPAM bloke edildi ======
-
-Değişiklikleriniz **kaydedilmedi**, çünkü değişikliklerinizde bir veya daha fazla engellenen kelime var. Eğer Wikiyi spamlamaya çalışıyorsan -- Oh olsun! Eğer bunun bir hata olduğunu düşünüyorsanız, bu Wiki yöneticisiyle iletişime geçin.
-
diff --git a/inc/lang/uk/wordblock.txt b/inc/lang/uk/wordblock.txt
deleted file mode 100644
index 869f93a87..000000000
--- a/inc/lang/uk/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Заблокований СПАМ ======
-
-Ваші зміни **не були** збережені тому що вони містять одне чи декілька заблокованих слів. Якщо ви намагались додати спам до вікі, то нехай вам буде соромно. Якщо ви вважаєте, що це помилка, зверніться до адміністратора цієї Вікі.
-
diff --git a/inc/lang/vi/wordblock.txt b/inc/lang/vi/wordblock.txt
deleted file mode 100644
index b219ca141..000000000
--- a/inc/lang/vi/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== SPAM bị chận ======
-
-Các thay đổi **không** được bảo lưu vì có một hoặc nhiều từ bị ngăn chận. Nếu muốn spam Wiki này -- ngưng liền! Nếu đây là một sai lầm, liên lạc với người quản lý của Wiki.
diff --git a/inc/lang/zh-tw/wordblock.txt b/inc/lang/zh-tw/wordblock.txt
deleted file mode 100644
index 671e88b87..000000000
--- a/inc/lang/zh-tw/wordblock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== 拒絕垃圾資料(SPAM blocked) ======
-
-您的變更並**不會**被存起來,因為它包含了一些被限制的字眼。若您還試著要丟垃圾資料到 Wiki 的話, -- Bad dog! 不過,若您認為這是誤判,那麼請與這個 Wiki 的管理員(Admin)談。
-
diff --git a/inc/lang/zh/wordblock.txt b/inc/lang/zh/wordblock.txt
deleted file mode 100644
index 72c473a59..000000000
--- a/inc/lang/zh/wordblock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== 拒绝垃圾资料 ======
-
-您的更改 **并没有** 保存,因为它包含了一个或多个被限制的字眼。如果您尝试为本维基添加垃圾信息 -- 你是一个大坏蛋!如果您认为这是一个系统错误,请联系本维基的管理员。
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 239ff41c5..ef09dc7b6 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -23,10 +23,11 @@ function getID($param='id',$clean=true){
$id = isset($_REQUEST[$param]) ? $_REQUEST[$param] : null;
- $request = $_SERVER['REQUEST_URI'];
-
//construct page id from request URI
if(empty($id) && $conf['userewrite'] == 2){
+ $request = $_SERVER['REQUEST_URI'];
+ $script = '';
+
//get the script URL
if($conf['basedir']){
$relpath = '';
@@ -35,15 +36,14 @@ function getID($param='id',$clean=true){
}
$script = $conf['basedir'].$relpath.basename($_SERVER['SCRIPT_FILENAME']);
- }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['PATH_TRANSLATED']){
- $request = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
- $_SERVER['PATH_TRANSLATED']);
+ }elseif($_SERVER['PATH_INFO']){
+ $request = $_SERVER['PATH_INFO'];
+ }elseif($_SERVER['SCRIPT_NAME']){
+ $script = $_SERVER['SCRIPT_NAME'];
}elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
$script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
$_SERVER['SCRIPT_FILENAME']);
$script = '/'.$script;
- }else{
- $script = $_SERVER['SCRIPT_NAME'];
}
//clean script and request (fixes a windows problem)
@@ -198,7 +198,7 @@ function noNSorNS($id) {
* Creates a XHTML valid linkid from a given headline title
*
* @param string $title The headline title
- * @param array $check List of existing IDs
+ * @param array $check Existing IDs (title => number)
* @author Andreas Gohr <andi@splitbrain.org>
*/
function sectionID($title,&$check) {
@@ -212,12 +212,11 @@ function sectionID($title,&$check) {
if(is_array($check)){
// make sure tiles are unique
- $num = '';
- while(in_array($title.$num,$check)){
- ($num) ? $num++ : $num = 1;
+ if (!array_key_exists ($title,$check)) {
+ $check[$title] = 0;
+ } else {
+ $title .= ++ $check[$title];
}
- $title = $title.$num;
- $check[] = $title;
}
return $title;
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 141cbcaf0..b5d2baaab 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -12,9 +12,6 @@ class Doku_Handler {
var $status = array(
'section' => false,
- 'section_edit_start' => -1,
- 'section_edit_level' => 1,
- 'section_edit_title' => ''
);
var $rewriteBlocks = true;
@@ -40,10 +37,6 @@ class Doku_Handler {
if ( $this->status['section'] ) {
$last_call = end($this->calls);
array_push($this->calls,array('section_close',array(), $last_call[2]));
- if ($this->status['section_edit_start']>1) {
- // ignore last edit section if there is only one header
- array_push($this->calls,array('section_edit',array($this->status['section_edit_start'], 0, $this->status['section_edit_level'], $this->status['section_edit_title']), $last_call[2]));
- }
}
if ( $this->rewriteBlocks ) {
@@ -97,8 +90,6 @@ class Doku_Handler {
}
function header($match, $state, $pos) {
- global $conf;
-
// get level and title
$title = trim($match);
$level = 7 - strspn($title,'=');
@@ -108,13 +99,6 @@ class Doku_Handler {
if ($this->status['section']) $this->_addCall('section_close',array(),$pos);
- if ($level<=$conf['maxseclevel']) {
- $this->_addCall('section_edit',array($this->status['section_edit_start'], $pos-1, $this->status['section_edit_level'], $this->status['section_edit_title']), $pos);
- $this->status['section_edit_start'] = $pos;
- $this->status['section_edit_level'] = $level;
- $this->status['section_edit_title'] = $title;
- }
-
$this->_addCall('header',array($title,$level,$pos), $pos);
$this->_addCall('section_open',array($level),$pos);
@@ -583,17 +567,16 @@ class Doku_Handler {
$ReWriter = new Doku_Handler_Table($this->CallWriter);
$this->CallWriter = & $ReWriter;
- $this->_addCall('table_start', array(), $pos);
+ $this->_addCall('table_start', array($pos + 1), $pos);
if ( trim($match) == '^' ) {
$this->_addCall('tableheader', array(), $pos);
} else {
$this->_addCall('tablecell', array(), $pos);
}
- $this->status['table_begin'] = $pos;
break;
case DOKU_LEXER_EXIT:
- $this->_addCall('table_end', array($this->status['table_begin']+1, $pos), $pos);
+ $this->_addCall('table_end', array($pos), $pos);
$this->CallWriter->process();
$ReWriter = & $this->CallWriter;
$this->CallWriter = & $ReWriter->CallWriter;
@@ -1217,7 +1200,7 @@ class Doku_Handler_Table {
}
function tableStart($call) {
- $this->tableCalls[] = array('table_open',array(),$call[2]);
+ $this->tableCalls[] = array('table_open',$call[1],$call[2]);
$this->tableCalls[] = array('tablerow_open',array(),$call[2]);
$this->firstCell = true;
}
@@ -1288,6 +1271,7 @@ class Doku_Handler_Table {
// Adjust to num cols not num col delimeters
$this->tableCalls[0][1][] = $this->maxCols - 1;
$this->tableCalls[0][1][] = $this->maxRows;
+ $this->tableCalls[0][1][] = array_shift($this->tableCalls[0][1]);
} else {
trigger_error('First element in table call list is not table_open');
}
@@ -1505,13 +1489,7 @@ class Doku_Handler_Block {
//remove the whole paragraph
array_splice($this->calls,$i);
}else{
- if ($this->calls[count($this->calls)-1][0] == 'section_edit') {
- $tmp = array_pop($this->calls);
- $this->calls[] = array('p_close',array(), $pos);
- $this->calls[] = $tmp;
- } else {
- $this->calls[] = array('p_close',array(), $pos);
- }
+ $this->calls[] = array('p_close',array(), $pos);
}
$this->inParagraph = false;
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 65dcaf8a1..393099003 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -85,8 +85,6 @@ class Doku_Renderer extends DokuWiki_Plugin {
function header($text, $level, $pos) {}
- function section_edit($start, $end, $level, $name) {}
-
function section_open($level) {}
function section_close() {}
@@ -231,9 +229,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){}
+ function table_open($maxcols = NULL, $numrows = NULL, $pos){}
- function table_close($begin, $end){}
+ function table_close($pos){}
function tablerow_open(){}
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 4e848ec1d..176411c75 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -29,6 +29,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
var $doc = ''; // will contain the whole document
var $toc = array(); // will contain the Table of Contents
+ private $sectionedits = array(); // A stack of section edit data
var $headers = array();
var $footnotes = array();
@@ -39,6 +40,40 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
var $_counter = array(); // used as global counter, introduced for table classes
var $_codeblock = 0; // counts the code and file blocks, used to provide download links
+ /**
+ * Register a new edit section range
+ *
+ * @param $type string The section type identifier
+ * @param $title string The section title
+ * @param $start int The byte position for the edit start
+ * @return string A marker class for the starting HTML element
+ * @author Adrian Lang <lang@cosmocode.de>
+ */
+ public function startSectionEdit($start, $type, $title = null) {
+ static $lastsecid = 0;
+ $this->sectionedits[] = array(++$lastsecid, $start, $type, $title);
+ return 'sectionedit' . $lastsecid;
+ }
+
+ /**
+ * Finish an edit section range
+ *
+ * @param $end int The byte position for the edit end; null for the rest of
+ the page
+ * @author Adrian Lang <lang@cosmocode.de>
+ */
+ public function finishSectionEdit($end = null) {
+ list($id, $start, $type, $title) = array_pop($this->sectionedits);
+ if (!is_null($end) && $end <= $start) {
+ return;
+ }
+ $this->doc .= "<!-- EDIT$id " . strtoupper($type) . ' ';
+ if (!is_null($title)) {
+ $this->doc .= '"' . str_replace('"', '', $title) . '" ';
+ }
+ $this->doc .= "[$start-" . (is_null($end) ? '' : $end) . '] -->';
+ }
+
function getFormat(){
return 'xhtml';
}
@@ -51,6 +86,17 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function document_end() {
+ // Finish open section edits.
+ while (count($this->sectionedits) > 0) {
+ if ($this->sectionedits[count($this->sectionedits) - 1][1] <= 1) {
+ // If there is only one section, do not write a section edit
+ // marker.
+ array_pop($this->sectionedits);
+ } else {
+ $this->finishSectionEdit();
+ }
+ }
+
if ( count ($this->footnotes) > 0 ) {
$this->doc .= '<div class="footnotes">'.DOKU_LF;
@@ -106,6 +152,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function header($text, $level, $pos) {
+ global $conf;
+
if(!$text) return; //skip empty headlines
$hid = $this->_headerToLink($text,true);
@@ -122,30 +170,24 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
$this->lastlevel = $level;
+ if ($level <= $conf['maxseclevel'] &&
+ count($this->sectionedits) > 0 &&
+ $this->sectionedits[count($this->sectionedits) - 1][2] === 'section') {
+ $this->finishSectionEdit($pos - 1);
+ }
+
// write the header
- $this->doc .= DOKU_LF.'<h'.$level.'><a name="'.$hid.'" id="'.$hid.'">';
+ $this->doc .= DOKU_LF.'<h'.$level;
+ if ($level <= $conf['maxseclevel']) {
+ $this->doc .= ' class="' . $this->startSectionEdit($pos, 'section', $text) . '"';
+ }
+ $this->doc .= '><a name="'.$hid.'" id="'.$hid.'">';
$this->doc .= $this->_xmlEntities($text);
$this->doc .= "</a></h$level>".DOKU_LF;
}
- /**
- * Section edit marker is replaced by an edit button when
- * the page is editable. Replacement done in 'inc/html.php#html_secedit'
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Ben Coburn <btcoburn@silicodon.net>
- */
- function section_edit($start, $end, $level, $name) {
- global $conf;
-
- if ($start!=-1 && $level<=$conf['maxseclevel']) {
- $name = str_replace('"', '', $name);
- $this->doc .= '<!-- SECTION "'.$name.'" ['.$start.'-'.(($end===0)?'':$end).'] -->';
- }
- }
-
function section_open($level) {
- $this->doc .= "<div class=\"level$level\">".DOKU_LF;
+ $this->doc .= '<div class="level' . $level . '">' . DOKU_LF;
}
function section_close() {
@@ -845,15 +887,16 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
// $numrows not yet implemented
- function table_open($maxcols = NULL, $numrows = NULL){
+ function table_open($maxcols = NULL, $numrows = NULL, $pos){
+ global $lang;
// initialize the row counter used for classes
$this->_counter['row_counter'] = 0;
- $this->doc .= '<table class="inline">'.DOKU_LF;
+ $this->doc .= '<table class="inline ' . $this->startSectionEdit($pos, 'table') . '">'.DOKU_LF;
}
- function table_close($begin, $end){
+ function table_close($pos){
$this->doc .= '</table>'.DOKU_LF;
- $this->doc .= '<!-- TABLE ['. $begin .'-'.$end.'] -->';
+ $this->finishSectionEdit($pos);
}
function tablerow_open(){
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 8e2c6e000..4102ee711 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -419,7 +419,7 @@ function p_render_metadata($id, $orig){
// loop through the instructions
foreach ($instructions as $instruction){
// execute the callback against the renderer
- call_user_func_array(array(&$renderer, $instruction[0]), $instruction[1]);
+ call_user_func_array(array(&$renderer, $instruction[0]), (array) $instruction[1]);
}
$evt->result = array('current'=>$renderer->meta,'persistent'=>$renderer->persistent);
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 4400a4187..043687270 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -120,8 +120,8 @@ class Doku_Plugin_Controller {
function _populateMasterList() {
if ($dh = opendir(DOKU_PLUGIN)) {
while (false !== ($plugin = readdir($dh))) {
- if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp') continue;
- if (is_file(DOKU_PLUGIN.$plugin)) continue;
+ if ($plugin[0] == '.') continue; // skip hidden entries
+ if (is_file(DOKU_PLUGIN.$plugin)) continue; // skip files, we're only interested in directories
if (substr($plugin,-9) == '.disabled') {
// the plugin was disabled by rc2009-01-26
diff --git a/inc/subscription.php b/inc/subscription.php
index 280da225d..e5938d9bd 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -217,7 +217,7 @@ function subscription_regex($pre = array()) {
* @author Steven Danz <steven-danz@kc.rr.com>
* @author Adrian Lang <lang@cosmocode.de>
*/
-function subscription_addresslist($data){
+function subscription_addresslist(&$data){
global $conf;
global $auth;
@@ -300,13 +300,14 @@ function subscription_send_digest($subscriber_mail, $change, $lastupdate) {
* @author Adrian Lang <lang@cosmocode.de>
*/
function subscription_send_list($subscriber_mail, $changes, $id) {
+ global $conf;
$list = '';
foreach ($changes as $change) {
- $list .= '* ' . $change['id'] . NL;
+ $list .= '* ' . wl($change['id'], array(), true) . NL;
}
subscription_send($subscriber_mail,
array('DIFF' => rtrim($list),
- 'SUBSCRIBE' => wl($changes[0]['id'],
+ 'SUBSCRIBE' => wl($id . $conf['start'],
array('do' => 'subscribe'),
true, '&')),
'subscribe_list',
diff --git a/inc/template.php b/inc/template.php
index bd5f58792..7b0ef466b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -60,22 +60,19 @@ function tpl_content_core(){
case 'show':
html_show();
break;
- case 'preview':
- html_edit($TEXT);
- html_show($TEXT);
- break;
+ case 'locked':
+ html_locked();
+ case 'edit':
case 'recover':
- html_edit($TEXT);
+ html_edit();
break;
- case 'edit':
+ case 'preview':
html_edit();
+ html_show($TEXT);
break;
case 'draft':
html_draft();
break;
- case 'wordblock':
- html_edit($TEXT,'wordblock');
- break;
case 'search':
html_search();
break;
@@ -104,10 +101,6 @@ function tpl_content_core(){
html_conflict(con($PRE,$TEXT,$SUF),$SUM);
html_diff(con($PRE,$TEXT,$SUF),false);
break;
- case 'locked':
- html_locked();
- html_edit();
- break;
case 'login':
html_login();
break;
@@ -628,7 +621,7 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
'class="action source" accesskey="v" rel="nofollow"',1);
}
}else{
- $out .= tpl_link(wl($ID,'do=show'),
+ $out .= tpl_link(wl($ID,''),
$pre.(($inner)?$inner:$lang['btn_show']).$suf,
'class="action show" accesskey="v" rel="nofollow"',1);
}
@@ -657,7 +650,7 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
break;
case 'back':
if ($parent = tpl_getparent($ID)) {
- $out .= tpl_link(wl($parent,'do=show'),
+ $out .= tpl_link(wl($parent,''),
$pre.(($inner)?$inner:$lang['btn_back']).$suf,
'class="action back" accesskey="b" rel="nofollow"',1);
}
@@ -1312,14 +1305,14 @@ function tpl_license($img='badge',$imgonly=false,$return=false){
$src = license_img($img);
if($src){
$out .= '<a href="'.$lic['url'].'" rel="license"';
- if($conf['target']['external']) $out .= ' target="'.$conf['target']['external'].'"';
+ if($conf['target']['extern']) $out .= ' target="'.$conf['target']['extern'].'"';
$out .= '><img src="'.DOKU_BASE.$src.'" class="medialeft lic'.$img.'" alt="'.$lic['name'].'" /></a> ';
}
}
if(!$imgonly) {
$out .= $lang['license'];
$out .= '<a href="'.$lic['url'].'" rel="license" class="urlextern"';
- if(isset($conf['target']['external'])) $out .= ' target="'.$conf['target']['external'].'"';
+ if(isset($conf['target']['extern'])) $out .= ' target="'.$conf['target']['extern'].'"';
$out .= '>'.$lic['name'].'</a>';
}
$out .= '</div>';
@@ -1373,9 +1366,14 @@ function tpl_subscribe() {
if(!$sstl) $sstl = hsc($sub['style']);
echo ' ('.$sstl.') ';
- echo '<a href="'.wl($ID,array('do'=>'subscribe','sub_target'=>$sub['target'],'sub_style'=>$sub['style'],'sub_action'=>'unsubscribe')).'" class="unsubscribe">'.$lang['subscr_m_unsubscribe'].'</a>';
-
- echo '</div></li>';
+ echo '<a href="' . wl($ID,
+ array('do'=>'subscribe',
+ 'sub_target'=>$sub['target'],
+ 'sub_style'=>$sub['style'],
+ 'sub_action'=>'unsubscribe',
+ 'sectok' => getSecurityToken())) .
+ '" class="unsubscribe">'.$lang['subscr_m_unsubscribe'] .
+ '</a></div></li>';
}
echo '</ul>';
}
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 5d1149df3..a07bfb93d 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -34,6 +34,7 @@ function toolbar_JSdefines($varname){
'key' => 'b',
'open' => '**',
'close' => '**',
+ 'block' => false
),
array(
'type' => 'format',
@@ -42,6 +43,7 @@ function toolbar_JSdefines($varname){
'key' => 'i',
'open' => '//',
'close' => '//',
+ 'block' => false
),
array(
'type' => 'format',
@@ -50,6 +52,7 @@ function toolbar_JSdefines($varname){
'key' => 'u',
'open' => '__',
'close' => '__',
+ 'block' => false
),
array(
'type' => 'format',
@@ -58,6 +61,7 @@ function toolbar_JSdefines($varname){
'key' => 'c',
'open' => "''",
'close' => "''",
+ 'block' => false
),
array(
'type' => 'format',
@@ -66,6 +70,7 @@ function toolbar_JSdefines($varname){
'key' => 'd',
'open' => '<del>',
'close' => '</del>',
+ 'block' => false
),
array(
@@ -74,7 +79,8 @@ function toolbar_JSdefines($varname){
'icon' => 'hequal.png',
'key' => '8',
'text' => $lang['qb_h'],
- 'mod' => 0
+ 'mod' => 0,
+ 'block' => true
),
array(
'type' => 'autohead',
@@ -82,7 +88,8 @@ function toolbar_JSdefines($varname){
'icon' => 'hminus.png',
'key' => '9',
'text' => $lang['qb_h'],
- 'mod' => 1
+ 'mod' => 1,
+ 'block' => true
),
array(
'type' => 'autohead',
@@ -90,7 +97,8 @@ function toolbar_JSdefines($varname){
'icon' => 'hplus.png',
'key' => '0',
'text' => $lang['qb_h'],
- 'mod' => -1
+ 'mod' => -1,
+ 'block' => true
),
array(
@@ -139,7 +147,8 @@ function toolbar_JSdefines($varname){
'open' => '== ',
'close' => ' ==\n',
),
- )
+ ),
+ 'block' => true
),
array(
@@ -149,6 +158,7 @@ function toolbar_JSdefines($varname){
'key' => 'l',
'open' => '[[',
'close' => ']]',
+ 'block' => false
),
array(
'type' => 'format',
@@ -157,6 +167,7 @@ function toolbar_JSdefines($varname){
'open' => '[[',
'close' => ']]',
'sample' => 'http://example.com|'.$lang['qb_extlink'],
+ 'block' => false
),
array(
'type' => 'formatln',
@@ -165,6 +176,7 @@ function toolbar_JSdefines($varname){
'open' => ' - ',
'close' => '',
'key' => '-',
+ 'block' => true
),
array(
'type' => 'formatln',
@@ -173,12 +185,14 @@ function toolbar_JSdefines($varname){
'open' => ' * ',
'close' => '',
'key' => '.',
+ 'block' => true
),
array(
'type' => 'insert',
'title' => $lang['qb_hr'],
'icon' => 'hr.png',
'insert' => '\n----\n',
+ 'block' => true
),
array(
'type' => 'mediapopup',
@@ -187,6 +201,7 @@ function toolbar_JSdefines($varname){
'url' => 'lib/exe/mediamanager.php?ns=',
'name' => 'mediaselect',
'options'=> 'width=750,height=500,left=20,top=20,scrollbars=yes,resizable=yes',
+ 'block' => false
),
array(
'type' => 'picker',
@@ -194,18 +209,21 @@ function toolbar_JSdefines($varname){
'icon' => 'smiley.png',
'list' => getSmileys(),
'icobase'=> 'smileys',
+ 'block' => false
),
array(
'type' => 'picker',
'title' => $lang['qb_chars'],
'icon' => 'chars.png',
'list' => explode(' ','À à Á á  â à ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ × „ “ ” ‚ ‘ ’ « » ‹ › — – … ← ↑ → ↓ ↔ ⇐ ⇑ ⇒ ⇓ ⇔ © ™ ® ′ ″ [ ] { } ~ ( ) % § $ # | @'),
+ 'block' => false
),
array(
'type' => 'signature',
'title' => $lang['qb_sig'],
'icon' => 'sig.png',
'key' => 'y',
+ 'block' => false
),
));
} // end event TOOLBAR_DEFINE default action
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 22de2f0f0..4c74709b8 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -298,6 +298,7 @@ function ajax_linkwiz(){
'listdirs' => true,
'pagesonly' => true,
'firsthead' => true,
+ 'sneakyacl' => $conf['sneaky_index'],
);
if($id) $opts['filematch'] = '^.*\/'.$id;
if($id) $opts['dirmatch'] = '^.*\/'.$id;
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 78de3188b..680fd9ae4 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -27,72 +27,59 @@
$DL = true;
}
- //media to local file
- if(preg_match('#^(https?)://#i',$MEDIA)){
- //check hash
- if(substr(md5(auth_cookiesalt().$MEDIA),0,6) != $_REQUEST['hash']){
- header("HTTP/1.0 412 Precondition Failed");
- print 'Precondition Failed';
- exit;
- }
- //handle external images
- if(strncmp($MIME,'image/',6) == 0) $FILE = media_get_from_URL($MEDIA,$EXT,$CACHE);
- if(!$FILE){
- //download failed - redirect to original URL
- header('Location: '.$MEDIA);
- exit;
+ // check for permissions, preconditions and cache external files
+ list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE);
+
+ // prepare data for plugin events
+ $data = array('media' => $MEDIA,
+ 'file' => $FILE,
+ 'orig' => $FILE,
+ 'mime' => $MIME,
+ 'download' => $DL,
+ 'cache' => $CACHE,
+ 'ext' => $EXT,
+ 'width' => $WIDTH,
+ 'height' => $HEIGHT,
+ 'status' => $STATUS,
+ 'statusmessage' => $STATUSMESSAGE,
+ );
+
+ // handle the file status
+ $evt = new Doku_Event('FETCH_MEDIA_STATUS', $data);
+ if ( $evt->advise_before() ) {
+ // redirects
+ if($data['status'] > 300 && $data['status'] <= 304){
+ send_redirect($data['statusmessage']);
}
- }else{
- $MEDIA = cleanID($MEDIA);
- if(empty($MEDIA)){
- header("HTTP/1.0 400 Bad Request");
- print 'Bad request';
- exit;
+ // send any non 200 status
+ if($data['status'] != 200){
+ header('HTTP/1.0 ' . $data['status'] . ' ' . $data['statusmessage']);
}
-
- //check permissions (namespace only)
- if(auth_quickaclcheck(getNS($MEDIA).':X') < AUTH_READ){
- header("HTTP/1.0 401 Unauthorized");
- //fixme add some image for imagefiles
- print 'Unauthorized';
+ // die on errors
+ if($data['status'] > 203){
+ print $data['statusmessage'];
exit;
}
- $FILE = mediaFN($MEDIA);
}
-
- //check file existance
- if(!@file_exists($FILE)){
- header("HTTP/1.0 404 Not Found");
- //FIXME add some default broken image
- print 'Not Found';
- exit;
- }
-
- $ORIG = $FILE;
+ $evt->advise_after();
+ unset($evt);
//handle image resizing/cropping
if((substr($MIME,0,5) == 'image') && $WIDTH){
if($HEIGHT){
- $FILE = media_crop_image($FILE,$EXT,$WIDTH,$HEIGHT);
+ $data['file'] = $FILE = media_crop_image($data['file'],$EXT,$WIDTH,$HEIGHT);
}else{
- $FILE = media_resize_image($FILE,$EXT,$WIDTH,$HEIGHT);
+ $data['file'] = $FILE = media_resize_image($data['file'],$EXT,$WIDTH,$HEIGHT);
}
}
// finally send the file to the client
- $data = array('file' => $FILE,
- 'mime' => $MIME,
- 'download' => $DL,
- 'cache' => $CACHE,
- 'orig' => $ORIG,
- 'ext' => $EXT,
- 'width' => $WIDTH,
- 'height' => $HEIGHT);
-
$evt = new Doku_Event('MEDIA_SENDFILE', $data);
if ($evt->advise_before()) {
sendFile($data['file'],$data['mime'],$data['download'],$data['cache']);
}
+ // Do something after the download finished.
+ $evt->advise_after();
/* ------------------------------------------------------------------------ */
@@ -150,6 +137,53 @@ function sendFile($file,$mime,$dl,$cache){
}
/**
+ * Check for media for preconditions and return correct status code
+ *
+ * READ: MEDIA, MIME, EXT, CACHE
+ * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE )
+ *
+ * @author Gerry Weissbach <gerry.w@gammaproduction.de>
+ * @param $media reference to the media id
+ * @param $file reference to the file variable
+ * @returns array(STATUS, STATUSMESSAGE)
+ */
+function checkFileStatus(&$media, &$file) {
+ global $MIME, $EXT, $CACHE;
+
+ //media to local file
+ if(preg_match('#^(https?)://#i',$media)){
+ //check hash
+ if(substr(md5(auth_cookiesalt().$media),0,6) != $_REQUEST['hash']){
+ return array( 412, 'Precondition Failed');
+ }
+ //handle external images
+ if(strncmp($MIME,'image/',6) == 0) $file = media_get_from_URL($media,$EXT,$CACHE);
+ if(!$file){
+ //download failed - redirect to original URL
+ return array( 302, $media );
+ }
+ }else{
+ $media = cleanID($media);
+ if(empty($media)){
+ return array( 400, 'Bad request' );
+ }
+
+ //check permissions (namespace only)
+ if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ){
+ return array( 403, 'Forbidden' );
+ }
+ $file = mediaFN($media);
+ }
+
+ //check file existance
+ if(!@file_exists($file)){
+ return array( 404, 'Not Found' );
+ }
+
+ return array(200, null);
+}
+
+/**
* Returns the wanted cachetime in seconds
*
* Resolves named constants
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 828834c86..eb5670005 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -356,8 +356,9 @@ function sendDigest() {
foreach($users as $data) {
list($user, $style, $lastupdate) = $data;
$lastupdate = (int) $lastupdate;
- if ($lastupdate + $conf['subscribe_interval'] > time()) {
- // Less than a day passed since last update.
+ if ($lastupdate + $conf['subscribe_time'] > time()) {
+ // Less than the configured time period passed since last
+ // update.
continue;
}
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 044342187..0eb43b246 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -108,7 +108,9 @@ function js_out(){
js_runonstart("initSizeCtl('size__ctl','wiki__text')");
js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
js_runonstart("initChangeCheck('".js_escape($lang['notsavedyet'])."')");
- js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")");
+ if($conf['locktime'] != 0){
+ js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")");
+ }
js_runonstart('scrollToMarker()');
js_runonstart('focusMarker()');
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index fb6b79cf3..670ab5d7e 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
/**
* Increased whenever the API is changed
*/
-define('DOKU_XMLRPC_API_VERSION',2);
+define('DOKU_XMLRPC_API_VERSION',3);
require_once(DOKU_INC.'inc/init.php');
session_write_close(); //close session
@@ -114,6 +114,13 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
);
$this->addCallback(
+ 'dokuwiki.search',
+ 'this:search',
+ array('struct','string'),
+ 'Perform a fulltext search and return a list of matching pages'
+ );
+
+ $this->addCallback(
'dokuwiki.getTime',
'time',
array('int'),
@@ -278,8 +285,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
}
$text = rawWiki($id,$rev);
if(!$text) {
- $data = array($id);
- return trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true);
+ return pageTemplate($id);
} else {
return $text;
}
@@ -379,6 +385,41 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
}
/**
+ * List all pages in the given namespace (and below)
+ */
+ function search($query){
+ require_once(DOKU_INC.'inc/fulltext.php');
+
+ $regex = '';
+ $data = ft_pageSearch($query,$regex);
+ $pages = array();
+
+ // prepare additional data
+ $idx = 0;
+ foreach($data as $id => $score){
+ $file = wikiFN($id);
+
+ if($idx < FT_SNIPPET_NUMBER){
+ $snippet = ft_snippet($id,$regex);
+ $idx++;
+ }else{
+ $snippet = '';
+ }
+
+ $pages[] = array(
+ 'id' => $id,
+ 'score' => $score,
+ 'rev' => filemtime($file),
+ 'mtime' => filemtime($file),
+ 'size' => filesize($file),
+ 'snippet' => $snippet,
+ );
+ }
+ return $data;
+ }
+
+
+ /**
* List all media files.
*
* Available options are 'recursive' for also including the subnamespaces
diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png
new file mode 100644
index 000000000..52f7d5d72
--- /dev/null
+++ b/lib/images/fileicons/7z.png
Binary files differ
diff --git a/lib/images/fileicons/audio.png b/lib/images/fileicons/audio.png
new file mode 100644
index 000000000..98883256d
--- /dev/null
+++ b/lib/images/fileicons/audio.png
Binary files differ
diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png
new file mode 100644
index 000000000..3a8835360
--- /dev/null
+++ b/lib/images/fileicons/csv.png
Binary files differ
diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png
new file mode 100644
index 000000000..932567f8a
--- /dev/null
+++ b/lib/images/fileicons/docx.png
Binary files differ
diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png
new file mode 100644
index 000000000..928705d7a
--- /dev/null
+++ b/lib/images/fileicons/mp3.png
Binary files differ
diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png
new file mode 100644
index 000000000..62cea6aaa
--- /dev/null
+++ b/lib/images/fileicons/ogg.png
Binary files differ
diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png
new file mode 100644
index 000000000..adaefc602
--- /dev/null
+++ b/lib/images/fileicons/pptx.png
Binary files differ
diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png
new file mode 100644
index 000000000..f60054a3a
--- /dev/null
+++ b/lib/images/fileicons/sql.png
Binary files differ
diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png
new file mode 100644
index 000000000..79e80760e
--- /dev/null
+++ b/lib/images/fileicons/wav.png
Binary files differ
diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png
new file mode 100644
index 000000000..e8cd58dc0
--- /dev/null
+++ b/lib/images/fileicons/xlsx.png
Binary files differ
diff --git a/lib/images/license/badge/cc-zero.png b/lib/images/license/badge/cc-zero.png
new file mode 100644
index 000000000..8a0ef3e3b
--- /dev/null
+++ b/lib/images/license/badge/cc-zero.png
Binary files differ
diff --git a/lib/images/license/button/cc-zero.png b/lib/images/license/button/cc-zero.png
new file mode 100644
index 000000000..fc99eff61
--- /dev/null
+++ b/lib/images/license/button/cc-zero.png
Binary files differ
diff --git a/lib/images/media_align_center.png b/lib/images/media_align_center.png
new file mode 100644
index 000000000..3db90fc17
--- /dev/null
+++ b/lib/images/media_align_center.png
Binary files differ
diff --git a/lib/images/media_align_left.png b/lib/images/media_align_left.png
new file mode 100644
index 000000000..cebbb1a9a
--- /dev/null
+++ b/lib/images/media_align_left.png
Binary files differ
diff --git a/lib/images/media_align_noalign.png b/lib/images/media_align_noalign.png
new file mode 100644
index 000000000..74f34e5f1
--- /dev/null
+++ b/lib/images/media_align_noalign.png
Binary files differ
diff --git a/lib/images/media_align_right.png b/lib/images/media_align_right.png
new file mode 100644
index 000000000..5f54a4a49
--- /dev/null
+++ b/lib/images/media_align_right.png
Binary files differ
diff --git a/lib/images/media_link_direct.png b/lib/images/media_link_direct.png
new file mode 100644
index 000000000..4bdb3541e
--- /dev/null
+++ b/lib/images/media_link_direct.png
Binary files differ
diff --git a/lib/images/media_link_displaylnk.png b/lib/images/media_link_displaylnk.png
new file mode 100644
index 000000000..25eacb7c2
--- /dev/null
+++ b/lib/images/media_link_displaylnk.png
Binary files differ
diff --git a/lib/images/media_link_lnk.png b/lib/images/media_link_lnk.png
new file mode 100644
index 000000000..1209164ca
--- /dev/null
+++ b/lib/images/media_link_lnk.png
Binary files differ
diff --git a/lib/images/media_link_nolnk.png b/lib/images/media_link_nolnk.png
new file mode 100644
index 000000000..fc3c393ca
--- /dev/null
+++ b/lib/images/media_link_nolnk.png
Binary files differ
diff --git a/lib/images/media_size_large.png b/lib/images/media_size_large.png
new file mode 100644
index 000000000..e2fb548d9
--- /dev/null
+++ b/lib/images/media_size_large.png
Binary files differ
diff --git a/lib/images/media_size_medium.png b/lib/images/media_size_medium.png
new file mode 100644
index 000000000..b33157256
--- /dev/null
+++ b/lib/images/media_size_medium.png
Binary files differ
diff --git a/lib/images/media_size_original.png b/lib/images/media_size_original.png
new file mode 100644
index 000000000..d179aa2db
--- /dev/null
+++ b/lib/images/media_size_original.png
Binary files differ
diff --git a/lib/images/media_size_small.png b/lib/images/media_size_small.png
new file mode 100644
index 000000000..04efe7080
--- /dev/null
+++ b/lib/images/media_size_small.png
Binary files differ
diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index 899d30ced..aab39098a 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -6,6 +6,7 @@
* @author Bohumir Zamecnik <bohumir@zamecnik.org>
* @author Zbynek Krivka <zbynek.krivka@seznam.cz>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['admin_acl'] = 'Správa přístupových práv';
$lang['acl_group'] = 'Skupina';
diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index cd42fdedc..6cabe3f35 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -4,7 +4,7 @@
*
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
$lang['admin_acl'] = 'Zugriffskontrollsystem Management';
$lang['acl_group'] = 'Gruppe';
@@ -21,14 +21,14 @@ $lang['p_choose_id'] = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b>
$lang['p_choose_ns'] = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes<b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
$lang['p_inherited'] = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.';
$lang['p_isadmin'] = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.';
-$lang['p_include'] = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Loeschrechte sind nur fuer Namensräume, nicht fuer Seiten.';
+$lang['p_include'] = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.';
$lang['current'] = 'Momentane Zugriffsregeln';
$lang['where'] = 'Seite/Namensraum';
$lang['who'] = 'Benutzer/Gruppe';
$lang['perm'] = 'Rechte';
$lang['acl_perm0'] = 'Keine';
$lang['acl_perm1'] = 'Lesen';
-$lang['acl_perm2'] = 'Editieren';
+$lang['acl_perm2'] = 'Bearbeiten';
$lang['acl_perm4'] = 'Erstellen';
$lang['acl_perm8'] = 'Hochladen';
$lang['acl_perm16'] = 'Löschen';
diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index 3a23c71da..c908dc5a9 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -17,6 +17,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['admin_acl'] = 'Administración de lista de control de acceso';
$lang['acl_group'] = 'Grupo';
diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt
index 69661bb9b..f748f6b23 100644
--- a/lib/plugins/acl/lang/fr/help.txt
+++ b/lib/plugins/acl/lang/fr/help.txt
@@ -1,9 +1,9 @@
-=== Aide rapide : ===
+=== Aide rapide ===
Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles.
-Le formulaire au dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
+Le formulaire au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
-Dans la table ci-dessous toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACLs.
+Dans le tableau ci-dessous, toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACL.
-La lecture de [[doku>acl|la documentation officielle des ACLs]] pourra vous permettre de comprendre complètement le fonctionnement du contrôle d'accès dans DokuWiki.
+La lecture de [[doku>acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index efdc5f074..64d918360 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -17,6 +17,8 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
$lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)';
$lang['acl_group'] = 'Groupe';
@@ -25,15 +27,15 @@ $lang['acl_perms'] = 'Permission pour';
$lang['page'] = 'Page';
$lang['namespace'] = 'Catégorie';
$lang['btn_select'] = 'Sélectionner';
-$lang['p_user_id'] = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_user_ns'] = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_group_id'] = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns'] = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id'] = 'Saisissez un nom <b>d\'utilisateur ou de groupe</b> dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page <b class="aclpage">%s</b>.';
-$lang['p_choose_ns'] = 'Saisissez un nom <b>d\'utilisateur ou de groupe</b> dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie <b class="aclns">%s</b>.';
+$lang['p_user_id'] = 'Permissions actuelles de l\'utilisateur <strong class="acluser">%s</strong> sur la page <strong class="aclpage">%s</strong>: <em>%s</em>.';
+$lang['p_user_ns'] = 'Permissions actuelles de l\'utilisateur <strong class="acluser">%s</strong> sur la catégorie <strong class="aclns">%s</strong>: <em>%s</em>.';
+$lang['p_group_id'] = 'Permissions actuelles des membres du groupe <strong class="aclgroup">%s</strong> sur la page <strong class="aclpage">%s</strong>: <em>%s</em>.';
+$lang['p_group_ns'] = 'Permissions actuelles des membres du groupe <strong class="aclgroup">%s</strong> sur la catégorie <strong class="aclns">%s</strong>: <em>%s</em>.';
+$lang['p_choose_id'] = 'Saisissez un nom <strong>d\'utilisateur ou de groupe</strong> dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page <strong class="aclpage">%s</strong>.';
+$lang['p_choose_ns'] = 'Saisissez un nom <strong>d\'utilisateur ou de groupe</strong> dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie <strong class="aclns">%s</strong>.';
$lang['p_inherited'] = 'Note : Ces permissions n\'ont pas été explicitement fixées mais sont héritées d\'autres groupes ou catégories supérieures.';
$lang['p_isadmin'] = 'Note : Le groupe ou l\'utilisateur sélectionné dispose de toutes les permissions car il est paramétré en tant que superutilisateur.';
-$lang['p_include'] = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger, et Effacer, ne s\'appliquent qu\'aux catégories ; pas aux pages.';
+$lang['p_include'] = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger et Effacer ne s\'appliquent qu\'aux catégories, pas aux pages.';
$lang['current'] = 'ACL actuelles';
$lang['where'] = 'Page/Catégorie';
$lang['who'] = 'Utilisateur/Groupe';
@@ -42,7 +44,7 @@ $lang['acl_perm0'] = 'Aucune';
$lang['acl_perm1'] = 'Lecture';
$lang['acl_perm2'] = 'Écriture';
$lang['acl_perm4'] = 'Création';
-$lang['acl_perm8'] = 'Télécharger';
+$lang['acl_perm8'] = 'Téléverser';
$lang['acl_perm16'] = 'Effacer';
$lang['acl_new'] = 'Ajouter une nouvelle entrée';
$lang['acl_mod'] = 'Modifier l\'entrée';
diff --git a/lib/plugins/acl/lang/gl/help.txt b/lib/plugins/acl/lang/gl/help.txt
index c427b182f..593dcef07 100644
--- a/lib/plugins/acl/lang/gl/help.txt
+++ b/lib/plugins/acl/lang/gl/help.txt
@@ -1,11 +1,11 @@
-=== Axuda rápida: ===
+=== Axuda Rápida: ===
-Nesta páxina pode engadir e eliminar os permisos para os nomes de espazo e as páxinas do seu wiki.
+Nesta páxina podes engadir e eliminar permisos para os nomes de espazo e as páxinas do teu wiki.
-O panel da esquerda mostra todos os nomes de espazo e páxinas dispoñíbeis.
+O panel da esquerda amosa todos os nomes de espazo e páxinas dispoñíbeis.
-O formulario de arriba permítelle ver e modificar os permisos da persoa usuaria ou grupo seleccionada.
+O formulario de enriba permíteche ver e modificares os permisos do usuario ou grupo seleccionado.
-Na táboa de abaixo móstranse todas as regras de control de accesos estabelecidas. Pode empregala para cambiar ou eliminar varias regras dun xeito rápido.
+Na táboa de embaixo amósanse todas as regras de control de accesos estabelecidas. Podes empregala para mudares ou eliminares varias regras dun xeito rápido.
-A lectura da [[doku>acl|documentación oficial da ACL]] pode servirlle de axuda para comprender como funciona o control de accesos no Dokuwiki.
+A lectura da [[doku>acl|documentación oficial da ACL]] pode servirche de axuda para comprenderes como funciona o control de accesos no Dokuwiki.
diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php
index 184cf7e1d..774bf207a 100644
--- a/lib/plugins/acl/lang/gl/lang.php
+++ b/lib/plugins/acl/lang/gl/lang.php
@@ -2,35 +2,33 @@
/**
* Galicianlanguage file
*
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
-$lang['admin_acl'] = 'Xestión da Lista de control de acceso (ACL)';
+$lang['admin_acl'] = 'Xestión da Lista de Control de Acceso (ACL)';
$lang['acl_group'] = 'Grupo';
-$lang['acl_user'] = 'Usuaria/o';
+$lang['acl_user'] = 'Usuario';
$lang['acl_perms'] = 'Permisos para';
$lang['page'] = 'Páxina';
$lang['namespace'] = 'Nome de espazo';
-$lang['btn_select'] = 'Selecciona';
-$lang['p_user_id'] = 'A persoa usuaria <b class="acluser">%s</b> dispón actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_user_ns'] = 'A persoa usuaria <b class="acluser">%s</b> dispón actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_group_id'] = 'As e os integrantes do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns'] = 'As e os integrantes do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id'] = '<b>Insira un nome de usuaria/o ou grupo</b> no formulario de arriba para ver ou editar os permisos estabelecidos para a páxina <b class="aclpage">%s</b>.';
-$lang['p_choose_ns'] = '<b>Insira un nome de usuaria/o ou grupo</b> no formulario de arriba para ver ou editar os permisos estabelecidos no nome de espazo <b class="aclns">%s</b>.';
-$lang['p_inherited'] = 'Nota: Estes permisos non foron estabelecidos explicitamente senón que foron herdados doutros grupos ou nomes de espazo maiores.';
-$lang['p_isadmin'] = 'Nota: O grupo ou a persoa usuaria seleccionado terá sempre permisos completos por estar configurado como superusuaria/o.';
-$lang['p_include'] = 'Os permisos máis grandes inclúen os menores. Os permisos de Creación, Subida e Eliminación só se aplican aos nomes de espazo, non ás páxinas.';
-$lang['current'] = 'Regras ACL actuais';
-$lang['where'] = 'Páxina/Nome de espazo';
-$lang['who'] = 'Usuaria/o/Grupo';
+$lang['btn_select'] = 'Escolle';
+$lang['p_user_id'] = 'O usuario <b class="acluser">%s</b> dispón actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns'] = 'O usuario <b class="acluser">%s</b> dispón actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id'] = 'Os membros do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns'] = 'Os membros do grupo <b class="aclgroup">%s</b> cdispoñen actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id'] = 'Por favor, <b>insire un usuario ou grupo</b> no formulario de enriba para ver ou editar os permisos establecidos para a páxina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns'] = 'Por favor <b>insire un usuario ou grupo</b> no formulario de enriba para ver ou editar os permisos establecidos no nome de espazo <b class="aclns">%s</b>.';
+$lang['p_inherited'] = 'Nota: Estes permisos non foron establecidos explicitamente senón que foron herdadas de outros grupos ou nomes de espazo meirandes.';
+$lang['p_isadmin'] = 'Nota: O grupo ou usuario seleccionado terá sempre permisos completos por estar configurado como super-usuario.';
+$lang['p_include'] = 'Os permisos meirandes inclúen os menores. Os permisos de Creación, Subida e Eliminado só se aplican aos nomes de espazo, non ás páxinas.';
+$lang['current'] = 'Regras ACL Actuais';
+$lang['where'] = 'Páxina/Nome de Espazo';
+$lang['who'] = 'Usuario/Grupo';
$lang['perm'] = 'Permisos';
$lang['acl_perm0'] = 'Ningún';
$lang['acl_perm1'] = 'Ler';
$lang['acl_perm2'] = 'Editar';
$lang['acl_perm4'] = 'Crear';
-$lang['acl_perm8'] = 'Subir ficheiros';
+$lang['acl_perm8'] = 'Subir arquivos';
$lang['acl_perm16'] = 'Eliminar';
-$lang['acl_new'] = 'Engadir una entrada';
-$lang['acl_mod'] = 'Modificar unha entrada';
+$lang['acl_new'] = 'Engadir nova Entrada';
+$lang['acl_mod'] = 'Modificar Entrada';
diff --git a/lib/plugins/acl/lang/ia/help.txt b/lib/plugins/acl/lang/ia/help.txt
new file mode 100644
index 000000000..59f5764eb
--- /dev/null
+++ b/lib/plugins/acl/lang/ia/help.txt
@@ -0,0 +1,11 @@
+=== Adjuta rapide: ===
+
+In iste pagina tu pote adder e remover permissiones pro spatios de nomines e paginas in tu wiki.
+
+Le columna sinistre presenta tote le spatios de nomines e paginas disponibile.
+
+Le formulario hic supra permitte vider e modificar le permissiones de un usator o gruppo seligite.
+
+In le tabella hic infra se monstra tote le regulas de controlo de accesso actualmente configurate. Tu pote usar lo pro rapidemente deler o modificar plure regulas.
+
+Es recommendate leger le [[doku>acl|documentation official super ACL]] pro comprender completemente como le controlo de accesso functiona in DokuWiki.
diff --git a/lib/plugins/acl/lang/ia/lang.php b/lib/plugins/acl/lang/ia/lang.php
new file mode 100644
index 000000000..f7d076539
--- /dev/null
+++ b/lib/plugins/acl/lang/ia/lang.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['admin_acl'] = 'Gestion de listas de controlo de accesso';
+$lang['acl_group'] = 'Gruppo';
+$lang['acl_user'] = 'Usator';
+$lang['acl_perms'] = 'Permissiones pro';
+$lang['page'] = 'Pagina';
+$lang['namespace'] = 'Spatio de nomines';
+$lang['btn_select'] = 'Seliger';
+$lang['p_user_id'] = 'Le usator <b class="acluser">%s</b> ha actualmente le sequente permissiones in le pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns'] = 'Le usator <b class="acluser">%s</b> ha actualmente le sequente permissiones in le spatio de nomines <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id'] = 'Le membros del gruppo <b class="aclgroup">%s</b> a actualmente le sequente permissiones in le pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns'] = 'Le membros del gruppo <b class="aclgroup">%s</b> ha actualmente le sequente permissiones in le spatio de nomines <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id'] = 'Per favor <b>entra un usator o gruppo</b> in le formulario hic supra pro vider o modificar le permissiones configurate pro le pagina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns'] = 'Per favor <b>entra un usator o gruppo</b> in le formulario hic supra pro vider o modificar le permissiones configurate pro le spatio de nomines <b class="aclns">%s</b>.';
+$lang['p_inherited'] = 'Nota ben: Iste permissiones non ha essite configurate explicitemente ma ha essite hereditate de altere gruppos o de spatios de nomines superior.';
+$lang['p_isadmin'] = 'Nota ben: Le gruppo o usator seligite ha sempre permissiones integral proque es configurate como superusator.';
+$lang['p_include'] = 'Le permissiones superior include les inferior. Le permissiones de Crear, Incargar e Deler es solmente applicabile a spatios de nomines, non a paginas.';
+$lang['current'] = 'Regulas ACL actual';
+$lang['where'] = 'Pagina/Spatio de nomines';
+$lang['who'] = 'Usator/Gruppo';
+$lang['perm'] = 'Permissiones';
+$lang['acl_perm0'] = 'Nulle';
+$lang['acl_perm1'] = 'Leger';
+$lang['acl_perm2'] = 'Modificar';
+$lang['acl_perm4'] = 'Crear';
+$lang['acl_perm8'] = 'Incargar';
+$lang['acl_perm16'] = 'Deler';
+$lang['acl_new'] = 'Adder nove entrata';
+$lang['acl_mod'] = 'Modificar entrata';
diff --git a/lib/plugins/acl/lang/it/help.txt b/lib/plugins/acl/lang/it/help.txt
index 5e4b08dd6..8bf68e8e7 100644
--- a/lib/plugins/acl/lang/it/help.txt
+++ b/lib/plugins/acl/lang/it/help.txt
@@ -6,6 +6,6 @@ Il pannello di sinistra mostra tutte le categorie e le pagine disponibili.
Il campo sopra ti permette di vedere e modificare i permessi di un utente o gruppo selezionato.
-Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per cancellare o cambiare al volo varie regole.
+Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per eliminare o cambiare al volo varie regole.
-Leggere la [[doku>acl|official documentation on ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki.
+Leggere la [[doku>acl|documentazione ufficale delle ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki.
diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
index 344987e8b..2f579afae 100644
--- a/lib/plugins/acl/lang/it/lang.php
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -23,11 +23,11 @@ $lang['p_user_id'] = 'L\'utente <b class="acluser">%s</b> attualment
$lang['p_user_ns'] = 'L\'utente <b class="acluser">%s</b> attualmente ha i seguenti permessi per la categoria <b class="aclns">%s</b>: <i>%s</i>.';
$lang['p_group_id'] = 'I membri del gruppo<b class="aclgroup">%s</b> attualmente hanno i seguenti permessi sulla pagina <b class="aclpage">%s</b>: <i>%s</i>.';
$lang['p_group_ns'] = 'I membri del gruppo<b class="aclgroup">%s</b> attualmente hanno i seguenti permessi per la categoria <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id'] = 'Per favore <b>inserisci un utente o gruppo</b> nel campo sopra per modificare i permessi impostati per la pagina <b class="aclpage">%s</b>.';
-$lang['p_choose_ns'] = 'Per favore <b>inserisci un utente o un gruppo</b> nel campo sopra per modificare i permessi impostati per la categoria <b class="aclns">%s</b>.';
-$lang['p_inherited'] = 'Nota: Questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.';
-$lang['p_isadmin'] = 'Nota: Il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.';
-$lang['p_include'] = 'I permessi più elevati includono i permessi inferiori. I permessi di Creazione, Upload e Cancellazione si applicano soltanto alle categorie e non alle pagine.';
+$lang['p_choose_id'] = '<b>Inserisci un utente o gruppo</b> nel campo sopra per modificare i permessi impostati per la pagina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns'] = '<b>Inserisci un utente o un gruppo</b> nel campo sopra per modificare i permessi impostati per la categoria <b class="aclns">%s</b>.';
+$lang['p_inherited'] = 'Nota: questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.';
+$lang['p_isadmin'] = 'Nota: il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.';
+$lang['p_include'] = 'I permessi più elevati includono i permessi inferiori. I permessi Crea, Carica ed Elimina si applicano soltanto alle categorie e non alle pagine.';
$lang['current'] = 'Regole ACL attuali';
$lang['where'] = 'Pagina/Categoria';
$lang['who'] = 'Utente/Gruppo';
@@ -35,8 +35,8 @@ $lang['perm'] = 'Permessi';
$lang['acl_perm0'] = 'Nessuno';
$lang['acl_perm1'] = 'Lettura';
$lang['acl_perm2'] = 'Modifica';
-$lang['acl_perm4'] = 'Creazione';
-$lang['acl_perm8'] = 'Upload';
-$lang['acl_perm16'] = 'Cancellazione';
-$lang['acl_new'] = 'Aggiungi nuovo record';
-$lang['acl_mod'] = 'Modifica record';
+$lang['acl_perm4'] = 'Crea';
+$lang['acl_perm8'] = 'Carica';
+$lang['acl_perm16'] = 'Elimina';
+$lang['acl_new'] = 'Aggiungi nuovo valore';
+$lang['acl_mod'] = 'Modifica valore';
diff --git a/lib/plugins/acl/lang/lb/help.txt b/lib/plugins/acl/lang/lb/help.txt
new file mode 100644
index 000000000..e36ed373f
--- /dev/null
+++ b/lib/plugins/acl/lang/lb/help.txt
@@ -0,0 +1,11 @@
+=== Séier Hëllef: ===
+
+Op dëser Säit kanns de Rechter fir Namespacen a Säiten an dengem Wiki setzen.
+
+Op der lénkser Säit hues de all d'Namespacen a Säiten.
+
+Am Formulär hei uewendriwwer kanns de d'Rechter vun dem ausgewielte Benotzer oder Grupp änneren
+
+An der Tabell hei ënnendrënner kanns de all d'Reegele gesinn déi de Moment gesat sinn. Du kanns se huelen fir Reegelen ze änneren oder ze läschen.
+
+Déi [[doku>acl|offiziell Dokumentatioun iwwert ACL]] hëlleft der besser ze verstoen wéi déi Reegelen am Dokuwiki funktionéieren.
diff --git a/lib/plugins/acl/lang/lb/lang.php b/lib/plugins/acl/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/acl/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
diff --git a/lib/plugins/acl/lang/mk/lang.php b/lib/plugins/acl/lang/mk/lang.php
new file mode 100644
index 000000000..d576c3d1d
--- /dev/null
+++ b/lib/plugins/acl/lang/mk/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
+$lang['acl_group'] = 'Група';
+$lang['acl_user'] = 'Корисник';
+$lang['acl_perms'] = 'Пермисии за';
+$lang['page'] = 'Страница';
+$lang['btn_select'] = 'Избери';
+$lang['current'] = 'Моментални ACL правила';
+$lang['who'] = 'Корисник/група';
+$lang['perm'] = 'Пермисии';
+$lang['acl_perm0'] = 'Ништо';
+$lang['acl_perm1'] = 'Читај';
+$lang['acl_perm2'] = 'Уреди';
+$lang['acl_perm4'] = 'Креирај';
+$lang['acl_perm8'] = 'Качи';
+$lang['acl_perm16'] = 'Избриши';
+$lang['acl_new'] = 'Додај нов запис';
+$lang['acl_mod'] = 'Измени запис';
diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index 63a870c50..0f88fe477 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -7,6 +7,8 @@
* @author Mariusz Kujawski <marinespl@gmail.com>
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['admin_acl'] = 'Zarządzanie uprawnieniami';
$lang['acl_group'] = 'Grupa';
@@ -18,7 +20,7 @@ $lang['btn_select'] = 'Wybierz';
$lang['p_user_id'] = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
$lang['p_user_ns'] = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do katalogów <b class="aclns">%s</b>: <i>%s</i>.';
$lang['p_group_id'] = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns'] = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_ns'] = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do katalogu <b class="aclns">%s</b>: <i>%s</i>.';
$lang['p_choose_id'] = 'Podaj <b>nazwę użytkownika lub grupy</b> w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do strony <b class="aclpage">%s</b>.';
$lang['p_choose_ns'] = 'Podaj <b>nazwę użytkownika lub grupy</b> w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do katalogu <b class="aclns">%s</b>.';
$lang['p_inherited'] = 'Uwaga: Uprawnienia nie zostały nadane wprost ale są dziedziczone z grupy lub katalogu.';
diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index 82a19b290..e199b773c 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -16,6 +16,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['admin_acl'] = 'Administração da Lista de Controles de Acesso';
$lang['acl_group'] = 'Grupo';
diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 496e67510..911ae72da 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -11,6 +11,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['admin_acl'] = 'Управление списками контроля доступа';
$lang['acl_group'] = 'Группа';
diff --git a/lib/plugins/acl/lang/sq/help.txt b/lib/plugins/acl/lang/sq/help.txt
new file mode 100644
index 000000000..84a567f8b
--- /dev/null
+++ b/lib/plugins/acl/lang/sq/help.txt
@@ -0,0 +1,11 @@
+=== Ndihmë e Shpejtë: ===
+
+Në këtë faqe mund të shtoni ose hiqni të drejta për hapësira emri dhe faqe në wiki-n tuaj.
+
+Paneli i majtë tregon të gjitha faqet dhe hapësirat e emrit të disponueshme.
+
+Forma më sipër ju lejon të shihni dhe ndryshoni lejet për një grup ose përdorues të përzgjedhur.
+
+Në tabelën më poshtë tregohen të gjitha rregullat e vendosjes së aksesit. Mund ta përdorni për të fshirë shpejt ose ndryshuar shumë rregulla njëkohësisht.
+
+Leximi i [[doku>acl|dokumentimit zyrtar mbi ACL]] mund t'ju ndihmojë për të kuptuar plotësisht sesi funksionin Kontrolli i Aksesit në DokuWiki.
diff --git a/lib/plugins/acl/lang/sq/lang.php b/lib/plugins/acl/lang/sq/lang.php
new file mode 100644
index 000000000..30fc99bb0
--- /dev/null
+++ b/lib/plugins/acl/lang/sq/lang.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['admin_acl'] = 'Menaxhimi i Listës së Kontrollit të Aksesit';
+$lang['acl_group'] = 'Grup';
+$lang['acl_user'] = 'Përdorues';
+$lang['acl_perms'] = 'Të drejta për';
+$lang['page'] = 'Faqe';
+$lang['namespace'] = 'Hapësira e Emrit';
+$lang['btn_select'] = 'Zgjidh';
+$lang['p_user_id'] = 'Përdoruesi <b class="acluser">%s</b> momentalisht ka të drejtat e mëposhtme mbi faqen <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns'] = 'Përdoruesi <b class="acluser">%s</b> momentalisht ka të drejtat e mëposhtme mbi hapësirën e emrit <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id'] = 'Anëtarët e grupit <b class="aclgroup">%s</b> momentalisht kanë të drejtat e mëposhtme mbi faqen <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns'] = 'Anëtarët e grupit <b class="aclgroup">%s</b> momentalisht kanë të drejtat e mëposhtme mbi hapësirën e emrit <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id'] = 'Ju lutemi <b>futni një përdorues ose grup</b> në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për faqen <b class="aclpage">%s</b>.';
+$lang['p_choose_ns'] = 'Ju lutemi <b>futni një përdorues ose grup</b> në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për hapësirën e emrit <b class="aclns">%s</b>.';
+$lang['p_inherited'] = 'Shënim: Ato të drejta nuk janë vendosur specifikisht por janë të trashëguara nga grupe të tjera ose hapësira emri më të larta.';
+$lang['p_isadmin'] = 'Shënim: Grupi ose përdoruesi i përzgjedhur ka gjithmonë të drejta të plota sepse është konfiguruar si superpërdorues.';
+$lang['p_include'] = 'Të drejtat më të larta i përfshijnë edhe ato më të ultat. Të drejtat Krijo, Ngarko dhe Fshi u aplikohen vetëm hapësirave të emrit, jo faqeve.';
+$lang['current'] = 'Rregullat aktuale ACL';
+$lang['where'] = 'Faqe/Hapësirë Emri';
+$lang['who'] = 'Përdorues/Grup';
+$lang['perm'] = 'Të Drejta';
+$lang['acl_perm0'] = 'Asgjë';
+$lang['acl_perm1'] = 'Lexim';
+$lang['acl_perm2'] = 'Redaktim';
+$lang['acl_perm4'] = 'Krijim';
+$lang['acl_perm8'] = 'Ngarkim';
+$lang['acl_perm16'] = 'Fshi';
+$lang['acl_new'] = 'Shto Hyrje të re';
+$lang['acl_mod'] = 'Ndrysho Hyrje';
diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index e5114617b..25303791d 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -6,6 +6,7 @@
* @author Bohumir Zamecnik <bohumir@zamecnik.org>
* @author Zbynek Krivka <zbynek.krivka@seznam.cz>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['menu'] = 'Správa nastavení';
$lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce,
@@ -115,6 +116,7 @@ $lang['gdlib'] = 'Verze GD knihovny';
$lang['im_convert'] = 'Cesta k nástroji convert z balíku ImageMagick';
$lang['jpg_quality'] = 'Kvalita komprese JPEG (0-100)';
$lang['subscribers'] = 'Možnost přihlásit se k odběru novinek stránky';
+$lang['subscribe_time'] = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.';
$lang['compress'] = 'Zahustit CSS a JavaScript výstup';
$lang['hidepages'] = 'Skrýt stránky odpovídající vzoru (regulární výrazy)';
$lang['send404'] = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky';
diff --git a/lib/plugins/config/lang/de-informal/intro.txt b/lib/plugins/config/lang/de-informal/intro.txt
index 45861dd00..7ac1b47d9 100644
--- a/lib/plugins/config/lang/de-informal/intro.txt
+++ b/lib/plugins/config/lang/de-informal/intro.txt
@@ -1,7 +1,7 @@
===== Einstellungs-Manager =====
-Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation. Für Hilfe zu individuellen Einstellungen gehe zu [[doku>config]]. Für mehr Details über diese Erweiterunge siehe [[doku>plugin:config]].
+Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation. Für Hilfe zu individuellen Einstellungen gehe zu [[doku>config]]. Für mehr Details über diese Erweiterungen siehe [[doku>plugin:config]].
Einstellungen die mit einem hellroten Hintergrund angezeigt werden, können mit dieser Erweiterung nicht verändert werden. Einstellungen mit einem blauen Hintergrund sind Standardwerte und Einstellungen mit einem weißen Hintergrund wurden lokal gesetzt für diese Installation. Sowohl blaue als auch weiße Einstellungen können angepasst werden.
-Denke dran **SAVE** zu drücken bevor du die Seite verläßt, andernfalls werden deine Änderungen nicht übernommen. \ No newline at end of file
+Denke dran **Speichern** zu drücken bevor du die Seite verlässt, andernfalls werden deine Änderungen nicht übernommen. \ No newline at end of file
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 68232d80b..69ad3e524 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -4,19 +4,20 @@
*
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
$lang['menu'] = 'Einstellungen';
$lang['error'] = 'Einstellungen wurden nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfen Sie Ihre Änderungen und versuchen Sie es erneut.
-<br />Die/der inkorrekte(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.';
-$lang['updated'] = 'Einstellungen erfolgreich hochgeladen.';
+<br />Die/der ungültige(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.';
+$lang['updated'] = 'Einstellungen erfolgreich aktualisiert.';
$lang['nochoice'] = '(keine andere Option möglich)';
-$lang['danger'] = 'Achtung: Änderungen dieser Option könnten dein Wiki und das Konfigurationsmenü unzugänglich machen.';
-$lang['warning'] = 'Achtung: Änderungen dieser Option kann zu unbabsichtigtem Verhalten führen.';
-$lang['security'] = 'Sicherheitswarnung: Änderungen dieser Option können eine Sicherheitsrisiko bedeuten.';
+$lang['locked'] = 'Die Einstallungsdatei kann nicht aktualisiert werden. Wenn dies beunabsichtigt ist stelle sicher, dass der Name und die Zugriffsrechte der Einstellungsdatei richtig sind.';
+$lang['danger'] = '**Achtung**: Eine Änderung dieser Einstellung kann dein Wiki und das Einstellungsmenü unerreichbar machen.';
+$lang['warning'] = 'Achtung: Eine Änderungen dieser Option kann zu unbabsichtigtem Verhalten führen.';
+$lang['security'] = 'Sicherheitswarnung: Eine Änderungen dieser Option können ein Sicherheitsrisiko bedeuten.';
$lang['_configuration_manager'] = 'Einstellungen';
$lang['_header_dokuwiki'] = 'DokuWiki-Einstellungen';
-$lang['_header_plugin'] = 'Erweiterugs-Einstellungen';
+$lang['_header_plugin'] = 'Erweiterungs-Einstellungen';
$lang['_header_template'] = 'Vorlageneinstellungen';
$lang['_header_undefined'] = 'unbestimmte Einstellungen';
$lang['_basic'] = 'Grundeinstellungen';
@@ -31,47 +32,59 @@ $lang['_network'] = 'Netzwerk-Einstellungen';
$lang['_plugin_sufix'] = 'Ereiterungseinstellungen';
$lang['_template_sufix'] = 'Vorlageneinstellungen';
$lang['_msg_setting_no_default'] = 'Kein Standardwert.';
-$lang['fmode'] = 'Dateierstellungsmodus';
-$lang['dmode'] = 'Ordnererstellungsmodus';
+$lang['fmode'] = 'Zugriffsrechte bei Dateierstellung';
+$lang['dmode'] = 'Zugriffsrechte bei Verzeichniserstellung';
$lang['lang'] = 'Sprache';
-$lang['basedir'] = 'Installationsverzeichnis. Für automatische Erkennung frei lassen.';
-$lang['baseurl'] = 'Installationspfad (URL)';
$lang['savedir'] = 'Ordner zum Speichern von Daten';
$lang['start'] = 'Name der Startseite';
$lang['title'] = 'Wiki Titel';
$lang['template'] = 'Vorlage';
$lang['license'] = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?';
-$lang['fullpath'] = 'Den kompletten Dateipfad im Footer anzeigen';
+$lang['fullpath'] = 'Zeige vollen Pfad der Datei in Fußzeile an';
$lang['recent'] = 'letzte Änderungen';
$lang['typography'] = 'Mach drucktechnische Ersetzungen';
$lang['htmlok'] = 'Erlaube eingebettetes HTML';
$lang['phpok'] = 'Erlaube eingebettetes PHP';
-$lang['dformat'] = 'Datumsformat (siehe PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)';
+$lang['dformat'] = 'Datumsformat (siehe PHPs <a href="http://www.php.net/strftime">strftime</a> Funktion)';
$lang['signature'] = 'Signatur';
-$lang['usewordblock'] = 'Blockier Spam basierend auf der Wortliste';
+$lang['usewordblock'] = 'Blockiere Spam basierend auf der Wortliste';
$lang['useacl'] = 'Benutze Zugangskontrollliste';
$lang['autopasswd'] = 'Automatisch erzeugte Passwörter';
$lang['passcrypt'] = 'Passwortverschlüsselungsmethode';
$lang['defaultgroup'] = 'Standardgruppe';
-$lang['profileconfirm'] = 'Bestätige Profiländerungen mit dem Passwort';
+$lang['profileconfirm'] = 'Änderungen am Benutzerprofil mit Passwort bestätigen';
$lang['disableactions'] = 'Deaktiviere DokuWiki\'s Zugriffe';
-$lang['disableactions_check'] = 'Prüfe';
$lang['disableactions_subscription'] = 'Bestellen/Abbestellen';
+$lang['disableactions_nssubscription'] = 'Namensraum Bestellen/Abbestellen';
$lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten';
$lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)';
-$lang['userewrite'] = 'Benutze angenehme URLs';
-$lang['autoplural'] = 'Prüfe die Links auf Plural-Formen';
-$lang['notify'] = 'Sende eine Änderungsmitteilung an diese E-Mail-Adresse';
-$lang['mailfrom'] = 'E-Mail-Adresse zur Nutzung für automatische E-Mails';
+$lang['sneaky_index'] = 'Standardmäßig zeigt Dokuwiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.';
+$lang['userewrite'] = 'Benutze schöne URLs';
+$lang['useslash'] = 'Benutze Schrägstrich als Namensraumtrenner in URLs';
+$lang['usedraft'] = 'Speichere automatisch Entwürfe während der Bearbeitung';
+$lang['notify'] = 'Sende Änderungsbenachrichtigungen an diese eMail Adresse.';
+$lang['registernotify'] = 'Sende Information bei neu registrierten Benutzern an diese eMail Adresse.';
+$lang['gdlib'] = 'GD Lib Version';
+$lang['send404'] = 'Sende "HTTP 404/Seite nicht gefunden" für nicht existierende Seiten';
$lang['renderer__plugin'] = '%s (Erweiterung)';
-$lang['proxy____host'] = 'Proxy-Servername';
-$lang['proxy____port'] = 'Proxy- Port';
-$lang['proxy____user'] = 'Proxy-Nutzername';
-$lang['proxy____pass'] = 'Proxy-Passwort';
+$lang['target____wiki'] = 'Zielfenstername für interne 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['safemodehack'] = 'Aktiviere safemode Hack';
+$lang['ftp____host'] = 'FTP Server für safemode Hack';
+$lang['ftp____port'] = 'FTP Port für safemode Hack';
+$lang['ftp____user'] = 'FTP Benutzername für safemode Hack';
+$lang['ftp____pass'] = 'FTP Passwort für safemode Hack';
$lang['license_o_'] = 'Nichts ausgewählt';
$lang['typography_o_0'] = 'nichts';
$lang['userewrite_o_0'] = 'nichts';
+$lang['userewrite_o_1'] = '.htaccess';
+$lang['userewrite_o_2'] = 'DokuWiki intern';
$lang['deaccent_o_0'] = 'aus';
+$lang['deaccent_o_1'] = 'Entferne Akzente';
+$lang['gdlib_o_0'] = 'GD lib ist nicht verfügbar';
$lang['gdlib_o_1'] = 'Version 1.x';
$lang['gdlib_o_2'] = 'Autoerkennung';
$lang['rss_type_o_rss'] = 'RSS 0.91';
@@ -79,7 +92,11 @@ $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'] = 'Abstraktum';
+$lang['rss_content_o_abstract'] = 'Zusammenfassung';
+$lang['rss_content_o_diff'] = 'Unified Diff';
+$lang['rss_linkto_o_diff'] = 'Ansicht der Unterschiede';
+$lang['rss_linkto_o_rev'] = 'Liste der Revisionen';
+$lang['rss_linkto_o_current'] = 'Die aktuelle Seite';
$lang['compression_o_0'] = 'nichts';
$lang['compression_o_gz'] = 'gzip';
$lang['compression_o_bz2'] = 'bz2';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index 2cb44ab17..2075322d2 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -114,7 +114,7 @@ $lang['gdlib'] = 'GD Lib Version';
$lang['im_convert'] = 'Pfad zu ImageMagicks Konvertierwerkzeug';
$lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)';
$lang['subscribers'] = 'E-Mail-Abos zulassen';
-$lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte größer als recent_days sein.';
+$lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.';
$lang['compress'] = 'JavaScript und Stylesheets komprimieren';
$lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)';
$lang['send404'] = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten';
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index cad1a0aad..7198ca36d 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -129,7 +129,7 @@ $lang['gdlib'] = 'GD Lib version';
$lang['im_convert'] = 'Path to ImageMagick\'s convert tool';
$lang['jpg_quality'] = 'JPG compression quality (0-100)';
$lang['subscribers'] = 'Enable page subscription support';
-$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be larger than the time specified in recent_days.';
+$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.';
$lang['compress'] = 'Compact CSS and javascript output';
$lang['hidepages'] = 'Hide matching pages (regular expressions)';
$lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages';
diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php
index f490248e5..2b3dd6657 100644
--- a/lib/plugins/config/lang/eo/lang.php
+++ b/lib/plugins/config/lang/eo/lang.php
@@ -111,6 +111,7 @@ $lang['gdlib'] = 'Versio de GD Lib';
$lang['im_convert'] = 'Pado al la konvertilo de ImageMagick';
$lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)';
$lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj';
+$lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.';
$lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn';
$lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)';
$lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Ne Trovita Paĝo" por ne ekzistantaj paĝoj';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 739ec6bbe..9aed1f96c 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -17,6 +17,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['menu'] = 'Parámetros de configuración';
$lang['error'] = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario. <br /> Los valores incorrectos se mostrarán con un marco rojo alrededor.';
@@ -117,6 +118,7 @@ $lang['gdlib'] = 'Versión de GD Lib';
$lang['im_convert'] = 'Ruta a la herramienta de conversión de ImageMagick';
$lang['jpg_quality'] = 'Calidad de compresión de JPG (0-100)';
$lang['subscribers'] = 'Habilitar soporte para suscripción a páginas';
+$lang['subscribe_time'] = 'Tiempo después que alguna lista de suscripción fue enviada (seg); Debe ser menor que el tiempo especificado en días recientes.';
$lang['compress'] = 'Compactar la salida de CSS y javascript';
$lang['hidepages'] = 'Ocultar páginas con coincidencias (expresiones regulares)';
$lang['send404'] = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes';
diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt
index 79e4a42da..de8a965d8 100644
--- a/lib/plugins/config/lang/fr/intro.txt
+++ b/lib/plugins/config/lang/fr/intro.txt
@@ -1,8 +1,8 @@
====== Gestionnaire de configuration ======
-Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>config]]. Pour d'autres détails concernant ce plugin, reportez vous à [[doku>plugin:config]].
+Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>plugin:config]].
-Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce plugin. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs affectées à votre installation sont affichées sur un fond blanc. Les paramètres bleus et blancs peuvent être modifiés.
+Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce module. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs affectées à votre installation sont affichées sur un fond blanc. Les paramètres bleus et blancs peuvent être modifiés.
N'oubliez pas d'utiliser le bouton **Enregistrer** avant de quitter cette page, sinon vos modifications seront perdues.
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index f410291e7..09e625eb1 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -12,9 +12,11 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
$lang['menu'] = 'Paramètres de configuration';
-$lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez. <br />La valeur(s) erronée(s) est entourée d\'une bordure rouge.';
+$lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
$lang['updated'] = 'Paramètres mis à jour avec succès.';
$lang['nochoice'] = '(aucun autre choix possible)';
$lang['locked'] = 'Le fichier des paramètres ne peut être modifié, si ceci n\'est pas intentionnel, <br /> vérifiez que le nom et les droits du fichier sont corrects.';
@@ -22,9 +24,9 @@ $lang['danger'] = 'Danger : Modifier cette option pourrait rendre
$lang['warning'] = 'Attention : Modifier cette option pourrait engendrer un comportement indésirable.';
$lang['security'] = 'Avertissement de sécurité : Modifier cette option pourrait induire un risque de sécurité.';
$lang['_configuration_manager'] = 'Gestionnaire de configuration';
-$lang['_header_dokuwiki'] = 'Paramètres DokuWiki';
-$lang['_header_plugin'] = 'Paramètres plugin';
-$lang['_header_template'] = 'Paramètres template';
+$lang['_header_dokuwiki'] = 'Paramètres de DokuWiki';
+$lang['_header_plugin'] = 'Paramètres des modules externes';
+$lang['_header_template'] = 'Paramètres des modèles';
$lang['_header_undefined'] = 'Paramètres indéfinis';
$lang['_basic'] = 'Paramètres de base';
$lang['_display'] = 'Paramètres d\'affichage';
@@ -35,7 +37,7 @@ $lang['_links'] = 'Paramètres des liens';
$lang['_media'] = 'Paramètres média';
$lang['_advanced'] = 'Paramètres avancés';
$lang['_network'] = 'Paramètres réseaux';
-$lang['_plugin_sufix'] = 'Paramètres plugin';
+$lang['_plugin_sufix'] = 'Paramètres de module';
$lang['_template_sufix'] = 'Paramètres de modèle';
$lang['_msg_setting_undefined'] = 'Pas de métadonnée de paramètres.';
$lang['_msg_setting_no_class'] = 'Pas de classe de paramètres.';
@@ -43,50 +45,50 @@ $lang['_msg_setting_no_default'] = 'Pas de valeur par défaut.';
$lang['fmode'] = 'Mode de création des fichiers';
$lang['dmode'] = 'Mode de création des répertoires';
$lang['lang'] = 'Langue';
-$lang['basedir'] = 'Répertoire de base';
-$lang['baseurl'] = 'URL de base';
+$lang['basedir'] = 'Répertoire de base (ex. : <code>/dokuwiki/</code>). Laisser vide pour une détection automatique.';
+$lang['baseurl'] = 'URL de base. Laisser vide pour une détection automatique.';
$lang['savedir'] = 'Répertoire de stockage';
$lang['start'] = 'Nom de la page d\'accueil';
$lang['title'] = 'Titre du wiki';
$lang['template'] = 'Modèle';
-$lang['license'] = 'Sous quelle licence doit être placée votre contribution ?';
+$lang['license'] = 'Sous quelle licence doit être placé le contenu ?';
$lang['fullpath'] = 'Utiliser le chemin complet dans le pied de page';
$lang['recent'] = 'Nombre de derniers changements à afficher';
$lang['breadcrumbs'] = 'Nombre de traces à afficher';
$lang['youarehere'] = 'Traces hiérarchiques';
$lang['typography'] = 'Effectuer des améliorations typographiques';
-$lang['htmlok'] = 'Permettre html dans les pages';
-$lang['phpok'] = 'Permettre php dans les pages';
+$lang['htmlok'] = 'Permettre HTML dans les pages';
+$lang['phpok'] = 'Permettre PHP dans les pages';
$lang['dformat'] = 'Format de date (cf. fonction <a href="http://www.php.net/strftime">strftime</a> de PHP)';
$lang['signature'] = 'Signature';
-$lang['toptoclevel'] = 'Niveau supérieur pour figurer dans la table des matières';
+$lang['toptoclevel'] = 'Niveau le plus haut à afficher dans la table des matières';
$lang['tocminheads'] = 'Nombre minimum de titres pour qu\'une table des matières soit construite';
$lang['maxtoclevel'] = 'Niveau maximum pour figurer dans la table des matières';
-$lang['maxseclevel'] = 'Niveau maximum pour éditer des sections';
+$lang['maxseclevel'] = 'Niveau maximum pour modifier des sections';
$lang['camelcase'] = 'Utiliser CamelCase pour les liens';
$lang['deaccent'] = 'Retirer les accents dans les noms de pages';
$lang['useheading'] = 'Utiliser le titre de premier niveau';
-$lang['refcheck'] = 'Vérifier les références de media';
-$lang['refshow'] = 'Nombre de références de media à montrer';
-$lang['allowdebug'] = 'Debug (<b>Ne l\'activez que si vous en avez besoin !</b>)';
+$lang['refcheck'] = 'Vérifier les références de média';
+$lang['refshow'] = 'Nombre de références de média à montrer';
+$lang['allowdebug'] = 'Debug (<strong>Ne l\'activez que si vous en avez besoin !</strong>)';
$lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés';
-$lang['indexdelay'] = 'Délai avant l\'indexation (sec)';
+$lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)';
$lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs';
$lang['mailguard'] = 'Brouiller les adresses de courriel';
$lang['iexssprotect'] = 'Vérifier la présence de code JavaScript ou HTML malveillant dans les fichiers envoyés';
-$lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment édité la page';
+$lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment modifié la page';
$lang['useacl'] = 'Utiliser les listes de contrôle d\'accès (ACL)';
$lang['autopasswd'] = 'Auto-générer les mots de passe';
$lang['authtype'] = 'Mécanisme d\'authentification';
-$lang['passcrypt'] = 'Méthode de cryptage des mots de passe';
+$lang['passcrypt'] = 'Méthode de chiffrement des mots de passe';
$lang['defaultgroup'] = 'Groupe par défaut';
-$lang['superuser'] = 'Superuser - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant un accès complet à toutes les pages quelquesoit le paramétrage des ACL';
+$lang['superuser'] = 'Superuser - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant un accès complet à toutes les pages quelque soit le paramétrage des ACL';
$lang['manager'] = 'Manager - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant accès à certaines fonctions de gestion';
$lang['profileconfirm'] = 'Confirmer par mot de passe les modifications de profil';
$lang['disableactions'] = 'Actions à désactiver dans DokuWiki';
$lang['disableactions_check'] = 'Vérifier';
$lang['disableactions_subscription'] = 'Abonnement aux pages';
-$lang['disableactions_wikicode'] = 'Afficher source';
+$lang['disableactions_wikicode'] = 'Afficher le texte source';
$lang['disableactions_other'] = 'Autres actions (séparées par des virgules)';
$lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.';
$lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)';
@@ -94,64 +96,65 @@ $lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être
$lang['xmlrpc'] = 'Activer l\'interface XML-RPC.';
$lang['xmlrpcuser'] = 'Restreindre l\'accès à XML-RPC aux groupes et utilisateurs indiqués ici. Laisser vide afin que tout le monde y ait accès.';
$lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter splitbrain.org.';
-$lang['userewrite'] = 'URLs esthétiques';
-$lang['useslash'] = 'Utiliser slash comme séparateur de catégorie dans les URLs';
+$lang['userewrite'] = 'URL esthétiques';
+$lang['useslash'] = 'Utiliser « / » comme séparateur de catégorie dans les URL';
$lang['usedraft'] = 'Enregistrer automatiquement un brouillon pendant l\'édition';
-$lang['sepchar'] = 'Séparateur de nom de page';
-$lang['canonical'] = 'Utiliser des URLs canoniques';
+$lang['sepchar'] = 'Séparateur de mots dans les noms de page';
+$lang['canonical'] = 'Utiliser des URL canoniques';
$lang['autoplural'] = 'Rechercher les formes plurielles dans les liens';
$lang['compression'] = 'Méthode de compression pour les fichiers dans attic';
-$lang['cachetime'] = 'Âge maximum d\'un fichier en cache (sec)';
-$lang['locktime'] = 'Âge maximum des fichiers verrous (sec)';
+$lang['cachetime'] = 'Âge maximum d\'un fichier en cache (en secondes)';
+$lang['locktime'] = 'Âge maximum des fichiers verrous (en secondes)';
$lang['fetchsize'] = 'Taille maximale (en octets) du fichier que fetch.php peut télécharger';
$lang['notify'] = 'Notifier les modifications à cette adresse de courriel';
$lang['registernotify'] = 'Envoyer un courriel annonçant les nouveaux utilisateurs enregistrés à cette adresse';
$lang['mailfrom'] = 'Expéditeur des notifications par courriel du wiki';
-$lang['gzip_output'] = 'Utiliser Content-Encoding gzip pour xhtml';
+$lang['gzip_output'] = 'Utiliser Content-Encoding gzip pour XHTML';
$lang['gdlib'] = 'Version de GD Lib';
$lang['im_convert'] = 'Chemin vers l\'outil de conversion d\'ImageMagick';
-$lang['jpg_quality'] = 'Qualité de la compression JPG (0-100)';
+$lang['jpg_quality'] = 'Qualité de la compression JPEG (0-100)';
$lang['subscribers'] = 'Activer l\'abonnement aux pages';
-$lang['compress'] = 'Compresser CSS & JavaScript';
+$lang['subscribe_time'] = 'Délai après lequel les listes d\'abonnement et résumés sont envoyés (en secondes). Devrait être plus petit que le délai précisé dans recent_days.';
+$lang['compress'] = 'Compresser CSS et JavaScript';
$lang['hidepages'] = 'Cacher les pages correspondant à (expression régulière)';
$lang['send404'] = 'Renvoyer "HTTP 404/Page Non Trouvée" pour les pages introuvables';
-$lang['sitemap'] = 'Générer une carte G|oogle du site tous les (jours)';
+$lang['sitemap'] = 'Fréquence de génération une carte Google du site (en jours)';
$lang['broken_iua'] = 'La fonction ignore_user_abort est-elle opérationnelle sur votre système ? Ceci peut empêcher le fonctionnement de l\'index de recherche. IIS+PHP/
CGI dysfonctionne. Voir le <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">bug 852</a> pour plus d\'info.';
$lang['xsendfile'] = 'Utiliser l\'en-tête X-Sendfile pour permettre au serveur Web de délivrer des fichiers statiques ? Votre serveur Web doit supporter cette fonctionnalité.';
-$lang['renderer_xhtml'] = 'Moteur de rendu du format de sortie principal (xhtml)';
-$lang['renderer__core'] = '%s (dokuwiki core)';
-$lang['renderer__plugin'] = '%s (plugin)';
+$lang['renderer_xhtml'] = 'Moteur de rendu du format de sortie principal (XHTML)';
+$lang['renderer__core'] = '%s (cœur de dokuwiki)';
+$lang['renderer__plugin'] = '%s (module externe)';
$lang['rememberme'] = 'Permettre de conserver de manière permanente les cookies de connexion (mémoriser)';
$lang['rss_type'] = 'Type de flux RSS';
$lang['rss_linkto'] = 'Lien du flux RSS vers';
$lang['rss_content'] = 'Quel contenu afficher dans le flux RSS ?';
-$lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (sec)';
-$lang['recent_days'] = 'Signaler les pages modifiées depuis (jours)';
+$lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (en secondes)';
+$lang['recent_days'] = 'Signaler les pages modifiées depuis (en jours)';
$lang['rss_show_summary'] = 'Le flux XML affiche le résumé dans le titre';
$lang['target____wiki'] = 'Cible pour liens internes';
$lang['target____interwiki'] = 'Cible pour liens interwiki';
$lang['target____extern'] = 'Cible pour liens externes';
-$lang['target____media'] = 'Cible pour liens media';
-$lang['target____windows'] = 'Cible pour liens windows';
-$lang['proxy____host'] = 'Proxy - hôte';
-$lang['proxy____port'] = 'Proxy - port';
-$lang['proxy____user'] = 'Proxy - identifiant';
-$lang['proxy____pass'] = 'Proxy - mot de passe';
-$lang['proxy____ssl'] = 'Proxy - utilisation de ssl';
+$lang['target____media'] = 'Cible pour liens média';
+$lang['target____windows'] = 'Cible pour liens vers partages Windows';
+$lang['proxy____host'] = 'Proxy - Serveur hôte';
+$lang['proxy____port'] = 'Proxy - Numéro de port';
+$lang['proxy____user'] = 'Proxy - Identifiant';
+$lang['proxy____pass'] = 'Proxy - Mot de passe';
+$lang['proxy____ssl'] = 'Proxy - Utilisation de SSL';
$lang['safemodehack'] = 'Activer l\'option Mode sans échec';
-$lang['ftp____host'] = 'FTP - hôte pour Mode sans échec';
-$lang['ftp____port'] = 'FTP - port pour Mode sans échec';
-$lang['ftp____user'] = 'FTP - identifiant pour Mode sans échec';
-$lang['ftp____pass'] = 'FTP - mot de passe pour Mode sans échec';
-$lang['ftp____root'] = 'FTP - répertoire racine pour Mode sans échec';
+$lang['ftp____host'] = 'FTP - Serveur hôte pour Mode sans échec';
+$lang['ftp____port'] = 'FTP - Numéro de port pour Mode sans échec';
+$lang['ftp____user'] = 'FTP - Identifiant pour Mode sans échec';
+$lang['ftp____pass'] = 'FTP - Mot de passe pour Mode sans échec';
+$lang['ftp____root'] = 'FTP - Répertoire racine pour Mode sans échec';
$lang['license_o_'] = 'Aucune choisie';
$lang['typography_o_0'] = 'aucun';
$lang['typography_o_1'] = 'guillemets uniquement';
$lang['typography_o_2'] = 'tout signe typographique (peut ne pas fonctionner)';
$lang['userewrite_o_0'] = 'aucun';
-$lang['userewrite_o_1'] = '.htaccess';
-$lang['userewrite_o_2'] = 'DokuWiki';
+$lang['userewrite_o_1'] = 'Fichier .htaccess';
+$lang['userewrite_o_2'] = 'Interne à DokuWiki';
$lang['deaccent_o_0'] = 'off';
$lang['deaccent_o_1'] = 'supprimer les accents';
$lang['deaccent_o_2'] = 'convertir en roman';
@@ -164,8 +167,8 @@ $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'] = 'Résumé';
-$lang['rss_content_o_diff'] = 'Diff Unifié';
-$lang['rss_content_o_htmldiff'] = 'Diff formaté en table HTML';
+$lang['rss_content_o_diff'] = 'Diff. unifié';
+$lang['rss_content_o_htmldiff'] = 'Diff. formaté en table HTML';
$lang['rss_content_o_html'] = 'page complète au format HTML';
$lang['rss_linkto_o_diff'] = 'liste des différences';
$lang['rss_linkto_o_page'] = 'page révisée';
@@ -178,9 +181,9 @@ $lang['xsendfile_o_0'] = 'ne pas utiliser';
$lang['xsendfile_o_1'] = 'Entête propriétaire lighttpd (avant la version 1.5)';
$lang['xsendfile_o_2'] = 'Entête standard X-Sendfile';
$lang['xsendfile_o_3'] = 'En-tête propriétaire Nginx X-Accel-Redirect';
-$lang['showuseras_o_loginname'] = 'Nom d\'utilisateur';
+$lang['showuseras_o_loginname'] = 'Identifiant de l\'utilisateur';
$lang['showuseras_o_username'] = 'Nom de l\'utilisateur';
-$lang['showuseras_o_email'] = 'Le courriel de l\'utilisateur (obfusqué suivant les paramètres de brouillage sélectionnés)';
+$lang['showuseras_o_email'] = 'Courriel de l\'utilisateur (brouillé suivant les paramètres de brouillage sélectionnés)';
$lang['showuseras_o_email_link'] = 'Courriel de l\'utilisateur en tant que lien mailto:';
$lang['useheading_o_0'] = 'Jamais';
$lang['useheading_o_navigation'] = 'Navigation seulement';
diff --git a/lib/plugins/config/lang/gl/intro.txt b/lib/plugins/config/lang/gl/intro.txt
index 27feedfed..cafe28e13 100644
--- a/lib/plugins/config/lang/gl/intro.txt
+++ b/lib/plugins/config/lang/gl/intro.txt
@@ -1,7 +1,7 @@
-====== Xestor de configuración ======
+====== Xestor de Configuración ======
-Use esta páxina para controlar a configuración da súa instalación do Dokuwiki. Para encontrar axuda sobre cada unha das opcións da configuración vaia a [[doku>config]]. Para obter máis información sobre este plugin vexa o documento [[doku>plugin:config]].
+Usa esta páxina para controlares a configuración da túa instalación do Dokuwiki. Para atopares axuda verbo de cada opción da configuración vai a [[doku>config]]. Para obteres pormenores desta extensión bota un ollo a [[doku>plugin:config]].
-As opcións que se mostran cun fondo de cor vermello claro, están protexidas e non poden ser alteradas con este plugin. As opcións que se mostran cun fondo de cor azul, son valores predeterminados. As opcións que teñen un fondo branco foron configuradas de modo local para esta instalación en concreto. Ambas as dúas, as opcións azuis e brancas, poden ser alteradas.
+As opcións que amosan un fondo de cor vermella clara están protexidas e non poden ser alteradas con esta extensión. As opcións que amosan un fondo de cor azul son valores predeterminados e as opcións que teñen fondo branco foron configuradas de xeito local para esta instalación en concreto. Ámbalas dúas, as opcións azuis e brancas, poden ser alteradas.
-Lembre premer no botón **GARDAR** antes de saír desta páxina ou, en caso contrario, as súas modificacións perderanse.
+Lembra premer no boton **GARDAR** denantes de saíres desta páxina ou, en caso contrario, os teus trocos perderanse.
diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php
index eb7559e2f..2129beec0 100644
--- a/lib/plugins/config/lang/gl/lang.php
+++ b/lib/plugins/config/lang/gl/lang.php
@@ -2,40 +2,38 @@
/**
* Galicianlanguage file
*
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
-$lang['menu'] = 'Opcións de configuración';
-$lang['error'] = 'A configuración non foi actualizada debido a un valor non válido; verifique as modificacións feitas e envíeas de novo.
-<br />Os valores incorrectos móstranse cun bordo de cor vermella.';
-$lang['updated'] = 'A configuración foi actualizada correctamente.';
-$lang['nochoice'] = '(non hai outras opcións dispoñíbeis)';
-$lang['locked'] = 'Non se puido actualizar o ficheiro de configuración; se isto non debería ser así, <br />
-asegúrese de que o nome do ficheiro de configuración local e os permisos son correctos.';
-$lang['danger'] = 'Perigo: Se modifica esta opción podería facer que tanto o seu Wiki como o menú de configuración fiquen inaccesíbeis.';
-$lang['warning'] = 'Aviso: Se modifica esta opción podería causar un comportamento inesperado.';
-$lang['security'] = 'Aviso de seguranza: Cambiar esta opción podería supoñer un perigo de seguranza.';
-$lang['_configuration_manager'] = 'Xestor de configuración';
+$lang['menu'] = 'Opcións de Configuración';
+$lang['error'] = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo.
+<br />O(s) valor(es) incorrecto(s) amosanse cinguidos por un borde vermello.';
+$lang['updated'] = 'Configuración actualizada correctamente.';
+$lang['nochoice'] = '(non hai outras escollas dispoñibles)';
+$lang['locked'] = 'Non se puido actualizar o arquivo de configuración, se non ocorre como debería ser, <br />
+asegúrate de que o nome do arquivo de configuración local e os permisos son correctos.';
+$lang['danger'] = 'Perigo: mudando esta opción podes facer inaccesíbeis o teu wiki e máis o menú de configuración.';
+$lang['warning'] = 'Ollo: mudando esta opción poden aparecer comportamentos do aplicativo non agardados.';
+$lang['security'] = 'Aviso de seguranza: mudando esta opción poden aparecer riscos de seguranza.';
+$lang['_configuration_manager'] = 'Xestor de Configuración';
$lang['_header_dokuwiki'] = 'Configuración do DokuWiki';
-$lang['_header_plugin'] = 'Configuración de plugins';
-$lang['_header_template'] = 'Configuración do modelo';
-$lang['_header_undefined'] = 'Configuración indefinida';
-$lang['_basic'] = 'Configuración básica';
-$lang['_display'] = 'Configuración da visualización';
-$lang['_authentication'] = 'Configuración da autenticación';
-$lang['_anti_spam'] = 'Configuración do Anti-Spam';
-$lang['_editing'] = 'Configuración da edición';
-$lang['_links'] = 'Configuración das ligazóns';
-$lang['_media'] = 'Configuración dos ficheiros multimedia';
-$lang['_advanced'] = 'Configuración avanzada';
-$lang['_network'] = 'Configuración de rede';
-$lang['_plugin_sufix'] = 'Configuración de plugins';
-$lang['_template_sufix'] = 'Configuración do modelo';
-$lang['_msg_setting_undefined'] = 'Non hai configuracións de metadatos.';
-$lang['_msg_setting_no_class'] = 'Non hai configuracións de clase.';
-$lang['_msg_setting_no_default'] = 'Non hai un valor predeterminado.';
-$lang['fmode'] = 'Modo de creación de ficheiros';
+$lang['_header_plugin'] = 'Configuración de Extensións';
+$lang['_header_template'] = 'Configuración de Sobreplanta';
+$lang['_header_undefined'] = 'Configuración Indefinida';
+$lang['_basic'] = 'Configuración Básica';
+$lang['_display'] = 'Configuración de Visualización';
+$lang['_authentication'] = 'Configuración de Autenticación';
+$lang['_anti_spam'] = 'Configuración de Anti-Correo-lixo';
+$lang['_editing'] = 'Configuración de Edición';
+$lang['_links'] = 'Configuración de Ligazóns';
+$lang['_media'] = 'Configuración de Media';
+$lang['_advanced'] = 'Configuración Avanzada';
+$lang['_network'] = 'Configuración de Rede';
+$lang['_plugin_sufix'] = 'Configuración de Extensións';
+$lang['_template_sufix'] = 'Configuración de Sobreplanta';
+$lang['_msg_setting_undefined'] = 'Non hai configuración de metadatos.';
+$lang['_msg_setting_no_class'] = 'Non hai configuración de clase.';
+$lang['_msg_setting_no_default'] = 'Non hai valor predeterminado.';
+$lang['fmode'] = 'Modo de creación de arquivos';
$lang['dmode'] = 'Modo de creación de directorios';
$lang['lang'] = 'Idioma';
$lang['basedir'] = 'Directorio base';
@@ -43,103 +41,103 @@ $lang['baseurl'] = 'URL base';
$lang['savedir'] = 'Directorio no que se gardarán os datos';
$lang['start'] = 'Nome da páxina inicial';
$lang['title'] = 'Título do Wiki';
-$lang['template'] = 'Modelo';
-$lang['license'] = 'Baixo que licenza será liberado os seus contidos?';
-$lang['fullpath'] = 'Mostrar o camiño completo das páxinas no pé das mesmas';
-$lang['recent'] = 'Cambios recentes';
+$lang['template'] = 'Sobreplanta';
+$lang['license'] = 'Baixo de que licenza será ceibado o teu contido?';
+$lang['fullpath'] = 'Amosar a ruta completa das páxinas no pé das mesmas';
+$lang['recent'] = 'Trocos recentes';
$lang['breadcrumbs'] = 'Número de niveis da estrutura de navegación';
$lang['youarehere'] = 'Niveis xerárquicos da estrutura de navegación';
$lang['typography'] = 'Facer substitucións tipográficas';
$lang['htmlok'] = 'Permitir a inserción de HTML';
$lang['phpok'] = 'Permitir a inserción de PHP';
-$lang['dformat'] = 'Formato de data (vexa a función <a href="http://www.php.net/strftime">strftime</a> do PHP)';
+$lang['dformat'] = 'Formato de Data (bótalle un ollo á función <a href="http://www.php.net/strftime">strftime</a> do PHP)';
$lang['signature'] = 'Sinatura';
$lang['toptoclevel'] = 'Nivel superior para a táboa de contidos';
-$lang['tocminheads'] = 'Cantidade mínima de liñas de cabeceira que determinará se se xerará a TDC';
+$lang['tocminheads'] = 'Cantidade mínima de liñas de cabeceira que determinará se a TDC vai ser xerada';
$lang['maxtoclevel'] = 'Nivel máximo para a táboa de contidos';
$lang['maxseclevel'] = 'Nivel máximo de edición da sección';
$lang['camelcase'] = 'Utilizar CamelCase para as ligazóns';
-$lang['deaccent'] = 'Limpar os nomes de páxina';
+$lang['deaccent'] = 'Limpar nomes de páxina';
$lang['useheading'] = 'Utilizar a primeira cabeceira para os nomes de páxina';
-$lang['refcheck'] = 'Comprobar a referencia de multimedia';
-$lang['refshow'] = 'Número de referencias multimedia para mostrar';
-$lang['allowdebug'] = 'Permitir a depuración <b>desactíveo se non o precisa!</b>';
-$lang['usewordblock'] = 'Bloquear o spam segundo unha listaxe de palabras';
-$lang['indexdelay'] = 'Atraso antes de indexar (en seg.)';
+$lang['refcheck'] = 'Comprobar a referencia media';
+$lang['refshow'] = 'Número de referencias media a amosar';
+$lang['allowdebug'] = 'Permitir o depurado <b>desactívao se non o precisas!</b>';
+$lang['usewordblock'] = 'Bloquear correo-lixo segundo unha lista de verbas';
+$lang['indexdelay'] = 'Retardo denantes de indexar (seg)';
$lang['relnofollow'] = 'Utilizar rel="nofollow" nas ligazóns externas';
-$lang['mailguard'] = 'Escurecer os enderezos de correo';
-$lang['iexssprotect'] = 'Comprobar os ficheiros que se suban na procura dun posíbel código JavaScript ou HTML maliciosos';
-$lang['showuseras'] = 'Que se mostrará ao informar da persoa usuaria que fixo a última modificación dunha páxina?';
-$lang['useacl'] = 'Utilizar a lista de control de acceso (ACL)';
-$lang['autopasswd'] = 'Xerar os contrasinais automaticamente';
+$lang['mailguard'] = 'Ofuscar enderezos de correo-e';
+$lang['iexssprotect'] = 'Comprobar arquivos subidos na procura de posíbel código JavaScript ou HTML malicioso';
+$lang['showuseras'] = 'Que amosar cando se informe do usuario que fixo a última modificación dunha páxina';
+$lang['useacl'] = 'Utilizar lista de control de acceso';
+$lang['autopasswd'] = 'Xerar contrasinais automaticamente';
$lang['authtype'] = 'Backend de autenticación';
-$lang['passcrypt'] = 'Método de codificación do contrasinal';
-$lang['defaultgroup'] = 'Grupo predeterminado';
-$lang['superuser'] = 'Superusuaria/o - un grupo ou usuaria/o con acceso completo a todas as páxinas e funcións, independentemente da configuración da ACL';
-$lang['manager'] = 'Xestor - un grupo ou usuaria/o con acceso a certas funcións de xestión';
-$lang['profileconfirm'] = 'Confirmar as modificacións de perfil mediante un contrasinal';
+$lang['passcrypt'] = 'Método de encriptado do contrasinal';
+$lang['defaultgroup'] = 'Grupo por defecto';
+$lang['superuser'] = 'Super-usuario - un grupo ou usuario con acceso completo a todas as páxinas e funcións independentemente da configuración da ACL';
+$lang['manager'] = 'Xestor - un grupo ou usuario con acceso a certas funcións de xestión';
+$lang['profileconfirm'] = 'Confirmar trocos de perfil mediante contrasinal';
$lang['disableactions'] = 'Desactivar accións do DokuWiki';
$lang['disableactions_check'] = 'Comprobar';
$lang['disableactions_subscription'] = 'Subscribir/Desubscribir';
-$lang['disableactions_wikicode'] = 'Ver o código/Exportar datos raw';
-$lang['disableactions_other'] = 'Outras accións (separadas por vírgulas)';
-$lang['sneaky_index'] = 'O DokuWiki mostrará por defecto todos os nomes de espazo na vista de índice. Se activa isto serán ocultados aqueles onde o usuario non teña permisos de lectura.';
-$lang['auth_security_timeout'] = 'Tempo límite de seguranza de autenticación (en segundos)';
-$lang['securecookie'] = 'Débense enviar só mediante HTTPS as cookies configuradas para HTTPS enviadas polo navegador? Desactive esta opción só cando o inicio de sesión do seu wiki estea asegurado con SSL, mais a navegación no mesmo se faga de modo inseguro.';
-$lang['xmlrpc'] = 'Activar/Desactivar a interface XML-RPC';
-$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Deixe baleiro para darlle acceso a todo o mundo.';
-$lang['updatecheck'] = 'Débese comprobar se hai actualizacións e avisos de seguranza? O DokuWiki precisa contactar con splitbrain.org para executar esta funcionalidade.';
-$lang['userewrite'] = 'Utilizar URL amigábeis';
-$lang['useslash'] = 'Utilizar a barra oblícua (/) como separador de nome de espazo nos URL';
-$lang['usedraft'] = 'Gardar un borrador automaticamente ao editar';
-$lang['sepchar'] = 'Palabra de separación do nome de páxina';
-$lang['canonical'] = 'Utilizar URL completamente canónicos';
-$lang['autoplural'] = 'Comprobar as formas plurais nas ligazóns';
-$lang['compression'] = 'Método de compresión para os ficheiros attic';
-$lang['cachetime'] = 'Tempo máximo para a caché (en seg.)';
-$lang['locktime'] = 'Tempo máximo para o bloqueo de ficheiros (en seg.)';
-$lang['fetchsize'] = 'Tamaño máximo (en bytes) que o fetch.php pode descargar de fontes externas';
-$lang['notify'] = 'Enviar as notificacións de cambios a este enderezo de correo';
-$lang['registernotify'] = 'Enviar a información de novas persoas usuarias rexistradas a este enderezo de correo';
-$lang['mailfrom'] = 'Enderezo de correo-e para usar nas mensaxes automáticas';
-$lang['gzip_output'] = 'Utilizar o Contido-Codificación do Gzip para o XHTML';
-$lang['gdlib'] = 'Versión da biblioteca GD';
-$lang['im_convert'] = 'Camiño para a ferramenta de conversión ImageMagick';
+$lang['disableactions_wikicode'] = 'Ver fonte/Exportar Datos Raw';
+$lang['disableactions_other'] = 'Outras accións (separadas por comas)';
+$lang['sneaky_index'] = 'O DokuWiki amosará por defecto todos os nomes de espazo na vista de índice. Se activas isto agocharanse aqueles onde o usuario non teña permisos de lectura.';
+$lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)';
+$lang['securecookie'] = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a navegación do mesmo se faga de xeito inseguro.';
+$lang['xmlrpc'] = 'Activar/Desactivar interface XML-RPC';
+$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Déixao baleiro para darlle acceso a todas as persoas.';
+$lang['updatecheck'] = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con splitbrain.org para executar esta característica.';
+$lang['userewrite'] = 'Utilizar URLs amigábeis';
+$lang['useslash'] = 'Utilizar a barra inclinada (/) como separador de nome de espazo nos URLs';
+$lang['usedraft'] = 'Gardar un borrador automaticamente no tempo da edición';
+$lang['sepchar'] = 'Verba separadora do nome de páxina';
+$lang['canonical'] = 'Utilizar URLs completamente canónicos';
+$lang['autoplural'] = 'Comprobar formas plurais nas ligazóns';
+$lang['compression'] = 'Método de compresión para arquivos attic';
+$lang['cachetime'] = 'Tempo máximo para a caché (seg.)';
+$lang['locktime'] = 'Tempo máximo para o bloqueo de arquivos (seg.)';
+$lang['fetchsize'] = 'Tamaño máximo (en bytes) que pode descargar fetch.php dende fontes externas';
+$lang['notify'] = 'Enviar notificacións de trocos a este enderezo de correo-e';
+$lang['registernotify'] = 'Enviar información de novos usuarios rexistrados a este enderezo de correo-e';
+$lang['mailfrom'] = 'Enderezo de correo-e a usar para as mensaxes automáticas';
+$lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xhtml';
+$lang['gdlib'] = 'Versión da Libraría GD';
+$lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick';
$lang['jpg_quality'] = 'Calidade de compresión dos JPG (0-100)';
-$lang['subscribers'] = 'Activar a posibilidade de subscrición á páxina';
+$lang['subscribers'] = 'Activar posibilidade de subscrición á páxina';
$lang['compress'] = 'Saída compacta de CSS e Javascript';
-$lang['hidepages'] = 'Ocultar as páxinas que coincidan (expresións regulares)';
-$lang['send404'] = 'Enviar "HTTP 404/Páxina non encontrada" para as páxinas inexistentes';
-$lang['sitemap'] = 'Xerar o mapa do sitio do Google (en días)';
-$lang['broken_iua'] = 'Está danada a función ignore_user_abort no seu sistema? Isto podería causar que o índice de procura non funcione. Sábese que o IIS+PHP/CGI a dana. Vexa <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> para obter máis información.';
-$lang['xsendfile'] = 'Débese empregar a cabeceira X-Sendfile para que o servidor web envíe ficheiros estáticos? O seu servidor web debe soportar isto.';
-$lang['renderer_xhtml'] = 'Intérprete para empregar na saída principal (XHTML) do Wiki';
+$lang['hidepages'] = 'Agochar páxinas que coincidan (expresións regulares)';
+$lang['send404'] = 'Enviar "HTTP 404/Páxina non atopada" para as páxinas inexistentes';
+$lang['sitemap'] = 'Xerar mapa do sitio co Google (días)';
+$lang['broken_iua'] = 'Rachou a función ignore_user_abort no teu sistema? Isto podería causar que o índice de procura non funcione. Coñécese que o IIS+PHP/CGI ráchaa. Bótalle un ollo ao <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> para obter máis información.';
+$lang['xsendfile'] = 'Empregar a cabeceira X-Sendfile para que o servidor web envie arquivos estáticos? O teu servidor web precisa soportar isto.';
+$lang['renderer_xhtml'] = 'Intérprete a empregar para a saída principal (XHTML) do Wiki';
$lang['renderer__core'] = '%s (núcleo do Dokuwiki)';
-$lang['renderer__plugin'] = '%s (plugin)';
-$lang['rememberme'] = 'Permitir as cookies permanentes de inicio de sesión (lembrar)';
-$lang['rss_type'] = 'Tipo de fío RSS XML';
-$lang['rss_linkto'] = 'O fío XML vincúlase a';
-$lang['rss_content'] = 'Que quere mostrar nos elementos do fío XML?';
-$lang['rss_update'] = 'Intervalo de actualización do fío XML (en seg.)';
-$lang['recent_days'] = 'Número de modificacións recentes para manter (en días)';
-$lang['rss_show_summary'] = 'Mostrar o sumario no título do fío XML';
-$lang['target____wiki'] = 'Xanela de destino para as ligazóns internas';
-$lang['target____interwiki'] = 'Xanela de destino para as ligazóns interwiki';
-$lang['target____extern'] = 'Xanela de destino para as ligazóns externas';
-$lang['target____media'] = 'Xanela de destino para as ligazóns multimedia';
-$lang['target____windows'] = 'Xanela de destino para as ligazóns de xanelas';
-$lang['proxy____host'] = 'Nome do servidor proxy';
-$lang['proxy____port'] = 'Porto do proxy';
-$lang['proxy____user'] = 'Nome de usuaria/o do proxy';
-$lang['proxy____pass'] = 'Contrasinal do proxy';
-$lang['proxy____ssl'] = 'Utilizar SSL para conectar co proxy';
-$lang['safemodehack'] = 'Activar o hack de modo seguro (safemode)';
+$lang['renderer__plugin'] = '%s (extensión)';
+$lang['rememberme'] = 'Permitir cookies permanentes de inicio de sesión (lembrarme)';
+$lang['rss_type'] = 'Tipo de corrente RSS XML';
+$lang['rss_linkto'] = 'A corrente XML liga para';
+$lang['rss_content'] = 'Que queres amosar nos elementos da corrente XML?';
+$lang['rss_update'] = 'Intervalo de actualización da corrente XML (seg.)';
+$lang['recent_days'] = 'Número de trocos recentes a manter (días)';
+$lang['rss_show_summary'] = 'Amosar sumario no título da corrente XML';
+$lang['target____wiki'] = 'Fiestra de destino para as ligazóns internas';
+$lang['target____interwiki'] = 'Fiestra de destino para as ligazóns interwiki';
+$lang['target____extern'] = 'Fiestra de destino para as ligazóns externas';
+$lang['target____media'] = 'Fiestra de destino para as ligazóns de media';
+$lang['target____windows'] = 'Fiestra de destino para as ligazóns de fiestras';
+$lang['proxy____host'] = 'Nome do servidor Proxy';
+$lang['proxy____port'] = 'Porto do Proxy';
+$lang['proxy____user'] = 'Nome de usuario do Proxy';
+$lang['proxy____pass'] = 'Contrasinal do Proxy';
+$lang['proxy____ssl'] = 'Utilizar ssl para conectar ao Proxy';
+$lang['safemodehack'] = 'Activar hack de modo seguro (safemode)';
$lang['ftp____host'] = 'Servidor FTP para o hack de modo seguro (safemode)';
$lang['ftp____port'] = 'Porto FTP para o hack de modo seguro(safemode)';
-$lang['ftp____user'] = 'Nome de usuaria/o FTP para o hack de modo seguro(safemode)';
+$lang['ftp____user'] = 'Nome de usuario FTP para o hack de modo seguro(safemode)';
$lang['ftp____pass'] = 'Contrasinal FTP para o hack de modo seguro(safemode)';
-$lang['ftp____root'] = 'Directorio raíz do FTP para o hack de modo seguro(safemode)';
-$lang['license_o_'] = 'Non se seleccionou nada';
+$lang['ftp____root'] = 'Directorio raigaña do FTP para o hack de modo seguro(safemode)';
+$lang['license_o_'] = 'Non se escolleu nada';
$lang['typography_o_0'] = 'ningunha';
$lang['typography_o_1'] = 'Só dobres aspas';
$lang['typography_o_2'] = 'Todas as aspas (pode que non funcione sempre)';
@@ -147,9 +145,9 @@ $lang['userewrite_o_0'] = 'ningún';
$lang['userewrite_o_1'] = '.htaccess';
$lang['userewrite_o_2'] = 'Interno do DokuWiki';
$lang['deaccent_o_0'] = 'desconectado';
-$lang['deaccent_o_1'] = 'Eliminar os acentos';
+$lang['deaccent_o_1'] = 'Eliminar acentos';
$lang['deaccent_o_2'] = 'romanizar';
-$lang['gdlib_o_0'] = 'A biblioteca GD non está dispoñíbel';
+$lang['gdlib_o_0'] = 'Libraría GD non dispoñíbel';
$lang['gdlib_o_1'] = 'Versión 1.x';
$lang['gdlib_o_2'] = 'Detección automática';
$lang['rss_type_o_rss'] = 'RSS 0.91';
@@ -157,26 +155,26 @@ $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'] = 'Resumo';
+$lang['rss_content_o_abstract'] = 'Sumario';
$lang['rss_content_o_diff'] = 'Formato Unified Diff';
$lang['rss_content_o_htmldiff'] = 'Táboa diff formatada en HTML';
$lang['rss_content_o_html'] = 'Contido HTML completo da páxina';
-$lang['rss_linkto_o_diff'] = 'visualización de diferenzas';
+$lang['rss_linkto_o_diff'] = 'vista de diferenzas';
$lang['rss_linkto_o_page'] = 'a páxina revisada';
$lang['rss_linkto_o_rev'] = 'listaxe de revisións';
$lang['rss_linkto_o_current'] = 'a páxina actual';
$lang['compression_o_0'] = 'ningunha';
$lang['compression_o_gz'] = 'gzip';
$lang['compression_o_bz2'] = 'bz2';
-$lang['xsendfile_o_0'] = 'non usar';
-$lang['xsendfile_o_1'] = 'Cabeceira lighttpd propietaria (anterior á versión 1.5)';
+$lang['xsendfile_o_0'] = 'non o empregues';
+$lang['xsendfile_o_1'] = 'Cabeceira lighttpd propietaria (denantes da versión 1.5)';
$lang['xsendfile_o_2'] = 'Cabeceira X-Sendfile estándar';
$lang['xsendfile_o_3'] = 'Cabeceira X-Accel-Redirect propia de Nginx';
$lang['showuseras_o_loginname'] = 'Nome de inicio de sesión';
-$lang['showuseras_o_username'] = 'Nome completo da persoa usuaria';
-$lang['showuseras_o_email'] = 'Enderezo de correo da persoa usuaria (escurecido conforme a configuración mailguard)';
-$lang['showuseras_o_email_link'] = 'Enderezo de correo da persoa usuaria como unha ligazón mailto:';
-$lang['useheading_o_0'] = 'Nunca';
-$lang['useheading_o_navigation'] = 'Só a navegación';
-$lang['useheading_o_content'] = 'Só o contido do Wiki';
+$lang['showuseras_o_username'] = 'Nome completo do usuario';
+$lang['showuseras_o_email'] = 'Enderezo de correo-e do usuario (ofuscado segundo a configuración mailguard)';
+$lang['showuseras_o_email_link'] = 'Enderezo de correo-e do usuario como ligazón mailto:';
+$lang['useheading_o_0'] = 'Endexamais';
+$lang['useheading_o_navigation'] = 'Só Navegación';
+$lang['useheading_o_content'] = 'Só Contido do Wiki';
$lang['useheading_o_1'] = 'Sempre';
diff --git a/lib/plugins/config/lang/ia/intro.txt b/lib/plugins/config/lang/ia/intro.txt
new file mode 100644
index 000000000..37b970c4f
--- /dev/null
+++ b/lib/plugins/config/lang/ia/intro.txt
@@ -0,0 +1,7 @@
+====== Gestion de configurationes ======
+
+Usa iste pagina pro controlar le configurationes de tu installation de DokuWiki. Pro adjuta re configurationes individual, refere te a [[doku>config]].
+
+Le configurationes monstrate super un fundo rubie clar es protegite e non pote esser alterate con iste plug-in. Le configurationes monstrate super un fundo blau es le valores predefinite e le configurationes monstrate super un fundo blanc ha essite definite localmente pro iste particular installation. Le configurationes blau e blanc pote esser alterate.
+
+Rememora de premer le button **SALVEGUARDAR** ante de quitar iste pagina, alteremente tu modificationes essera perdite. \ No newline at end of file
diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php
new file mode 100644
index 000000000..624b79485
--- /dev/null
+++ b/lib/plugins/config/lang/ia/lang.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['menu'] = 'Configurationes';
+$lang['error'] = 'Le configurationes non poteva esser actualisate a causa de un valor invalide; per favor revide tu cambiamentos e resubmitte los.<br />Le valor(es) incorrecte essera monstrate circumferite per un bordo rubie.';
+$lang['updated'] = 'Actualisation del configurationes succedite.';
+$lang['nochoice'] = '(nulle altere option disponibile)';
+$lang['locked'] = 'Le file de configuration non pote esser actualisate; si isto non es intentional, <br /> assecura te que le nomine e permissiones del file local de configuration es correcte.';
+$lang['danger'] = 'Periculo: Cambiar iste option pote render tu wiki e le menu de configuration inaccessibile!';
+$lang['warning'] = 'Attention: Cambiar iste option pote causar functionamento indesirate.';
+$lang['security'] = 'Advertimento de securitate: Cambiar iste option pote causar un risco de securitate.';
+$lang['_configuration_manager'] = 'Gestion de configurationes';
+$lang['_header_dokuwiki'] = 'Configurationes de DokuWiki';
+$lang['_header_plugin'] = 'Configurationes de plug-ins';
+$lang['_header_template'] = 'Configurationes de patronos';
+$lang['_header_undefined'] = 'Configurationes non definite';
+$lang['_basic'] = 'Configurationes de base';
+$lang['_display'] = 'Configurationes de visualisation';
+$lang['_authentication'] = 'Configurationes de authentication';
+$lang['_anti_spam'] = 'Configurationes anti-spam';
+$lang['_editing'] = 'Configurationes de modification';
+$lang['_links'] = 'Configurationes de ligamines';
+$lang['_media'] = 'Configurationes de multimedia';
+$lang['_advanced'] = 'Configurationes avantiate';
+$lang['_network'] = 'Configurationes de rete';
+$lang['_plugin_sufix'] = 'Configurationes de plug-ins';
+$lang['_template_sufix'] = 'Configurationes de patronos';
+$lang['_msg_setting_undefined'] = 'Nulle metadatos de configuration.';
+$lang['_msg_setting_no_class'] = 'Nulle classe de configuration.';
+$lang['_msg_setting_no_default'] = 'Nulle valor predefinite.';
+$lang['fmode'] = 'Permissiones al creation de files';
+$lang['dmode'] = 'Permissiones al creation de directorios';
+$lang['lang'] = 'Lingua del interfacie';
+$lang['basedir'] = 'Cammino al servitor (p.ex.. <code>/dokuwiki/</code>). Lassa vacue pro autodetection.';
+$lang['baseurl'] = 'URL del servitor (p.ex. <code>http://www.yourserver.com</code>). Lassa vacue pro autodetection.';
+$lang['savedir'] = 'Directorio pro salveguardar datos';
+$lang['start'] = 'Nomine del pagina initial';
+$lang['title'] = 'Titulo del wiki';
+$lang['template'] = 'Patrono';
+$lang['license'] = 'Sub qual licentia debe tu contento esser publicate?';
+$lang['fullpath'] = 'Revelar le cammino complete del paginas in le pede';
+$lang['recent'] = 'Modificationes recente';
+$lang['breadcrumbs'] = 'Numero de micas de pan';
+$lang['youarehere'] = 'Micas de pan hierarchic';
+$lang['typography'] = 'Face substitutiones typographic';
+$lang['htmlok'] = 'Permitter incorporation de HTML';
+$lang['phpok'] = 'Permitter incorporation de PHP';
+$lang['dformat'] = 'Formato del datas (vide le function <a href="http://www.php.net/strftime">strftime</a> de PHP)';
+$lang['signature'] = 'Signatura';
+$lang['toptoclevel'] = 'Nivello principal pro tabula de contento';
+$lang['tocminheads'] = 'Numero minimal de titulos requirite pro inserer tabula de contento';
+$lang['maxtoclevel'] = 'Nivello maximal pro tabula de contento';
+$lang['maxseclevel'] = 'Nivello maximal pro modification de sectiones';
+$lang['camelcase'] = 'Usar CamelCase pro ligamines';
+$lang['deaccent'] = 'Nomines nette de paginas';
+$lang['useheading'] = 'Usar le prime titulo como nomine de pagina';
+$lang['refcheck'] = 'Verification de referentias multimedia';
+$lang['refshow'] = 'Numero de referentias multimedia a monstrar';
+$lang['allowdebug'] = 'Permitter debugging <b>disactiva si non necessari!</b>';
+$lang['usewordblock'] = 'Blocar spam a base de lista de parolas';
+$lang['indexdelay'] = 'Retardo ante generation de indice (secundas)';
+$lang['relnofollow'] = 'Usar rel="nofollow" pro ligamines externe';
+$lang['mailguard'] = 'Offuscar adresses de e-mail';
+$lang['iexssprotect'] = 'Verificar files incargate pro codice HTML o JavaScript possibilemente malitiose';
+$lang['showuseras'] = 'Como monstrar le usator que faceva le ultime modification de un pagina';
+$lang['useacl'] = 'Usar listas de controlo de accesso';
+$lang['autopasswd'] = 'Automaticamente generar contrasignos';
+$lang['authtype'] = 'Servicio de authentication';
+$lang['passcrypt'] = 'Methodo de cryptographia de contrasignos';
+$lang['defaultgroup'] = 'Gruppo predefinite';
+$lang['superuser'] = 'Superusator: le gruppo, usator o lista separate per commas ("usator1,@gruppo1,usator2") con accesso integral a tote le paginas e functiones sin reguardo del ACL';
+$lang['manager'] = 'Administrator: le gruppo, usator o lista separate per commas ("usator1,@gruppo1,usator2") con accesso a certe functiones administrative';
+$lang['profileconfirm'] = 'Confirmar modificationes del profilo con contrasigno';
+$lang['disableactions'] = 'Disactivar actiones DokuWiki';
+$lang['disableactions_check'] = 'Verificar';
+$lang['disableactions_subscription'] = 'Subscriber/Cancellar subscription';
+$lang['disableactions_wikicode'] = 'Vider codice-fonte/Exportar texto crude';
+$lang['disableactions_other'] = 'Altere actiones (separate per commas)';
+$lang['sneaky_index'] = 'Normalmente, DokuWiki monstra tote le spatios de nomines in le vista del indice. Si iste option es active, illos ubi le usator non ha le permission de lectura essera celate. Isto pote resultar in le celamento de subspatios de nomines accessibile. Isto pote render le indice inusabile con certe configurationes de ACL.';
+$lang['auth_security_timeout'] = 'Expiration pro securitate de authentication (secundas)';
+$lang['securecookie'] = 'Debe le cookies definite via HTTPS solmente esser inviate via HTTPS per le navigator? Disactiva iste option si solmente le apertura de sessiones a tu wiki es protegite con SSL ma le navigation del wiki es facite sin securitate.';
+$lang['xmlrpc'] = 'Activar/disactivar interfacie XML-RPC.';
+$lang['xmlrpcuser'] = 'Limitar le accesso a XML-RPC al gruppos o usatores date hic, separate per commas. Lassa isto vacue pro dar accesso a omnes.';
+$lang['updatecheck'] = 'Verificar si existe actualisationes e advertimentos de securitate? DokuWiki debe contactar splitbrain.org pro exequer iste function.';
+$lang['userewrite'] = 'Usar URLs nette';
+$lang['useslash'] = 'Usar le barra oblique ("/") como separator de spatios de nomines in URLs';
+$lang['usedraft'] = 'Automaticamente salveguardar un version provisori durante le modification';
+$lang['sepchar'] = 'Separator de parolas in nomines de paginas';
+$lang['canonical'] = 'Usar URLs completemente canonic';
+$lang['autoplural'] = 'Verificar si il ha formas plural in ligamines';
+$lang['compression'] = 'Methodo de compression pro files a mansarda';
+$lang['cachetime'] = 'Etate maximal pro le cache (secundas)';
+$lang['locktime'] = 'Etate maximal pro le files de serratura (secundas)';
+$lang['fetchsize'] = 'Numero maximal de bytes per file que fetch.php pote discargar de sitos externe';
+$lang['notify'] = 'Inviar notificationes de cambios a iste adresse de e-mail';
+$lang['registernotify'] = 'Inviar informationes super usatores novemente registrate a iste adresse de e-mail';
+$lang['mailfrom'] = 'Adresse de e-mail a usar pro messages automatic';
+$lang['gzip_output'] = 'Usar Content-Encoding gzip pro xhtml';
+$lang['gdlib'] = 'Version de GD Lib';
+$lang['im_convert'] = 'Cammino al programma "convert" de ImageMagick';
+$lang['jpg_quality'] = 'Qualitate del compression JPEG (0-100)';
+$lang['subscribers'] = 'Activar le possibilitate de subscriber se al paginas';
+$lang['subscribe_time'] = 'Tempore post le qual le listas de subscription e le digestos es inviate (in secundas); isto debe esser minor que le tempore specificate in recent_days.';
+$lang['compress'] = 'Compactar le output CSS e JavaScript';
+$lang['hidepages'] = 'Celar paginas correspondente (expressiones regular)';
+$lang['send404'] = 'Inviar "HTTP 404/Pagina non trovate" pro paginas non existente';
+$lang['sitemap'] = 'Generar mappa de sito Google (dies)';
+$lang['broken_iua'] = 'Es le function ignore_user_abort defectuose in tu systema? Isto pote resultar in un indice de recerca que non functiona. Vide <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> pro plus info.';
+$lang['xsendfile'] = 'Usar le capite X-Sendfile pro lassar le servitor web livrar files static? Tu navigator del web debe supportar isto.';
+$lang['renderer_xhtml'] = 'Renditor a usar pro le output wiki principal (xhtml)';
+$lang['renderer__core'] = '%s (nucleo dokuwiki)';
+$lang['renderer__plugin'] = '%s (plug-in)';
+$lang['rememberme'] = 'Permitter cookies de session permanente (memorar me)';
+$lang['rss_type'] = 'Typo de syndication XML';
+$lang['rss_linkto'] = 'Syndication XML liga verso';
+$lang['rss_content'] = 'Que monstrar in le entratas de syndication XML?';
+$lang['rss_update'] = 'Intervallo de actualisation pro syndicationes XML (secundas)';
+$lang['recent_days'] = 'Retener quante modificationes recente? (dies)';
+$lang['rss_show_summary'] = 'Monstrar summario in titulo de syndication XML';
+$lang['target____wiki'] = 'Fenestra de destination pro ligamines interne';
+$lang['target____interwiki'] = 'Fenestra de destination pro ligamines interwiki';
+$lang['target____extern'] = 'Fenestra de destination pro ligamines externe';
+$lang['target____media'] = 'Fenestra de destination pro ligamines multimedia';
+$lang['target____windows'] = 'Fenestra de destination pro ligamines a fenestras';
+$lang['proxy____host'] = 'Nomine de servitor proxy';
+$lang['proxy____port'] = 'Porto del proxy';
+$lang['proxy____user'] = 'Nomine de usator pro le proxy';
+$lang['proxy____pass'] = 'Contrasigno pro le proxy';
+$lang['proxy____ssl'] = 'Usar SSL pro connecter al proxy';
+$lang['safemodehack'] = 'Permitter truco de modo secur';
+$lang['ftp____host'] = 'Servitor FTP pro truco de modo secur';
+$lang['ftp____port'] = 'Porto FTP pro truco de modo secur';
+$lang['ftp____user'] = 'Nomine de usator FTP pro truco de modo secur';
+$lang['ftp____pass'] = 'Contrasigno FTP pro truco de modo secur';
+$lang['ftp____root'] = 'Directorio radice FTP pro truco de modo securr';
+$lang['license_o_'] = 'Nihil seligite';
+$lang['typography_o_0'] = 'nulle';
+$lang['typography_o_1'] = 'excludente ';
+$lang['typography_o_2'] = 'includente virgulettas singule (pote non sempre functionar)';
+$lang['userewrite_o_0'] = 'nulle';
+$lang['userewrite_o_1'] = '.htaccess';
+$lang['userewrite_o_2'] = 'interne a DokuWIki';
+$lang['deaccent_o_0'] = 'disactivate';
+$lang['deaccent_o_1'] = 'remover accentos';
+$lang['deaccent_o_2'] = 'romanisar';
+$lang['gdlib_o_0'] = 'GD Lib non disponibile';
+$lang['gdlib_o_1'] = 'Version 1.x';
+$lang['gdlib_o_2'] = 'Autodetection';
+$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'] = 'Abstracte';
+$lang['rss_content_o_diff'] = 'In formato Unified Diff';
+$lang['rss_content_o_htmldiff'] = 'Tabella de diff in formato HTML';
+$lang['rss_content_o_html'] = 'Contento complete del pagina in HTML';
+$lang['rss_linkto_o_diff'] = 'vista de differentias';
+$lang['rss_linkto_o_page'] = 'le pagina revidite';
+$lang['rss_linkto_o_rev'] = 'lista de versiones';
+$lang['rss_linkto_o_current'] = 'le pagina actual';
+$lang['compression_o_0'] = 'nulle';
+$lang['compression_o_gz'] = 'gzip';
+$lang['compression_o_bz2'] = 'bz2';
+$lang['xsendfile_o_0'] = 'non usar';
+$lang['xsendfile_o_1'] = 'Capite proprietari "lighttpd" (ante version 1.5)';
+$lang['xsendfile_o_2'] = 'Capite standard "X-Sendfile"';
+$lang['xsendfile_o_3'] = 'Capite proprietari "X-Accel-Redirect" de Nginx';
+$lang['showuseras_o_loginname'] = 'Nomine de usator';
+$lang['showuseras_o_username'] = 'Nomine real del usator';
+$lang['showuseras_o_email'] = 'Adresse de e-mail del usator (offuscate secundo le configuration de Mailguard)';
+$lang['showuseras_o_email_link'] = 'Adresse de e-mail del usator como ligamine "mailto:"';
+$lang['useheading_o_0'] = 'Nunquam';
+$lang['useheading_o_navigation'] = 'Navigation solmente';
+$lang['useheading_o_content'] = 'Contento wiki solmente';
+$lang['useheading_o_1'] = 'Sempre';
diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php
index 2a9ba42f0..9b84bb79e 100644
--- a/lib/plugins/config/lang/it/lang.php
+++ b/lib/plugins/config/lang/it/lang.php
@@ -14,18 +14,18 @@
*/
$lang['menu'] = 'Configurazione Wiki';
$lang['error'] = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo.
- <br />I valori non corretti sono evidenziati da un riquadro rosso.';
+<br />I valori non corretti sono evidenziati da un riquadro rosso.';
$lang['updated'] = 'Aggiornamento impostazioni riuscito.';
$lang['nochoice'] = '(nessun\'altra scelta disponibile)';
$lang['locked'] = 'Il file di configurazione non può essere aggiornato, se questo non è intenzionale, <br />
- assicurati che il nome e i permessi del file contenente la configurazione locale siano corretti.';
-$lang['danger'] = 'Attenzione: Cambiare questa opzione può rendere inaccessibile la tua wiki e il menu di configurazione.';
-$lang['warning'] = 'Avviso: Cambiare questa opzione può causare comportamenti indesiderati.';
-$lang['security'] = 'Avviso di sicurezza: Cambiare questa opzione può esporre a rischi di sicurezza.';
+assicurati che il nome e i permessi del file contenente la configurazione locale siano corretti.';
+$lang['danger'] = 'Attenzione: cambiare questa opzione può rendere inaccessibile il wiki e il menu di configurazione.';
+$lang['warning'] = 'Avviso: cambiare questa opzione può causare comportamenti indesiderati.';
+$lang['security'] = 'Avviso di sicurezza: vambiare questa opzione può esporre a rischi di sicurezza.';
$lang['_configuration_manager'] = 'Configurazione Wiki';
$lang['_header_dokuwiki'] = 'Impostazioni DokuWiki';
$lang['_header_plugin'] = 'Impostazioni Plugin';
-$lang['_header_template'] = 'Impostazioni Template';
+$lang['_header_template'] = 'Impostazioni Modello';
$lang['_header_undefined'] = 'Impostazioni non definite';
$lang['_basic'] = 'Impostazioni Base';
$lang['_display'] = 'Impostazioni Visualizzazione';
@@ -37,7 +37,7 @@ $lang['_media'] = 'Impostazioni File';
$lang['_advanced'] = 'Impostazioni Avanzate';
$lang['_network'] = 'Impostazioni Rete';
$lang['_plugin_sufix'] = 'Impostazioni Plugin';
-$lang['_template_sufix'] = 'Impostazioni Template';
+$lang['_template_sufix'] = 'Impostazioni Modello';
$lang['_msg_setting_undefined'] = 'Nessun metadato definito.';
$lang['_msg_setting_no_class'] = 'Nessuna classe definita.';
$lang['_msg_setting_no_default'] = 'Nessun valore predefinito.';
@@ -49,7 +49,7 @@ $lang['baseurl'] = 'URL di base';
$lang['savedir'] = 'Directory per il salvataggio dei dati';
$lang['start'] = 'Nome della pagina iniziale';
$lang['title'] = 'Titolo del wiki';
-$lang['template'] = 'Template';
+$lang['template'] = 'Modello';
$lang['license'] = 'Sotto quale licenza vorresti rilasciare il tuo contenuto?';
$lang['fullpath'] = 'Mostra il percorso completo delle pagine';
$lang['recent'] = 'Ultime modifiche';
@@ -58,7 +58,7 @@ $lang['youarehere'] = 'Breadcrumb gerarchici';
$lang['typography'] = 'Abilita la sostituzione tipografica';
$lang['htmlok'] = 'Consenti HTML incorporato';
$lang['phpok'] = 'Consenti PHP incorporato';
-$lang['dformat'] = 'Formato delle date (vedi la funzione <a href="http://www.php.net/date">data</a> di PHP)';
+$lang['dformat'] = 'Formato delle date (vedi la funzione <a href="http://www.php.net/strftime">strftime</a> di PHP)';
$lang['signature'] = 'Firma';
$lang['toptoclevel'] = 'Livello superiore per l\'indice';
$lang['tocminheads'] = 'Ammontare minimo di intestazioni che determinano la creazione del TOC';
@@ -72,8 +72,8 @@ $lang['refshow'] = 'Numero di riferimenti da visualizzare';
$lang['allowdebug'] = 'Abilita il debug <b>(disabilitare se non serve!)</b>';
$lang['usewordblock'] = 'Blocca lo spam in base alla blacklist';
$lang['indexdelay'] = 'Intervallo di tempo prima dell\'indicizzazione';
-$lang['relnofollow'] = 'Usa rel="nofollow"';
-$lang['mailguard'] = 'Oscuramento indirizzi e-mail';
+$lang['relnofollow'] = 'Usa rel="nofollow" nei collegamenti esterni';
+$lang['mailguard'] = 'Oscuramento indirizzi email';
$lang['iexssprotect'] = 'Controlla i file caricati in cerca di possibile codice JavaScript o HTML maligno.';
$lang['showuseras'] = 'Cosa visualizzare quando si mostra l\'ultimo utente che ha modificato una pagina';
$lang['useacl'] = 'Usa lista di controllo accessi (ACL)';
@@ -81,8 +81,8 @@ $lang['autopasswd'] = 'Genera password in automatico';
$lang['authtype'] = 'Sistema di autenticazione';
$lang['passcrypt'] = 'Metodo di cifratura password';
$lang['defaultgroup'] = 'Gruppo predefinito';
-$lang['superuser'] = 'Amministratore';
-$lang['manager'] = 'Gestore - un gruppo o un utente con accesso a determinate funzioni di gestione';
+$lang['superuser'] = 'Amministratore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso completo a tutte le pagine e le funzioni che riguardano le impostazioni ACL';
+$lang['manager'] = 'Gestore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso a determinate funzioni di gestione';
$lang['profileconfirm'] = 'Richiedi la password per modifiche al profilo';
$lang['disableactions'] = 'Disabilita azioni DokuWiki';
$lang['disableactions_check'] = 'Controlla';
@@ -90,13 +90,13 @@ $lang['disableactions_subscription'] = 'Sottoscrivi/Rimuovi sottoscrizione';
$lang['disableactions_wikicode'] = 'Mostra sorgente/Esporta Raw';
$lang['disableactions_other'] = 'Altre azioni (separate da virgola)';
$lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.';
-$lang['auth_security_timeout'] = 'Timeout di sicurezza per l\'autenticazione (secondi)';
+$lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)';
$lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.';
-$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC';
+$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC.';
$lang['xmlrpcuser'] = 'Limita l\'accesso XML-RPC ai gruppi o utenti indicati qui (separati da virgola). Lascia il campo vuoto per dare accesso a tutti.';
$lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare splitbrain.org per questa funzione.';
$lang['userewrite'] = 'Usa il rewrite delle URL';
-$lang['useslash'] = 'Usa lo slash come separatore nelle URL';
+$lang['useslash'] = 'Usa la barra rovescia (slash) come separatore nelle URL';
$lang['usedraft'] = 'Salva una bozza in automatico in fase di modifica';
$lang['sepchar'] = 'Separatore di parole nei nomi di pagina';
$lang['canonical'] = 'Usa URL canoniche';
@@ -113,13 +113,14 @@ $lang['gdlib'] = 'Versione GD Lib ';
$lang['im_convert'] = 'Percorso per il convertitore di ImageMagick';
$lang['jpg_quality'] = 'Qualità di compressione JPG (0-100)';
$lang['subscribers'] = 'Abilita la sottoscrizione alle pagine';
+$lang['subscribe_time'] = 'Tempo dopo il quale le liste di sottoscrizione e i riassunti vengono inviati (sec); Dovrebbe essere inferiore al tempo specificato in recent_days.';
$lang['compress'] = 'Comprimi i file CSS e javascript';
$lang['hidepages'] = 'Nascondi le pagine che soddisfano la condizione (inserire un\'espressione regolare)';
$lang['send404'] = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti';
$lang['sitemap'] = 'Genera una sitemap Google (giorni)';
$lang['broken_iua'] = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi il<a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> per maggiori informazioni.';
$lang['xsendfile'] = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.';
-$lang['renderer_xhtml'] = 'Renderer da usare la visualizzazione del wiki (xhtml)';
+$lang['renderer_xhtml'] = 'Renderer da usare per la visualizzazione del wiki (xhtml)';
$lang['renderer__core'] = '%s (dokuwiki)';
$lang['renderer__plugin'] = '%s (plugin)';
$lang['rememberme'] = 'Permetti i cookies di accesso permanenti (ricordami)';
@@ -129,11 +130,11 @@ $lang['rss_content'] = 'Cosa mostrare negli elementi dei feed XML?';
$lang['rss_update'] = 'Intervallo di aggiornamento dei feed XML (sec)';
$lang['recent_days'] = 'Quante modifiche recenti tenere (giorni)';
$lang['rss_show_summary'] = 'I feed XML riportano un sommario nel titolo';
-$lang['target____wiki'] = 'Finestra target per i collegamenti interni';
-$lang['target____interwiki'] = 'Finestra target per i collegamenti interwiki';
-$lang['target____extern'] = 'Finestra target per i collegamenti esterni';
-$lang['target____media'] = 'Finestra target per i collegamenti ai file';
-$lang['target____windows'] = 'Finestra target per i collegamenti alle risorse condivise';
+$lang['target____wiki'] = 'Finestra di destinazione per i collegamenti interni';
+$lang['target____interwiki'] = 'Finestra di destinazione per i collegamenti interwiki';
+$lang['target____extern'] = 'Finestra di destinazione per i collegamenti esterni';
+$lang['target____media'] = 'Finestra di destinazione per i collegamenti ai file';
+$lang['target____windows'] = 'Finestra di destinazione per i collegamenti alle risorse condivise';
$lang['proxy____host'] = 'Nome server proxy';
$lang['proxy____port'] = 'Porta proxy';
$lang['proxy____user'] = 'Nome utente proxy';
@@ -144,7 +145,7 @@ $lang['ftp____host'] = 'Server FTP per safemode hack';
$lang['ftp____port'] = 'Porta FTP per safemode hack';
$lang['ftp____user'] = 'Nome utente FTP per safemode hack';
$lang['ftp____pass'] = 'Password FTP per safemode hack';
-$lang['ftp____root'] = 'Root directory FTP per safemode hack';
+$lang['ftp____root'] = 'Directory principale FTP per safemode hack';
$lang['license_o_'] = 'Nessuna scelta';
$lang['typography_o_0'] = 'nessuno';
$lang['typography_o_1'] = 'Solo virgolette';
@@ -170,7 +171,7 @@ $lang['rss_content_o_html'] = 'Tutto il contenuto della pagina in HTML';
$lang['rss_linkto_o_diff'] = 'vista differenze';
$lang['rss_linkto_o_page'] = 'pagina revisionata';
$lang['rss_linkto_o_rev'] = 'elenco revisioni';
-$lang['rss_linkto_o_current'] = 'pagina corrente';
+$lang['rss_linkto_o_current'] = 'pagina attuale';
$lang['compression_o_0'] = 'nessuna';
$lang['compression_o_gz'] = 'gzip';
$lang['compression_o_bz2'] = 'bz2';
diff --git a/lib/plugins/config/lang/lb/intro.txt b/lib/plugins/config/lang/lb/intro.txt
new file mode 100644
index 000000000..964ee851c
--- /dev/null
+++ b/lib/plugins/config/lang/lb/intro.txt
@@ -0,0 +1,7 @@
+====== Konfiguratioun ======
+
+Dëses Plugin hëlleft der bei der Konfiguratioun vun DokuWiki. Hëllef zu deenen eenzelnen Astellungen fënns de ënner [[doku>config]]. Méi Informatiounen zu dësem Plugin kriss de ënner [[doku>plugin:config]].
+
+Astellungen mat engem hellrouden Hannergrond si geséchert a kënnen net mat dësem Plugin verännert ginn. Astellungen mat hellbloem Hannergrond si Virastellungen, wäiss hannerluechte Felder weisen lokal verännert Werter un. Souwuel dié blo wéi och déi wäiss Felder kënne verännert ginn.
+
+Vergiess w.e.g. net **Späicheren** ze drécken iers de d'Säit verléiss, anescht ginn all deng Ännerungen verluer.
diff --git a/lib/plugins/config/lang/lb/lang.php b/lib/plugins/config/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/config/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php
index 51cb6d89b..533ccbcfb 100644
--- a/lib/plugins/config/lang/lv/lang.php
+++ b/lib/plugins/config/lang/lv/lang.php
@@ -105,6 +105,7 @@ $lang['gdlib'] = 'GD Lib versija';
$lang['im_convert'] = 'Ceļš uz ImageMagick convert rīku';
$lang['jpg_quality'] = 'JPG saspiešanas kvalitāte';
$lang['subscribers'] = 'Atļaut abonēt izmaiņas';
+$lang['subscribe_time'] = 'Pēc cik ilga laika izsūtīt abonētos sarakstus un kopsavilkumus (sekundes); jābūt mazākam par laiku, kas norādīts "recent_days".';
$lang['compress'] = 'Saspiest CSS un javascript failus';
$lang['hidepages'] = 'Slēpt lapas (regulāras izteiksmes)';
$lang['send404'] = 'Par neesošām lapām atbildēt "HTTP 404/Page Not Found" ';
diff --git a/lib/plugins/config/lang/mk/lang.php b/lib/plugins/config/lang/mk/lang.php
new file mode 100644
index 000000000..6d4530f79
--- /dev/null
+++ b/lib/plugins/config/lang/mk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php
index 4f3c2ddec..b722f7b4d 100644
--- a/lib/plugins/config/lang/pl/lang.php
+++ b/lib/plugins/config/lang/pl/lang.php
@@ -8,6 +8,8 @@
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
* @author Piotr JANKOWSKI <jankowski.piotr@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['menu'] = 'Ustawienia';
$lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu. <br/> Niepoprawne wartości są wyróżnione kolorem czerwonym.';
@@ -108,6 +110,7 @@ $lang['gdlib'] = 'Wersja biblioteki GDLib';
$lang['im_convert'] = 'Ścieżka do programu imagemagick';
$lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)';
$lang['subscribers'] = 'Subskrypcja';
+$lang['subscribe_time'] = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.';
$lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript';
$lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)';
$lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 14e5cfb19..2e6971e34 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -13,6 +13,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['menu'] = 'Configurações do DokuWiki';
$lang['error'] = 'As configurações não foram atualizadas devido a um valor inválido. Por favor, reveja suas alterações e reenvie-as.<br />O(s) valor(es) incorreto(s) serão exibidos contornados por uma borda vermelha.';
diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php
index 1e9905d64..515485afb 100644
--- a/lib/plugins/config/lang/ru/lang.php
+++ b/lib/plugins/config/lang/ru/lang.php
@@ -12,6 +12,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['menu'] = 'Настройки Вики';
$lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте ваши изменения и попробуйте еще раз.
@@ -114,6 +115,7 @@ $lang['gdlib'] = 'Версия GD Lib';
$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'] = 'Посылать "HTTP404/Page Not Found"';
diff --git a/lib/plugins/config/lang/sq/intro.txt b/lib/plugins/config/lang/sq/intro.txt
new file mode 100644
index 000000000..687b497c9
--- /dev/null
+++ b/lib/plugins/config/lang/sq/intro.txt
@@ -0,0 +1,7 @@
+====== Menaxheri Konfigurimit ======
+
+Përdoreni këtë faqe për të kontrolluar kuadrot e instalimit të DokuWiki-t tuaj. Për ndihmë mbi kuadro individuale referojuni [[doku>config]]. Për më tepër detaje rreth këtij plugin-i shih [[doku>plugin:config]].
+
+Kuadrot e treguara me një backgroudn me një ngjyrë të kuqe të lehtë janë të mbrojtura dhe nuk mund të ndryshohen me këtë plugin. Kuadrot e treguara me një background blu janë vlerat default dhe kuadrot e treguara me një background të bardhë janë vendosur lokalisht për këtë instalim të caktuar. Si kuadrot blu, ashtu edhe ato të bardhë mund të ndryshohen.
+
+Kujtohuni të shtypni butonin **Ruaj** para se të dilni nga kjo faqe ose ndryshimet tuaja do të humbasin. \ No newline at end of file
diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php
new file mode 100644
index 000000000..6cf8fd5af
--- /dev/null
+++ b/lib/plugins/config/lang/sq/lang.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['menu'] = 'Konfigurimi i Kuadrove';
+$lang['error'] = 'Kuadrot nuk u përditësuan për shkak të një vlere të palejuar, ju lutem rishikoni ndryshimet tuaja dhe ridorëzojeni.
+<br />Vlerat e pasakta tregohen të rrethuara nga një kornizë e kuqe.';
+$lang['updated'] = 'Kuadrot u përditësuan me sukses.';
+$lang['nochoice'] = '(asnjë zgjedhje tjetër e disponueshme)';
+$lang['locked'] = 'Skedari i kuadrove nuk mund të përditësohet, nëse kjo është e paqëllimshme, <br /> sigurohuni që emri i skedarit të kuadrove lokale dhe të drejtat të jenë të sakta.';
+$lang['danger'] = 'Rrezik: Ndrishimi i kësaj alternative mund ta bëjë wiki-n dhe menunë tuaj të konfigurimit të pa aksesueshme.';
+$lang['warning'] = 'Paralajmërim: Ndryshimi i kësaj alternative mund të shkaktojë sjellje të padëshiruara.';
+$lang['security'] = 'Paralajmërim Sigurie: Ndryshimi i kësaj alternative mund të paraqesë një rrezik në siguri.';
+$lang['_configuration_manager'] = 'Menaxhuesi i Kuadrove';
+$lang['_header_dokuwiki'] = 'Kuadrot e DokuWiki-t';
+$lang['_header_plugin'] = 'Kuadrot e Plugin-eve';
+$lang['_header_template'] = 'Kuadrot e Template-eve';
+$lang['_header_undefined'] = 'Kuadro të Papërcaktuara';
+$lang['_basic'] = 'Kuadro Elementare';
+$lang['_display'] = 'Kuadrot e Shfaqjes';
+$lang['_authentication'] = 'Kuadrot e Autentikimit';
+$lang['_anti_spam'] = 'Kuadrot Anti-Spam';
+$lang['_editing'] = 'Kuadrot e Redaktimit';
+$lang['_links'] = 'Kuadrot e Link-eve';
+$lang['_media'] = 'Kuadrot e Medias';
+$lang['_advanced'] = 'Kuadro të Avancuara';
+$lang['_network'] = 'Kuadrot e Rrjetit';
+$lang['_plugin_sufix'] = 'Kuadrot e Plugin-eve';
+$lang['_template_sufix'] = 'Kuadrot e Template-eve';
+$lang['_msg_setting_undefined'] = 'Metadata pa kuadro.';
+$lang['_msg_setting_no_class'] = 'Klasë pa kuadro.';
+$lang['_msg_setting_no_default'] = 'Asnjë vlerë default.';
+$lang['fmode'] = 'Mënyra krijim skedari';
+$lang['dmode'] = 'Mënyra krijim dosjeje.';
+$lang['lang'] = 'Gjuha e ndërfaqes';
+$lang['basedir'] = 'Path-i i Serverit (psh <code>/dokuwiki/</code>). Lëre bosh për ta gjetur automatikisht.';
+$lang['baseurl'] = 'URL-ja serverit (psh <code>http://www.serveriyt.com</code>). Lëre bosh për ta gjetur automatikisht.';
+$lang['savedir'] = 'Direktoria për të ruajtur të dhënat';
+$lang['start'] = 'Emri i faqes së fillimit';
+$lang['title'] = 'Titulli i Wiki-t';
+$lang['template'] = 'Template';
+$lang['license'] = 'Nën cilën liçensë duhet të vihet përmbajtja juar?';
+$lang['fullpath'] = 'Trego adresën e plotë të faqeve në footer.';
+$lang['recent'] = 'Ndryshimet më të fundit';
+$lang['breadcrumbs'] = 'Numri i gjurmëve';
+$lang['youarehere'] = 'Gjurmë hierarkike';
+$lang['typography'] = 'Bëj zëvendësime tipografike';
+$lang['htmlok'] = 'Lejo HTML të ngulitura';
+$lang['phpok'] = 'Lejo PHP të ngulitura';
+$lang['dformat'] = 'Formati i Datës (shiko funksionin <a href="http://www.php.net/strftime">strftime</a> e PHP-së)';
+$lang['signature'] = 'Firma';
+$lang['toptoclevel'] = 'Niveli i Kreut për tabelën e përmbajtjes';
+$lang['tocminheads'] = 'Sasia minimum e titrave që përcaktojnë nëse TOC ndërtohet ose jo';
+$lang['maxtoclevel'] = 'Niveli maksimum për tabelën e përmbajtjes';
+$lang['maxseclevel'] = 'Niveli maksimum për redaktim të seksionit';
+$lang['camelcase'] = 'Përdor CamelCase (shkronja e parë e çdo fjale është kapitale) për linke-t';
+$lang['deaccent'] = 'Emra faqesh të pastër';
+$lang['useheading'] = 'Përdor titra të nivelit të parë për faqet e emrave';
+$lang['refcheck'] = 'Kontroll për referim mediash';
+$lang['refshow'] = 'Numri i referimeve të medias që duhet të tregohet';
+$lang['allowdebug'] = 'Lejo debug <b>çaktivizoje nëse nuk nevojitet!</b>';
+$lang['usewordblock'] = 'Blloko spam-in duke u bazuar mbi listë fjalësh';
+$lang['indexdelay'] = 'Vonesa në kohë para index-imit (sekonda)';
+$lang['relnofollow'] = 'Përdor rel="nofollow" në linke të jashtëm';
+$lang['mailguard'] = 'Errëso adresat e email-it';
+$lang['iexssprotect'] = 'Kontrollo skedarët e ngarkuar për kod të mundshëm dashakeqës JavaScript ose HTML';
+$lang['showuseras'] = 'Cfarë të shfaqësh kur t\'i tregosh përdoruesit faqen e fundit të redaktuar';
+$lang['useacl'] = 'Përdor lista kontrolli të aksesit';
+$lang['autopasswd'] = 'Autogjenero fjalëkalime';
+$lang['authtype'] = 'Backend autentikimi';
+$lang['passcrypt'] = 'Metoda e enkriptimit të fjalëkalimit';
+$lang['defaultgroup'] = 'Grupi default';
+$lang['superuser'] = 'Superpërdorues - grup, përdorues ose listë e ndarë me presje user1, @group1,user2 me akses të plotë në të gjitha faqet dhe funksionet pavarësisht kuadrove të ACL';
+$lang['manager'] = 'Menaxher - grup, përdorues ose listë e ndarë me presje user1,@group1,user2 me akses në disa funksione të caktuara menaxhimi';
+$lang['profileconfirm'] = 'Konfirmo ndryshimet ne profil me fjalëkalim';
+$lang['disableactions'] = 'Caktivizo veprimet e DokuWiki-it';
+$lang['disableactions_check'] = 'Kontrollo';
+$lang['disableactions_subscription'] = 'Abonohu/Fshi Abonim';
+$lang['disableactions_wikicode'] = 'Shiku kodin burim/ Eksportoje të Papërpunuar';
+$lang['disableactions_other'] = 'Veprime të tjera (të ndarë me presje)';
+$lang['sneaky_index'] = 'Vetiu DokuWiki tregon të gjithë hapësirat e emrit në shikimin e index-it. Aktivizimi i kësaj alternative do të fshehë ato ku përdoruesi nuk ka të drejta leximi. Kjo mund të përfundojë në fshehje të nënhapësirave të emrit të aksesueshme. Kjo mund ta bëjë index-in të papërdorshëm me disa konfigurime të caktuara të ACL-së.';
+$lang['auth_security_timeout'] = 'Koha e Përfundimit për Autentikim (sekonda)';
+$lang['securecookie'] = 'A duhet që cookies të vendosura nëpërmjet HTTPS të dërgohen vetëm nëpërmjet HTTPS nga shfletuesit? Caktivizojeni këtë alternativë kur vetëm hyrja në wiki-n tuaj sigurohet me SSL por shfletimi i wiki-t bëhet në mënyrë të pasigurtë.';
+$lang['xmlrpc'] = 'Aktivizo/Caktivizo ndërfaqen XML-RPC';
+$lang['xmlrpcuser'] = 'Kufizo aksesin XML-RPC vetëm tek grupet ose përdoruesit e ndarë me presje të dhënë këtu. Lëre bosh për t\'i dhënë akses të gjithëve.';
+$lang['updatecheck'] = 'Kontrollo për përditësime dhe paralajmërime sigurie? DokuWiki duhet të kontaktojë me splitbrain.org për këtë veti.';
+$lang['userewrite'] = 'Përdor URL të këndshme.';
+$lang['useslash'] = 'Përdor / si ndarës të hapësirave të emrit në URL';
+$lang['usedraft'] = 'Ruaj automatikisht një skicë gjatë redaktimit';
+$lang['sepchar'] = 'Fjala ndarëse për emrin e faqes';
+$lang['canonical'] = 'Përdor URL kanonike të plota';
+$lang['autoplural'] = 'Kontrollo për forma shumës në link-e';
+$lang['compression'] = 'Metoda kompresimit për skedarët atikë';
+$lang['cachetime'] = 'Mosha maksimale për cache (sekonda)';
+$lang['locktime'] = 'Mosha maksimale për kyçjen e skedarëve (sekonda)';
+$lang['fetchsize'] = 'Madhësia maksimale (bytes) që fetch.php mund të shkarkojë nga jashtë';
+$lang['notify'] = 'Dërgo lajmërim për ndryshime te kjo adresë email-i';
+$lang['registernotify'] = 'Dërgo info për përdoruesit e sapo regjistruar te kjo adresë email-i';
+$lang['mailfrom'] = 'Adresa e email-it që do të përdoret për dërgimin e email-eve automatikë';
+$lang['gzip_output'] = 'Përdor gzip Content-Encoding për xhtml';
+$lang['gdlib'] = 'Versioni i GD Lib';
+$lang['im_convert'] = 'Path-i për tek mjeti i konvertimit ImageMagick';
+$lang['jpg_quality'] = 'Cilësia e kompresimit JPG (0-100)';
+$lang['subscribers'] = 'Aktivizo suportin për abonim faqesh';
+$lang['subscribe_time'] = 'Koha pas së cilës listat e abonimeve dhe konsumimet dërgohen (sekonda); Kjo duhet të jetë më e vogël se koha e specifikuar në ditët më të fundit';
+$lang['compress'] = 'Kompaktëso daljet CSS dhe JavaScript ';
+$lang['hidepages'] = 'Fshi faqet që përkojnë (shprehjet e rregullta)';
+$lang['send404'] = 'Dërgo "HTTP 404/Page Not Found" për faqe që nuk ekzistojnë';
+$lang['sitemap'] = 'Gjenero Google sitemap (ditë)';
+$lang['broken_iua'] = 'Funksioni ignore_user_abort është i prishur në sistemin tuaj? Kjo mund të shkaktojë një indeks kërkimi jo funksional. IIS+PHP/CGI njihen si të prishura. Shiko <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> për më shumë info.';
+$lang['xsendfile'] = 'Përdor kokën X-Sendfile për të lejuar webserver-in të dërgojë skedarë statikë? Kjo duhet të suportohet nga webserver-i juaj.';
+$lang['renderer_xhtml'] = 'Riprodhuesi i përdorur për daljen wiki kryesore (xhtml)';
+$lang['renderer__core'] = '%s (dokuwiki core)';
+$lang['renderer__plugin'] = '%s (plugin)';
+$lang['rememberme'] = 'Lejo cookies hyrjeje të përhershme (më kujto mua)';
+$lang['rss_type'] = 'Tipi feed XML';
+$lang['rss_linkto'] = 'XML feed lidhet me';
+$lang['rss_content'] = 'Cfarë të shfaqësh në objektet XML feed?';
+$lang['rss_update'] = 'Intervali i përditësimit XML feed (sekonda)';
+$lang['recent_days'] = 'Sa ndryshime të fundit duhen mbajtur (ditë)';
+$lang['rss_show_summary'] = 'XML feed trego përmbledhjen në titull';
+$lang['target____wiki'] = 'Dritarja target për link-e të brendshëm';
+$lang['target____interwiki'] = 'Dritarja target për link-e interwiki';
+$lang['target____extern'] = 'Dritarja target për link-e të jashtme';
+$lang['target____media'] = 'Dritarja target për link-e mediash';
+$lang['target____windows'] = 'Dritarja target për link-e windows-i';
+$lang['proxy____host'] = 'Emri i serverit të proxy-t';
+$lang['proxy____port'] = 'Porta e proxy-t';
+$lang['proxy____user'] = 'Emri i përdoruesit për proxy-n';
+$lang['proxy____pass'] = 'Fjalëkalimi proxy-t';
+$lang['proxy____ssl'] = 'Përdor SSL për tu lidhur me proxy-n';
+$lang['safemodehack'] = 'Aktivizo hack në safemode';
+$lang['ftp____host'] = 'Server FTP për safemode hack';
+$lang['ftp____port'] = 'Porta FTP për safemode hack';
+$lang['ftp____user'] = 'Emri përdoruesit për safemode hack';
+$lang['ftp____pass'] = 'Fjalëkalimi FTP për safemode hack';
+$lang['ftp____root'] = 'Direktoria rrënjë për safemode hack';
+$lang['license_o_'] = 'Nuk u zgjodh asgjë';
+$lang['typography_o_0'] = 'Asgjë';
+$lang['typography_o_1'] = 'përjashtim i thonjëzave teke';
+$lang['typography_o_2'] = 'përfshirje e thonjëzave teke (nuk punon gjithmonë) ';
+$lang['userewrite_o_0'] = 'asgjë';
+$lang['userewrite_o_1'] = '.htaccess';
+$lang['userewrite_o_2'] = 'Brendësia DokuWiki';
+$lang['deaccent_o_0'] = 'fikur';
+$lang['deaccent_o_1'] = 'hiq theksin';
+$lang['deaccent_o_2'] = 'romanizo';
+$lang['gdlib_o_0'] = 'GD Lib nuk është e disponueshme';
+$lang['gdlib_o_1'] = 'Versioni 1.x';
+$lang['gdlib_o_2'] = 'Dallim automatik';
+$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'] = 'Abstrakte';
+$lang['rss_content_o_diff'] = 'Ndryshime të njësuara';
+$lang['rss_content_o_htmldiff'] = 'Tabelë ndryshimesh e formatuar në HTML';
+$lang['rss_content_o_html'] = 'Përmbajtje e plotë faqeje HTML';
+$lang['rss_linkto_o_diff'] = 'shikimi ndryshimit';
+$lang['rss_linkto_o_page'] = 'faqja e rishikuar';
+$lang['rss_linkto_o_rev'] = 'lista e rishikimeve';
+$lang['rss_linkto_o_current'] = 'faqja aktuale';
+$lang['compression_o_0'] = 'asgjë';
+$lang['compression_o_gz'] = 'gzip';
+$lang['compression_o_bz2'] = 'bz2';
+$lang['xsendfile_o_0'] = 'mos e përdor';
+$lang['xsendfile_o_1'] = 'Proprietary lighttpd header (para lëshimit 1.5)';
+$lang['xsendfile_o_2'] = 'X-Sendfile header standard';
+$lang['xsendfile_o_3'] = 'Proprietary Nginx X-Accel-Redirect header';
+$lang['showuseras_o_loginname'] = 'Emri hyrjes';
+$lang['showuseras_o_username'] = 'Emri i plotë i përdoruesit';
+$lang['showuseras_o_email'] = 'Adresa e email-it e përdoruesit (errësuar sipas kuadros mailguard)';
+$lang['showuseras_o_email_link'] = 'Adresa email e përdoruesit si një mailto: link';
+$lang['useheading_o_0'] = 'Kurrë';
+$lang['useheading_o_navigation'] = 'Vetëm për Navigim';
+$lang['useheading_o_content'] = 'Vetëm për Përmbajtje Wiki';
+$lang['useheading_o_1'] = 'Gjithmonë';
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index f9867b8de..b7428bf6c 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -627,7 +627,8 @@ if (!class_exists('setting_numeric')) {
$out = '';
if ($fmt=='php') {
- $out .= '$'.$var."['".$this->_out_key()."'] = ".$this->_local.";\n";
+ $local = $this->_local === '' ? "''" : $this->_local;
+ $out .= '$'.$var."['".$this->_out_key()."'] = ".$local.";\n";
}
return $out;
diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php
index d56f52be2..bd1380143 100644
--- a/lib/plugins/plugin/lang/cs/lang.php
+++ b/lib/plugins/plugin/lang/cs/lang.php
@@ -7,6 +7,7 @@
* @author Zbynek Krivka <zbynek.krivka@seznam.cz>
* @author Bohumir Zamecnik <bohumir@zamecnik.org>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['menu'] = 'Správa pluginů';
$lang['download'] = 'Stáhnout a instalovat plugin';
diff --git a/lib/plugins/plugin/lang/de-informal/admin_plugin.txt b/lib/plugins/plugin/lang/de-informal/admin_plugin.txt
index 663313436..576797d57 100644
--- a/lib/plugins/plugin/lang/de-informal/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/de-informal/admin_plugin.txt
@@ -1,3 +1,3 @@
===== Erweiterungsmanagement =====
-Auf dieser Seite kannst du alles anpassen was mit DokuWiki zu tun hat [[doku>plugins|plugins]]. Der Ordner der Erweiterungen muss für den Webserver beschreibbar sein, um Erweiterungen herunterladen und installieren zu können. \ No newline at end of file
+Auf dieser Seite kannst du alles anpassen was mit den DokuWiki [[doku>plugins|Erweiterungen]] zu tun hat. Der Ordner der Erweiterungen muss für den Webserver beschreibbar sein, um Erweiterungen herunterladen und installieren zu können. \ No newline at end of file
diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php
index 5796eebf1..f906bf6aa 100644
--- a/lib/plugins/plugin/lang/de-informal/lang.php
+++ b/lib/plugins/plugin/lang/de-informal/lang.php
@@ -4,11 +4,11 @@
*
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
$lang['menu'] = 'Plugins verwalten';
-$lang['download'] = 'Herunterladen und installieren eines neuen Plugins';
-$lang['manage'] = 'Installierte Plugins';
+$lang['download'] = 'Herunterladen und installieren einer neuen Erweiterung';
+$lang['manage'] = 'Installierte Erweiterungen';
$lang['btn_info'] = 'Information';
$lang['btn_update'] = 'aktualisieren';
$lang['btn_delete'] = 'löschen';
@@ -24,15 +24,15 @@ $lang['updating'] = 'Aktualisiere...';
$lang['updated'] = 'Erweiterung %s wurde erfolgreich aktualisiert.';
$lang['updates'] = 'Die folgenden Erweiterungen wurden erfolgreich aktualisiert.';
$lang['update_none'] = 'Keine Aktualisierungen gefunden.';
-$lang['deleting'] = 'Loesche...';
+$lang['deleting'] = 'Lösche...';
$lang['deleted'] = 'Erweiterung %s wurde gelöscht.';
$lang['downloading'] = 'Herunterladen...';
$lang['downloaded'] = 'Erweiterung %s wurde erfolgreich installiert';
$lang['downloads'] = 'Die folgenden Erweiterungen wurden erfolgreich installiert:';
$lang['download_none'] = 'Keine Erweiterungen gefunden oder es trat ein unbekanntest Problem beim Herunterladen und Installieren auf.';
-$lang['plugin'] = 'Plugin:';
+$lang['plugin'] = 'Erweiterung:';
$lang['components'] = 'Komponenten';
-$lang['noinfo'] = 'Diese Erweiterung gab keine Information zurück - es könnte ungültig sein.';
+$lang['noinfo'] = 'Diese Erweiterung gab keine Information zurück - sie könnte ungültig sein.';
$lang['name'] = 'Name:';
$lang['date'] = 'Datum:';
$lang['type'] = 'Typ:';
@@ -44,8 +44,8 @@ $lang['error_download'] = 'Nicht möglich die Erweiterung herunterzuladen
$lang['error_badurl'] = 'Vermute schlechte URL - nicht möglich den Dateinamen aus der URL zu ermitteln';
$lang['error_dircreate'] = 'Nicht möglich einen temporären Ordner zu erstellen um den Download zu empfangen.';
$lang['error_decompress'] = 'Dem Erweiterungsmanager war es nicht möglich die heruntergeladene Datei zu dekomprimieren. Dies kann an einem defekten Download liegen, in diesem Fall sollten Sie es erneut versuchen; oder das Format mit dem die Datei komprimiert ist, ist unbekannt, da müssen Sie die Erweiterung manuell herunterladen und installieren. ';
-$lang['error_copy'] = 'Es trat ein Dateifehler beim Kopieren der Installationsdateien für Plugn <em>%s</em> auf: Die Festplatte könnte voll oder die Zugriffsrechte verweigert worden sein. Dies führt zu einem teilweise installierten Plugin und belässt dein Wiki in einem instabilen Zustand.';
-$lang['error_delete'] = 'Es trat ein Fehler beim Löschen des Plugins <em>%s</em> auf. Die whrscheinlichste Ursache ist eine unzureichende Datei- oder Ordnerzugriffserlaubnis.';
+$lang['error_copy'] = 'Es trat ein Dateifehler beim Kopieren der Installationsdateien für die Erweiterung <em>%s</em> auf: Die Festplatte könnte voll oder die Zugriffsrechte verweigert worden sein. Dies führt zu einer teilweise installierten Erweiterung und belässt dein Wiki in einem instabilen Zustand.';
+$lang['error_delete'] = 'Es trat ein Fehler beim Löschen der Erweiterung <em>%s</em> auf. Die wahrscheinlichste Ursache ist eine unzureichende Datei- oder Ordnerzugriffserlaubnis.';
$lang['enabled'] = 'Erweiterung %s aktiviert.';
$lang['notenabled'] = 'Erweiterung %s konnte nicht aktiviert werden. Überprüfen sie die Zugriffsberechtigung der Datei.';
$lang['disabled'] = 'Erweiterung %s deaktiviert.';
diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index 08ab38196..33264ddf3 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -17,6 +17,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['menu'] = 'Administración de Plugins';
$lang['download'] = 'Descargar e instalar un nuevo plugin';
diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt
index 28696ebb4..c43e44684 100644
--- a/lib/plugins/plugin/lang/fr/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/fr/admin_plugin.txt
@@ -1,4 +1,4 @@
-====== Gestion des plugins ======
+====== Gestion des modules externes ======
-Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|plugins]] de DokuWiki. Pour télécharger et installer un plugin, le répertoire plugin doit être accessible en écriture pour le serveur Web.
+Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web.
diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php
index 43c4e9c5f..4e4bca214 100644
--- a/lib/plugins/plugin/lang/fr/lang.php
+++ b/lib/plugins/plugin/lang/fr/lang.php
@@ -12,14 +12,16 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
-$lang['menu'] = 'Gestion des module externes';
+$lang['menu'] = 'Gestion des modules externes';
$lang['download'] = 'Télécharger et installer un nouveau module';
-$lang['manage'] = 'Plugins installés';
-$lang['btn_info'] = 'info';
-$lang['btn_update'] = 'rafraîchir';
-$lang['btn_delete'] = 'effacer';
-$lang['btn_settings'] = 'paramètres';
+$lang['manage'] = 'Modules installés';
+$lang['btn_info'] = 'Info';
+$lang['btn_update'] = 'Mettre à jour';
+$lang['btn_delete'] = 'Supprimer';
+$lang['btn_settings'] = 'Paramètres';
$lang['btn_download'] = 'Télécharger';
$lang['btn_enable'] = 'Enregistrer';
$lang['url'] = 'URL';
@@ -27,33 +29,33 @@ $lang['installed'] = 'Installé :';
$lang['lastupdate'] = 'Dernière mise à jour :';
$lang['source'] = 'Source :';
$lang['unknown'] = 'inconnu';
-$lang['updating'] = 'Mise à jour...';
-$lang['updated'] = 'Plugin %s mis à jour avec succès';
+$lang['updating'] = 'Mise à jour…';
+$lang['updated'] = 'Modules %s mis à jour avec succès';
$lang['updates'] = 'Les modules suivants ont été mis à jour avec succès';
$lang['update_none'] = 'Aucune mise à jour n\'a été trouvée.';
-$lang['deleting'] = 'Suppression...';
-$lang['deleted'] = 'Plugin %s supprimé.';
-$lang['downloading'] = 'Téléchargement...';
-$lang['downloaded'] = 'Plugin %s installé avec succès';
+$lang['deleting'] = 'Suppression…';
+$lang['deleted'] = 'Module %s supprimé.';
+$lang['downloading'] = 'Téléchargement…';
+$lang['downloaded'] = 'Module %s installé avec succès';
$lang['downloads'] = 'Les modules suivants ont été installés avec succès :';
$lang['download_none'] = 'Aucun module n\'était trouvé, ou un problème inconnu est survenu durant le téléchargement et l\'installation.';
-$lang['plugin'] = 'Plugin :';
+$lang['plugin'] = 'Module :';
$lang['components'] = 'Composants';
$lang['noinfo'] = 'Ce module externe n\'a transmis aucune information, il pourrait être invalide.';
$lang['name'] = 'Nom :';
$lang['date'] = 'Date :';
$lang['type'] = 'Type :';
-$lang['desc'] = 'Description&nbsp;:';
+$lang['desc'] = 'Description :';
$lang['author'] = 'Auteur :';
-$lang['www'] = 'Web :';
+$lang['www'] = 'Site web :';
$lang['error'] = 'Une erreur inconnue est survenue.';
-$lang['error_download'] = 'Impossible de télécharger le fichier du plugin: %s';
-$lang['error_badurl'] = 'URL suspecte - impossible de déterminer le nom du fichier à partir de l\'URL';
+$lang['error_download'] = 'Impossible de télécharger le fichier du module : %s';
+$lang['error_badurl'] = 'URL suspecte. Impossible de déterminer le nom du fichier à partir de l\'URL';
$lang['error_dircreate'] = 'Impossible de créer le répertoire temporaire pour réceptionner le téléchargement';
-$lang['error_decompress'] = 'Le gestionnaire de plugin a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer le plugin manuellement.';
-$lang['error_copy'] = 'Une erreur de copie est survenue lors de l\'installation des fichiers du plugin <em>%s</em>: votre disque est peut-être plein ou les droits d\'accès au fichier sont incorrects. Il a pu en résulter une installation partielle du plugin rendant votre installation du wiki instable.';
-$lang['error_delete'] = 'Une erreur est survenue à la suppression du plugin <em>%s</em>. La raison la plus probable est l\'insuffisance des droits sur les fichiers ou le répertoire.';
-$lang['enabled'] = 'Plugin %s activé.';
-$lang['notenabled'] = 'Le plugin %s n\'a pas pu être activé, vérifiez le fichier des permissions.';
-$lang['disabled'] = 'Plugin %s désactivé.';
-$lang['notdisabled'] = 'Le plugin %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.';
+$lang['error_decompress'] = 'Le gestionnaire de modules externes a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer le module manuellement.';
+$lang['error_copy'] = 'Une erreur de copie est survenue lors de l\'installation des fichiers du module <em>%s</em> : votre disque est peut-être plein ou les droits d\'accès au fichier sont incorrects. Il a pu en résulter une installation partielle du module rendant votre installation du wiki instable.';
+$lang['error_delete'] = 'Une erreur est survenue à la suppression du module <em>%s</em>. La raison la plus probable est l\'insuffisance des droits sur les fichiers ou le répertoire.';
+$lang['enabled'] = 'Module %s activé.';
+$lang['notenabled'] = 'Le module %s n\'a pas pu être activé, vérifiez le fichier des permissions.';
+$lang['disabled'] = 'Module %s désactivé.';
+$lang['notdisabled'] = 'Le module %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.';
diff --git a/lib/plugins/plugin/lang/gl/admin_plugin.txt b/lib/plugins/plugin/lang/gl/admin_plugin.txt
index 481cb49a6..216285a8d 100644
--- a/lib/plugins/plugin/lang/gl/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/gl/admin_plugin.txt
@@ -1,3 +1,3 @@
-====== Xestión de plugins ======
+====== Xestión de Extensións ======
-Nesta páxina pode xestionar todas as accións posíbeis cos [[doku>plugins|plugins]] do DokuWiki. Para poder descargar e instalar un plugin, o seu cartafol de plugins debe ser escribíbel polo servidor web.
+Nesta páxina podes xestionar todas as accións posíbeis cos [[doku>plugins|extensións]] do DokuWiki. Para poder descargar e instalar unha extensión, o teu cartafol de extensións debe ser escribíbel polo servidor web.
diff --git a/lib/plugins/plugin/lang/gl/lang.php b/lib/plugins/plugin/lang/gl/lang.php
index a4fd98594..157911a62 100644
--- a/lib/plugins/plugin/lang/gl/lang.php
+++ b/lib/plugins/plugin/lang/gl/lang.php
@@ -2,14 +2,12 @@
/**
* Galicianlanguage file
*
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
-$lang['menu'] = 'Xestionar os plugins';
-$lang['download'] = 'Descargar e instalar un plugin novo';
-$lang['manage'] = 'Plugins instalados';
-$lang['btn_info'] = 'información';
+$lang['menu'] = 'Xestionar Extensións';
+$lang['download'] = 'Descargar e instalar unha nova extensión';
+$lang['manage'] = 'Extensións Instalados';
+$lang['btn_info'] = 'info';
$lang['btn_update'] = 'actualización';
$lang['btn_delete'] = 'eliminar';
$lang['btn_settings'] = 'configuración';
@@ -21,18 +19,18 @@ $lang['lastupdate'] = 'Última actualización:';
$lang['source'] = 'Fonte:';
$lang['unknown'] = 'descoñecido';
$lang['updating'] = 'Actualizando...';
-$lang['updated'] = 'Actualizouse correctamente o plugin %s';
-$lang['updates'] = 'Actualizáronse correctamente os seguintes plugins';
-$lang['update_none'] = 'Non se encontraron actualizacións.';
+$lang['updated'] = 'Actualizouse correctamente a extensión %s';
+$lang['updates'] = 'Actualizáronse correctamente as seguintes extensións';
+$lang['update_none'] = 'Non se atoparon actualizacións.';
$lang['deleting'] = 'Eliminando...';
-$lang['deleted'] = 'Eliminado o plugin %s.';
+$lang['deleted'] = 'Eliminado a extensión %s.';
$lang['downloading'] = 'Descargando...';
-$lang['downloaded'] = 'Instalouse correctamente o plugin %s';
-$lang['downloads'] = 'Instaláronse correctamente os seguintes plugins:';
-$lang['download_none'] = 'Non se encontraron plugins ou aconteceu un problema descoñecido durante a descarga e instalación.';
-$lang['plugin'] = 'Plugin:';
+$lang['downloaded'] = 'Instalouse correctamente a extensión %s';
+$lang['downloads'] = 'Instaláronse correctamente as seguintes extensións:';
+$lang['download_none'] = 'Non se atoparon extensións, ou aconteceu un problema descoñecido durante a descarga e instalación.';
+$lang['plugin'] = 'Extensión:';
$lang['components'] = 'Compoñentes';
-$lang['noinfo'] = 'Este plugin non devolveu información ningunha; pode que non sexa válido.';
+$lang['noinfo'] = 'Esta extensión non devolveu información ningunha. Pode que non sexa válida.';
$lang['name'] = 'Nome:';
$lang['date'] = 'Data:';
$lang['type'] = 'Tipo:';
@@ -40,13 +38,13 @@ $lang['desc'] = 'Descrición:';
$lang['author'] = 'Autor:';
$lang['www'] = 'Web:';
$lang['error'] = 'Houbo un erro descoñecido.';
-$lang['error_download'] = 'Non se puido descargar o ficheiro de plugin: %s';
-$lang['error_badurl'] = 'O URL é posibelmente incorrecto - non se puido determinar o nome do ficheiro mediante o URL';
+$lang['error_download'] = 'Non se puido descargar o arquivo de extensión: %s';
+$lang['error_badurl'] = 'URL posiblemente incorrecto - non se puido determinar o nome do arquivo mediante o URL';
$lang['error_dircreate'] = 'Non se puido crear un cartafol temporal para recibir a descarga';
-$lang['error_decompress'] = 'O xestor de plugins non foi quen de descomprimir o ficheiro descargado. Isto podería estar causado por unha descarga danada e en tal caso poderíalo tentar de novo; pode tamén que o formato de compresión sexa descoñecido, co que precisará descargar e instalar o plugin de modo manual.';
-$lang['error_copy'] = 'Houbo un erro de copia do ficheiro ao tentar instalar o plugin <em>%s</em>: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial do plugin e facer que a súa instalación do wiki se volva inestábel.';
-$lang['error_delete'] = 'Houbo un erro ao tentar eliminar o plugin <em>%s</em>. O máis probábel é que sexa causado por permisos de acceso insuficientes ao ficheiro ou directorio.';
-$lang['enabled'] = 'O plugin %s foi activado.';
-$lang['notenabled'] = 'O plugin %s non puido ser activado; verifique os permisos do ficheiro.';
-$lang['disabled'] = 'O plugin %s foi desactivado.';
-$lang['notdisabled'] = 'O plugin %s non puido ser desactivado; verifique os permisos do ficheiro.';
+$lang['error_decompress'] = 'O xestor de extensións non foi quen de descomprimir o arquivo descargado. Isto podería ser causado por unha descarga corrupta, polo que, en tal caso, podes tentalo de novo; ou pode que o formato de compresión sexa descoñecido, co que precisarás descargar e instalar a extensión de xeito manual.';
+$lang['error_copy'] = 'Houbo un erro de copia de arquivo ao tentar instalar a extensión <em>%s</em>: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial da extensión e facer que a túa instalación do wiki se volva inestable.';
+$lang['error_delete'] = 'Houbo un erro ao tentar eliminar a extensión <em>%s</em>. O máis probable é que sexa causado por permisos de acceso ao arquivo ou directorio insuficientes.';
+$lang['enabled'] = 'Extensión %s activado.';
+$lang['notenabled'] = 'A extensión %s non puido ser activada, comproba os permisos de arquivo.';
+$lang['disabled'] = 'Extensión %s desactivada.';
+$lang['notdisabled'] = 'A extensión %s non puido ser desactivada, comproba os permisos de arquivo.';
diff --git a/lib/plugins/plugin/lang/ia/admin_plugin.txt b/lib/plugins/plugin/lang/ia/admin_plugin.txt
new file mode 100644
index 000000000..c7f758c16
--- /dev/null
+++ b/lib/plugins/plugin/lang/ia/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Gestion de plug-ins ======
+
+In iste pagina tu pote gerer omne cosas con relation al [[doku>plugins|plug-ins]] de DokuWiki. Pro poter discargar e installar un plug-in, le directorio de plug-ins debe permitter le accesso de scriptura al servitor web. \ No newline at end of file
diff --git a/lib/plugins/plugin/lang/ia/lang.php b/lib/plugins/plugin/lang/ia/lang.php
new file mode 100644
index 000000000..523f8581d
--- /dev/null
+++ b/lib/plugins/plugin/lang/ia/lang.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['menu'] = 'Gestion de plug-ins';
+$lang['download'] = 'Discargar e installar un nove plug-in';
+$lang['manage'] = 'Plug-ins installate';
+$lang['btn_info'] = 'info';
+$lang['btn_update'] = 'actualisar';
+$lang['btn_delete'] = 'deler';
+$lang['btn_settings'] = 'configurationes';
+$lang['btn_download'] = 'Discargar';
+$lang['btn_enable'] = 'Salveguardar';
+$lang['url'] = 'URL';
+$lang['installed'] = 'Installate:';
+$lang['lastupdate'] = 'Ultime actualisation:';
+$lang['source'] = 'Origine:';
+$lang['unknown'] = 'incognite';
+$lang['updating'] = 'Actualisation…';
+$lang['updated'] = 'Actualisation del plug-in %s succedite';
+$lang['updates'] = 'Le sequente plug-ins ha essite actualisate con successo';
+$lang['update_none'] = 'Nulle actualisation trovate.';
+$lang['deleting'] = 'Deletion…';
+$lang['deleted'] = 'Le plug-in %s ha essite delite.';
+$lang['downloading'] = 'Discargamento…';
+$lang['downloaded'] = 'Installation del plug-in %s succedite.';
+$lang['downloads'] = 'Le sequente plug-ins ha essite installate con successo:';
+$lang['download_none'] = 'Nulle plug-in trovate, o il ha occurrite un problema incognite durante le discargamento e installation.';
+$lang['plugin'] = 'Plug-in:';
+$lang['components'] = 'Componentes';
+$lang['noinfo'] = 'Iste plug-in retornava nulle information; illo pote esser invalide.';
+$lang['name'] = 'Nomine:';
+$lang['date'] = 'Data:';
+$lang['type'] = 'Typo:';
+$lang['desc'] = 'Description:';
+$lang['author'] = 'Autor:';
+$lang['www'] = 'Web:';
+$lang['error'] = 'Un error incognite ha occurrite.';
+$lang['error_download'] = 'Impossibile discargar le file del plug-in: %s';
+$lang['error_badurl'] = 'URL probabilemente invalide; impossibile determinar le nomine del file ex le URL';
+$lang['error_dircreate'] = 'Impossibile crear le dossier temporari pro reciper le discargamento';
+$lang['error_decompress'] = 'Le gestor de plug-ins non poteva decomprimer le file discargate. Isto pote esser le resultato de un discargamento defectuose, in le qual caso tu deberea probar lo de novo; o le formato de compression pote esser incognite, in le qual caso tu debe discargar e installar le plug-in manualmente.';
+$lang['error_copy'] = 'Il occurreva un error durante le tentativa de installar files pro le plugin <em>%s</em>: le disco pote esser plen o le permissiones de accesso a files pote esser incorrecte. Isto pote haber resultate in un plug-in partialmente installate e lassar tu installation del wiki instabile.';
+$lang['error_delete'] = 'Il occurreva un error durante le tentativa de deler le plug-in <em>%s</em>. Le causa le plus probabile es insufficiente permissiones de files o directorios.';
+$lang['enabled'] = 'Plug-in %s activate.';
+$lang['notenabled'] = 'Le plug-in %s non poteva esser activate; verifica le permissiones de accesso a files.';
+$lang['disabled'] = 'Plug-in %s disactivate.';
+$lang['notdisabled'] = 'Le plug-in %s non poteva esser disactivate; verifica le permissiones de accesso a files.';
diff --git a/lib/plugins/plugin/lang/it/admin_plugin.txt b/lib/plugins/plugin/lang/it/admin_plugin.txt
index 1c0d5dc7b..5591f08fe 100644
--- a/lib/plugins/plugin/lang/it/admin_plugin.txt
+++ b/lib/plugins/plugin/lang/it/admin_plugin.txt
@@ -1,4 +1,3 @@
====== Gestione Plugin ======
-Su questa pagina puoi gestire tutto ciò che riguarda i [[doku>plugins|plugin]] di DokuWiki. Per poter scaricare e installare un plugin, il webserver deve avere accesso in scrittura alla cartella dei plugin.
-
+In questa pagina puoi gestire tutto ciò che riguarda i [[doku>plugins|plugin]] di DokuWiki. Per poter scaricare e installare un plugin, il webserver deve avere accesso in scrittura alla directory dei plugin. \ No newline at end of file
diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php
index 909c5eacb..3e9d855ec 100644
--- a/lib/plugins/plugin/lang/it/lang.php
+++ b/lib/plugins/plugin/lang/it/lang.php
@@ -17,7 +17,7 @@ $lang['download'] = 'Scarica e installa un nuovo plugin';
$lang['manage'] = 'Plugin installati';
$lang['btn_info'] = 'info';
$lang['btn_update'] = 'aggiorna';
-$lang['btn_delete'] = 'cancella';
+$lang['btn_delete'] = 'elimina';
$lang['btn_settings'] = 'configurazione';
$lang['btn_download'] = 'Scarica';
$lang['btn_enable'] = 'Salva';
@@ -30,9 +30,9 @@ $lang['updating'] = 'Aggiornamento in corso ...';
$lang['updated'] = 'Aggiornamento plugin %s riuscito';
$lang['updates'] = 'Aggiornamento dei seguenti plugin riuscito:';
$lang['update_none'] = 'Nessun aggiornamento trovato.';
-$lang['deleting'] = 'Cancellazione in corso ...';
-$lang['deleted'] = 'Plugin %s cancellato.';
-$lang['downloading'] = 'Download in corso ...';
+$lang['deleting'] = 'Eliminazione in corso ...';
+$lang['deleted'] = 'Plugin %s eliminato.';
+$lang['downloading'] = 'Scaricamento in corso ...';
$lang['downloaded'] = 'Installazione plugin %s riuscita';
$lang['downloads'] = 'Installazione dei seguenti plugin riuscita:';
$lang['download_none'] = 'Nessun plugin trovato, oppure si è verificato un problema sconosciuto durante il download e l\'installazione.';
@@ -51,7 +51,7 @@ $lang['error_badurl'] = 'Possibile URL non corretta - impossibile deter
$lang['error_dircreate'] = 'Impossibile creare la directory temporanea dove scaricare il file';
$lang['error_decompress'] = 'Impossibile decomprimere il file scaricato. Questo potrebbe essere il risultato di un download incompleto, in tal caso dovresti provare di nuovo; oppure il formato di compressione potrebbe essere sconosciuto, in questo caso è necessario scaricare e installare il plugin manualmente.';
$lang['error_copy'] = 'Si è verificato un errore nella copia di un file durante l\'installazione del plugin <em>%s</em>: il disco potrebbe essere pieno oppure i permessi di accesso al file potrebbero non essere corretti. Il plugin potrebbe essere stato installato solo parzialmente, questo potrebbe causare instabilità al sistema.';
-$lang['error_delete'] = 'Si è verificato un errore durante la cancellazione del plugin <em>%s</em>. Molto probabilmente i permessi di acesso ai file o alla directory non sono sufficienti';
+$lang['error_delete'] = 'Si è verificato un errore durante l\'eliminazione del plugin <em>%s</em>. Molto probabilmente i permessi di acesso ai file o alla directory non sono sufficienti';
$lang['enabled'] = 'Plugin %s abilitato.';
$lang['notenabled'] = 'Impossibile abilitare il plugin %s, verifica i permessi dei file.';
$lang['disabled'] = 'Plugin %s disabilitato.';
diff --git a/lib/plugins/plugin/lang/lb/admin_plugin.txt b/lib/plugins/plugin/lang/lb/admin_plugin.txt
new file mode 100644
index 000000000..223de10e8
--- /dev/null
+++ b/lib/plugins/plugin/lang/lb/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== Plugin Management ======
+
+Op dëser Säit kanns de alles verwalte wat mat Dokuwiki [[doku>plugins|Pluginen]] ze dinn huet. Fir e Plugin kënnen z'installéieren, muss däi Pluginverzeechnës vum Webserver schreiwbar sinn.
+
diff --git a/lib/plugins/plugin/lang/lb/lang.php b/lib/plugins/plugin/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/plugin/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
diff --git a/lib/plugins/plugin/lang/mk/lang.php b/lib/plugins/plugin/lang/mk/lang.php
new file mode 100644
index 000000000..85f73a09f
--- /dev/null
+++ b/lib/plugins/plugin/lang/mk/lang.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
+$lang['menu'] = 'Уреди ги приклучоците';
+$lang['download'] = 'Симни и инсталирај нов приклучок';
+$lang['manage'] = 'Инсталирани приклучоци';
+$lang['btn_info'] = 'информации';
+$lang['btn_update'] = 'ажурирај';
+$lang['btn_delete'] = 'избриши';
+$lang['btn_settings'] = 'поставувања';
+$lang['btn_download'] = 'Симни';
+$lang['btn_enable'] = 'Зачувај';
+$lang['url'] = 'URL';
+$lang['installed'] = 'Инсталирани:';
+$lang['lastupdate'] = 'Последно ажурирани:';
+$lang['source'] = 'Извор:';
+$lang['unknown'] = 'непознат';
+$lang['updating'] = 'Ажурирам...';
+$lang['updated'] = 'Приклучокот % е успешно ажуриран';
+$lang['updates'] = 'Следниве приклучоци се успешно ажурирани';
+$lang['update_none'] = 'Нема потребни ажурирања.';
+$lang['deleting'] = 'Бришам...';
+$lang['deleted'] = 'Приклучокот %s е избришан.';
+$lang['downloading'] = 'Симнувам...';
+$lang['downloaded'] = 'Приклучокот % е успешно инсталиран';
+$lang['downloads'] = 'Следниве приклучоци се успешно инсталирани';
+$lang['download_none'] = 'Нема пронајдени приклучоци, или имаше непознат проблем при симнување и инсталирање.';
+$lang['plugin'] = 'Приклучок:';
+$lang['components'] = 'Компоненти';
+$lang['noinfo'] = 'Овој приклучок не врати информации, може да не е валиден.';
+$lang['name'] = 'Име:';
+$lang['date'] = 'Датум:';
+$lang['type'] = 'Тип:';
+$lang['desc'] = 'Опис:';
+$lang['author'] = 'Автор:';
+$lang['www'] = 'Веб:';
+$lang['error'] = 'Се појави непозната грешка.';
+$lang['error_download'] = 'Не сум во можност да ја симнам датотеката за приклучокот: %s';
+$lang['enabled'] = 'Приклучокот %s е овозможен.';
+$lang['disabled'] = 'Приклучокот %s е оневозможен.';
diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php
index c9f74bd52..b5f813f03 100644
--- a/lib/plugins/plugin/lang/pl/lang.php
+++ b/lib/plugins/plugin/lang/pl/lang.php
@@ -8,6 +8,8 @@
* @author Mariusz Kujawski <marinespl@gmail.com>
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['menu'] = 'Menadżer wtyczek';
$lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę';
diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php
index d0c14459a..57052706e 100644
--- a/lib/plugins/plugin/lang/pt-br/lang.php
+++ b/lib/plugins/plugin/lang/pt-br/lang.php
@@ -13,6 +13,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['menu'] = 'Gerenciar Plug-ins';
$lang['download'] = 'Baixar e instalar um novo plug-in';
diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php
index 0bcddaa70..514b38bc2 100644
--- a/lib/plugins/plugin/lang/ru/lang.php
+++ b/lib/plugins/plugin/lang/ru/lang.php
@@ -12,6 +12,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['menu'] = 'Управление плагинами';
$lang['download'] = 'Скачать и установить новый плагин';
diff --git a/lib/plugins/plugin/lang/sq/admin_plugin.txt b/lib/plugins/plugin/lang/sq/admin_plugin.txt
new file mode 100644
index 000000000..2e1f19234
--- /dev/null
+++ b/lib/plugins/plugin/lang/sq/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Menaxhimi i Plugin-eve ======
+
+Në këtë faqe mund të menaxhoni çdo gjë që ka të bëjë me [[doku>plugins|plugin-et]] Dokuwiki. Që të jetë në gjendje për të shkarkuar dhe instaluar një plugin, dosja e plugin-it duhet të jetë e shkrueshme nga webserver-i. \ No newline at end of file
diff --git a/lib/plugins/plugin/lang/sq/lang.php b/lib/plugins/plugin/lang/sq/lang.php
new file mode 100644
index 000000000..9ddcf527f
--- /dev/null
+++ b/lib/plugins/plugin/lang/sq/lang.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['menu'] = 'Menaxho Plugin-et';
+$lang['download'] = 'Shkarko dhe instalo një plugin të ri';
+$lang['manage'] = 'Plugin-et e Instaluar';
+$lang['btn_info'] = 'info';
+$lang['btn_update'] = 'përditëso';
+$lang['btn_delete'] = 'fshi';
+$lang['btn_settings'] = 'settings';
+$lang['btn_download'] = 'Shkarko';
+$lang['btn_enable'] = 'Ruaj';
+$lang['url'] = 'URL';
+$lang['installed'] = 'Të instaluar:';
+$lang['lastupdate'] = 'Përditësuar së fundmi:';
+$lang['source'] = 'Kodi Burim:';
+$lang['unknown'] = 'e panjohur';
+$lang['updating'] = 'Duke u përditësuar...';
+$lang['updated'] = 'Plugini %s u përditësua me sukses';
+$lang['updates'] = 'Plugin-et e mëposhtme u përditësuan me sukses';
+$lang['update_none'] = 'Nuk u gjetën përditësime.';
+$lang['deleting'] = 'Duke fshirë...';
+$lang['deleted'] = 'Plugini %s u fshi.';
+$lang['downloading'] = 'Duke shkarkuar...';
+$lang['downloaded'] = 'Plugini %s u instalua me sukses';
+$lang['downloads'] = 'Plugin-et e mëposhtëm u instaluan me sukses:';
+$lang['download_none'] = 'Asnjë plugin nuk u gjend, ose ka ndodhur një gabim i panjohur gjatë shkarkimit dhe instalimit.';
+$lang['plugin'] = 'Plugin:';
+$lang['components'] = 'Përbërësit:';
+$lang['noinfo'] = 'Ky plugin nuk ktheu asnjë informacion, mund të jetë i pavlefshëm.';
+$lang['name'] = 'Emri:';
+$lang['date'] = 'Data:';
+$lang['type'] = 'Tipi:';
+$lang['desc'] = 'Përshkrimi:';
+$lang['author'] = 'Autori:';
+$lang['www'] = 'Web:';
+$lang['error'] = 'Ndodhi një gabim i panjohur.';
+$lang['error_download'] = 'Nuk mundi të shkarkohej skedari i plugin-it: %s';
+$lang['error_badurl'] = 'Dyshohet url e prishur - nuk mund të gjendet emri i skedarit nga url-ja';
+$lang['error_dircreate'] = 'Nuk mundi të krijohej dosja e përkohshme për të marë shkarkimin.';
+$lang['error_decompress'] = 'Menaxhuesi i plugin-eve nuk ishte në gjendje të dekompresonte skedarin e shkarkuar. Kjo mund të jetë si rezultat i një shkarkimi të keq, në këtë rast duhet të provoni përsëri; ose formati i kompresimit mund të jetë i panjohur, në këtë rast do t\'ju duhet ta shkarkoni dhe instaloni plugin-in manualisht.';
+$lang['error_copy'] = 'Ndodhi gabim kopjim-skedari gjatë përpjekjes për të instaluar skedarët për plugin-in <em>%s</em>: disku mund të jetë plotë ose të drejtat për aksesim skedari mund të jenë të gabuara. Kjo mund të ketë shkaktuar një instalim të pjesshëm të plugin-it dhe ta lërë instalimin e wiki-t tënd të paqëndrueshëm.';
+$lang['error_delete'] = 'Ndodhi një gabim gjatë përpjekjes për të fshirë plugin-in <em>%s</em>. Shkaku më i mundshëm është të drejta të pamjaftueshme për aksesim skedari ose dosjeje.';
+$lang['enabled'] = 'Plugini %s u aktivizua.';
+$lang['notenabled'] = 'Plugini %s nuk mundi të aktivizohej, kontrollo të drejtat e aksesit për skedarin.';
+$lang['disabled'] = 'Plugin %s është i paaktivizuar.';
+$lang['notdisabled'] = 'Plugini %s nuk mundi të çaktivizohej, kontrollo të drejtat e aksesit për skedarin.';
diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index f190e29b3..146bf54b6 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -4,6 +4,7 @@
*
* @author Bohumir Zamecnik <bohumir@zamecnik.org>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['name'] = 'Průzkum používání (může chviličku trvat, než se natáhne)';
$lang['submit'] = 'Odeslat data';
diff --git a/lib/plugins/popularity/lang/de-informal/intro.txt b/lib/plugins/popularity/lang/de-informal/intro.txt
index 1aa31a6b5..4dfbb9ea6 100644
--- a/lib/plugins/popularity/lang/de-informal/intro.txt
+++ b/lib/plugins/popularity/lang/de-informal/intro.txt
@@ -1,9 +1,9 @@
-===== Rückkopplung zur Zufriedenheit =====
+===== Rückmeldung zur Zufriedenheit =====
Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Nutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind.
-Du wirst angehalten diesen Schritt von Zeit zu Zeit erneut zu machen um die Entwickler zu infomieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen ID zugeordnet.
+Du wirst angehalten diesen Schritt von Zeit zu Zeit erneut zu machen um die Entwickler zu informieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen Identifikationsnummer zugeordnet.
-Die gesammelten Daten enthalten Infomrationen über deine Version von DokuWiki, die Anzahl und Größe der Seiten und Dateien, installierte Erweiterungen und informationen über deine PHP-Version.
+Die gesammelten Daten enthalten Informationen über deine Version von DokuWiki, die Anzahl und Größe der Seiten und Dateien, installierte Erweiterungen und Informationen über deine PHP-Version.
-Die Rohdaten die gesendet werden, werden unten gezeigt. Bitte nutze den "Send Data" Knopf um die Informationen zu übermitteln. \ No newline at end of file
+Die Rohdaten die gesendet werden, werden unten gezeigt. Bitte nutze den "Sende Daten" Knopf um die Informationen zu übermitteln. \ No newline at end of file
diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php
index e6bd28f04..004d028e0 100644
--- a/lib/plugins/popularity/lang/de-informal/lang.php
+++ b/lib/plugins/popularity/lang/de-informal/lang.php
@@ -4,7 +4,7 @@
*
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
$lang['name'] = 'Polularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)';
$lang['submit'] = 'Sende Daten';
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index 8fedc329e..e349e5ea5 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -13,6 +13,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['name'] = 'Retroinformación (Feedback) plugin Popularity';
$lang['submit'] = 'Enviar datos';
diff --git a/lib/plugins/popularity/lang/fr/intro.txt b/lib/plugins/popularity/lang/fr/intro.txt
index 8e8adbb3c..58be61d03 100644
--- a/lib/plugins/popularity/lang/fr/intro.txt
+++ b/lib/plugins/popularity/lang/fr/intro.txt
@@ -4,7 +4,7 @@ Cet outil collecte des données anonymes concernant votre wiki et vous permet de
Vous êtes encouragé à répéter l'opération de collecte et d'envoi des données anonymes de temps en temps afin d'informer les développeurs de la croissance de votre wiki.
-Les données collectées contiennent des informations telle que votre version de DokuWiki, le nombre et la taille de vos pages et fichiers, les plugins installés ainsi que des informations sur la version de PHP installée.
+Les données collectées contiennent des informations telle que votre version de DokuWiki, le nombre et la taille de vos pages et fichiers, les modules installés ainsi que des informations sur la version de PHP installée.
-Les données brutes qui sont envoyées sont affichées ci dessous. Merci d'utiliser le bouton "Envoyer les données" pour expédier l'information.
+Les données brutes qui sont envoyées sont affichées ci dessous. Merci d'utiliser le bouton « Envoyer les données » pour expédier l'information.
diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php
index fdba3ac98..45cc7b593 100644
--- a/lib/plugins/popularity/lang/fr/lang.php
+++ b/lib/plugins/popularity/lang/fr/lang.php
@@ -9,6 +9,8 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
$lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargé)';
$lang['submit'] = 'Envoyer les données';
diff --git a/lib/plugins/popularity/lang/gl/intro.txt b/lib/plugins/popularity/lang/gl/intro.txt
index d81903797..72f03e012 100644
--- a/lib/plugins/popularity/lang/gl/intro.txt
+++ b/lib/plugins/popularity/lang/gl/intro.txt
@@ -1,10 +1,10 @@
-====== Resposta de popularidade ======
+====== Resposta de Popularidade ======
-Esta ferramenta recolle datos anónimos sobre o seu wiki e permítelle envialos ás persoas desenvolvedoras do DokuWiki. Isto axudaralles a ter unha idea do modo en que se emprega o DokuWiki por parte das súas persoas usuarias e garante que as decisións de desenvolvemento futuro coincidan coas estadísticas de uso no mundo real.
+Esta ferramenta recolle datos anónimos verbo do teu wiki e permíteche enviarllos aos desenvolvedores do DokuWiki. Isto axudaralles a ter unha idea do xeito en que se emprega o DokuWiki por parte dos seus usuarios, e asegura que as decisións de desenvolvemento futuro coincidan coas estatísticas de uso no mundo real.
-Animámolo a executar este proceso de cando en vez, para manter informadas ás persoas desenvolvedoras a medida que o seu wiki vaia medrando. Os seus conxuntos de datos repetidos seran identificados por un ID anónimo.
+Animámoste a levar a cabo este proceso de cando en vez para manteres informados aos desenvolvedores a medida que o teu wiki vaia medrando. Os teus xogos de datos repetidos seran identificados por un ID anónimo.
-Os datos recompilados conteñen informacións do tipo: versión do Dokuwiki, número e tamaño das páxinas e ficheiros, plugins instalados e informacións sobre a súa instalación do PHP.
+Os datos recompilados conteñen información como a versión do teu Dokuwiki, o número e tamaño das túas páxinas e arquivos, as extensións instaladas e información verbo da túa instalación do PHP.
-Os datos en bruto que serán enviados móstranse abaixo. Empregue o botón "Enviar os datos" para transferir a información.
+Os datos en bruto que serán enviados amósanse embaixo. Por favor, emprega o botón "Enviar Datos" para transferires a información.
diff --git a/lib/plugins/popularity/lang/gl/lang.php b/lib/plugins/popularity/lang/gl/lang.php
index 116a73256..3e7d9275b 100644
--- a/lib/plugins/popularity/lang/gl/lang.php
+++ b/lib/plugins/popularity/lang/gl/lang.php
@@ -2,9 +2,7 @@
/**
* Galician language file
*
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
-$lang['name'] = 'Resposta de popularidade (pode demorar un tempo a cargar)';
-$lang['submit'] = 'Enviar os datos';
+$lang['name'] = 'Resposta de Popularidade (pode demorar un tempo a cargar)';
+$lang['submit'] = 'Enviar Datos';
diff --git a/lib/plugins/popularity/lang/ia/intro.txt b/lib/plugins/popularity/lang/ia/intro.txt
new file mode 100644
index 000000000..d31c3653f
--- /dev/null
+++ b/lib/plugins/popularity/lang/ia/intro.txt
@@ -0,0 +1,9 @@
+====== Datos de popularitate ======
+
+Iste instrumento collige datos anonyme super tu wiki e te permitte inviar los retro al disveloppatores de DokuWiki. Isto les adjuta de comprender como DokuWiki es usate per su usatores e assecura que le decisiones super le disveloppamento futur si basate super statisticas de uso ex le mundo real.
+
+Tu es incoragiate a repeter iste procedura de tempore a tempore pro continuar a informar le disveloppatores quando tu wiki cresce. Tu collectiones repetite de datos essera identificate per un ID anonyme.
+
+Le datos colligite contine informationes como tu version de DokuWiki, le numero e dimension de tu paginas e files, plug-ins installate e information super tu installation de PHP.
+
+Le datos crude que essera inviate es monstrate hic infra. Per favor usa le button "Inviar datos" pro transferer le informationes. \ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ia/lang.php b/lib/plugins/popularity/lang/ia/lang.php
new file mode 100644
index 000000000..4a45f04f3
--- /dev/null
+++ b/lib/plugins/popularity/lang/ia/lang.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['name'] = 'Datos de popularitate (pote prender alcun tempore pro cargar)';
+$lang['submit'] = 'Inviar datos';
diff --git a/lib/plugins/popularity/lang/it/intro.txt b/lib/plugins/popularity/lang/it/intro.txt
index c725110b7..62303eca7 100644
--- a/lib/plugins/popularity/lang/it/intro.txt
+++ b/lib/plugins/popularity/lang/it/intro.txt
@@ -1,8 +1,8 @@
====== Raccolta dati sul wiki ======
-Questo strumento raccoglie dati anonimi sul tuo wiki e ti permette di inviarli agli sviluppatori di Dokuwiki. Questo aiuta loro a capire come Dokuwiki viene utilizzato dagli utenti e prendere decisioni future sullo sviluppo in base a quello che sono le reali statistiche di utilizzo da parte degli utenti.
+Questo strumento raccoglie dati anonimi sul tuo wiki e ti permette di inviarli agli sviluppatori di Dokuwiki. Questo aiuta loro a capire come Dokuwiki viene utilizzato dagli utenti e prendere decisioni future sullo sviluppo in base a quelle che sono le reali statistiche di utilizzo da parte degli utenti.
-Ti incoraggiamo a ripetere questa operazione più spesso per mantenere informati gli sviluppatori sulla crescita del tuo wiki. L'insieme dei dati raccolti saranno identificati tramite un ID anonimo.
+Ti incoraggiamo a ripetere questa operazione al più spesso per mantenere informati gli sviluppatori sulla crescita del tuo wiki. L'insieme dei dati raccolti saranno identificati tramite un ID anonimo.
I dati raccolti contengono informazioni come la versione di DokuWiki, il numero e le dimensioni delle pagine e dei files, i plugins installati e qualche informazione sulla versione di PHP presente nel sistema.
diff --git a/lib/plugins/popularity/lang/lb/lang.php b/lib/plugins/popularity/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/popularity/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
diff --git a/lib/plugins/popularity/lang/mk/lang.php b/lib/plugins/popularity/lang/mk/lang.php
new file mode 100644
index 000000000..6d4530f79
--- /dev/null
+++ b/lib/plugins/popularity/lang/mk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php
index 0f15863ae..02a1f21b6 100644
--- a/lib/plugins/popularity/lang/pl/lang.php
+++ b/lib/plugins/popularity/lang/pl/lang.php
@@ -6,6 +6,8 @@
* @author Mariusz Kujawski <marinespl@gmail.com>
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)';
$lang['submit'] = 'Wyślij dane';
diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php
index 40e1797f3..67732e8ef 100644
--- a/lib/plugins/popularity/lang/pt-br/lang.php
+++ b/lib/plugins/popularity/lang/pt-br/lang.php
@@ -12,6 +12,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['name'] = 'Retorno de popularidade (pode demorar um pouco para carregar)';
$lang['submit'] = 'Enviar dados';
diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php
index 3caa4d27c..d6c5964db 100644
--- a/lib/plugins/popularity/lang/ru/lang.php
+++ b/lib/plugins/popularity/lang/ru/lang.php
@@ -9,6 +9,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['name'] = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)';
$lang['submit'] = 'Отправить данные';
diff --git a/lib/plugins/popularity/lang/sq/intro.txt b/lib/plugins/popularity/lang/sq/intro.txt
new file mode 100644
index 000000000..eb37e5f36
--- /dev/null
+++ b/lib/plugins/popularity/lang/sq/intro.txt
@@ -0,0 +1,9 @@
+====== Informacioni mbi Popullaritetin ======
+
+Ky mjet mbledh të dhëna anonime rreth wiki-t tuaj dhe ju lejon t'ia dërgoni ato zhvilluesve të DokuWiki-t. Kjo i ndihmon ata të kuptojnë sesi DokuWiki përdoret nga përdoruesit e tij dhe siguron që vendimet për zhvillime të ardhshme të jenë të mbështetura mbi statistika të nxjera nga bota e vërtetë.
+
+Ju jeni të inkurajuar ta përsërisni këtë hap shpesh herë për t'i mbajtur zhvilluesit të informuar kur wiki juaj rritet. Bashkësia e të dhënave tuaja të përsëritura do të identifikohen nga një ID anonime.
+
+Të dhënat e mbledhura përmbajnë informacione si versioni i DokuWiki-t tuaj, numri dhe madhësia e faqeve dhe skedarëve, plugin-et e instaluar dhe informacione rreth instalimit të PHP-së.
+
+Të dhënat e papërpunuara që do të dërgohen janë treguar më poshtë. Ju lutem përdorni buttonin "Dërgo Të Dhëna" për të transferuar informacionin. \ No newline at end of file
diff --git a/lib/plugins/popularity/lang/sq/lang.php b/lib/plugins/popularity/lang/sq/lang.php
new file mode 100644
index 000000000..1954ce04c
--- /dev/null
+++ b/lib/plugins/popularity/lang/sq/lang.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['name'] = 'Informacioni mbi Popullaritetin (mund të marë ca kohë derisa të ngarkohet)';
+$lang['submit'] = 'Dërgo Të Dhënat';
diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php
index cdfe0e96c..5bb5334ae 100644
--- a/lib/plugins/revert/lang/cs/lang.php
+++ b/lib/plugins/revert/lang/cs/lang.php
@@ -7,6 +7,7 @@
* @author Bohumir Zamecnik <bohumir@zamecnik.org>
* @author Zbynek Krivka <zbynek.krivka@seznam.cz>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['menu'] = 'Obnova zaspamovaných stránek';
$lang['filter'] = 'Hledat zaspamované stránky';
diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php
index 974801bcb..6ed87e82e 100644
--- a/lib/plugins/revert/lang/de-informal/lang.php
+++ b/lib/plugins/revert/lang/de-informal/lang.php
@@ -4,12 +4,11 @@
*
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
-$lang['menu'] = 'Seiten wieder herstellen';
-$lang['filter'] = 'Nach betroffenen Seiten suchen';
-$lang['revert'] = 'Ausgewählte Seiten wieder herstellen';
-$lang['reverted'] = '%s wieder hergestellt zu Version %s';
+$lang['menu'] = 'Zurückstellungsmanager';
+$lang['revert'] = 'Stelle ausgewählte Seiten zurück.';
+$lang['reverted'] = '%s zu Revision %s zurückgesetzt';
$lang['removed'] = '%s entfernt';
$lang['revstart'] = 'Zurückstellungsprozess gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stopt, sollten Sie es in kleineren Stücken versuchen.';
$lang['revstop'] = 'Zurückstellungsprozess erfolgreich beendet.';
diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php
index 2886528d6..fd3e2e0bf 100644
--- a/lib/plugins/revert/lang/es/lang.php
+++ b/lib/plugins/revert/lang/es/lang.php
@@ -15,6 +15,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['menu'] = 'Restaurador';
$lang['filter'] = 'Buscar páginas con spam';
diff --git a/lib/plugins/revert/lang/fr/intro.txt b/lib/plugins/revert/lang/fr/intro.txt
index db61ac9cf..6dcbe74b9 100644
--- a/lib/plugins/revert/lang/fr/intro.txt
+++ b/lib/plugins/revert/lang/fr/intro.txt
@@ -1,3 +1,3 @@
-====== Gestion des réversions ======
+====== Gestionnaire de réversions ======
-Cette page peut vous aider à restaurer des pages après une attaque de spam. Pour trouver la liste des pages victimes des spammeurs, entrez un motif de recherche (tel qu'une URL de spam), puis confirmez que les pages trouvées contiennent du spam et annulez leurs éditions.
+Cette page peut vous aider à restaurer des pages après une attaque de spam. Pour trouver la liste des pages vandalisées, entrez un motif de recherche (p. ex. une URL de spam), puis confirmez que les pages trouvées contiennent du spam et annulez leurs éditions.
diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php
index 8d17280d4..982b44f5a 100644
--- a/lib/plugins/revert/lang/fr/lang.php
+++ b/lib/plugins/revert/lang/fr/lang.php
@@ -10,13 +10,15 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
$lang['menu'] = 'Gestionnaire de réversions';
$lang['filter'] = 'Trouver les pages spammées ';
-$lang['revert'] = 'Annuler les éditions sélectionnées';
+$lang['revert'] = 'Annuler les modifications sélectionnées';
$lang['reverted'] = '%s restauré à la révision %s';
$lang['removed'] = '%s supprimé';
$lang['revstart'] = 'Processus de réversion démarré. Ceci peut prendre longtemps. Si le script dépasse le délai avant de terminer, vous devrez restaurer de plus petits groupes de pages.';
$lang['revstop'] = 'Processus de réversion terminé avec succès.';
-$lang['note1'] = 'Note : cette recherche est insensible à la casse';
-$lang['note2'] = 'Note: cette page sera révisée à la version précédente ne contenant pas le terme spammeur <i>%s</i>.';
+$lang['note1'] = 'Note : cette recherche est insensible à la casse';
+$lang['note2'] = 'Note : cette page sera révisée à la version précédente ne contenant pas le terme spammeur <em>%s</em>.';
diff --git a/lib/plugins/revert/lang/gl/intro.txt b/lib/plugins/revert/lang/gl/intro.txt
index 81e98f1d5..6327249fc 100644
--- a/lib/plugins/revert/lang/gl/intro.txt
+++ b/lib/plugins/revert/lang/gl/intro.txt
@@ -1,3 +1,3 @@
-====== Xestor de recuperación ======
+====== Xestor de Reversión ======
-Esta páxina axudarao a se recuperar automaticamente dun ataque de spam. Para encontrar unha listaxe de páxinas que conteñan spam, primeiro debe inserir unha cadea de procura (por ex. un URL de spam) e despois confirmar que as páxinas encontradas conteñen realmente spam, antes de reverter as edicións.
+Esta páxina axudarache a revertir automaticamente un ataque de correo-lixo. Para atopares unha listaxe de páxinas que conteñan correo-lixo, primeiro debes inserir unha cadea de procura (p.e. un URL do correo-lixo), e logo confirmares que as páxinas atopadas conteñen realmente o tal correo-lixo e reverter as edicións. \ No newline at end of file
diff --git a/lib/plugins/revert/lang/gl/lang.php b/lib/plugins/revert/lang/gl/lang.php
index 33472090d..87bce32ba 100644
--- a/lib/plugins/revert/lang/gl/lang.php
+++ b/lib/plugins/revert/lang/gl/lang.php
@@ -2,16 +2,14 @@
/**
* Galicianlanguage file
*
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
-$lang['menu'] = 'Xestor de recuperación';
-$lang['filter'] = 'Procurar páxinas con spam';
-$lang['revert'] = 'Recuperar as páxinas seleccionadas';
-$lang['reverted'] = '%s foi revertida á revisión %s';
-$lang['removed'] = '%s foi eliminada';
-$lang['revstart'] = 'O proceso de recuperación foi iniciado. Isto podería demorar un certo tempo. Se o script falla por ter superado o seu límite de tempo antes de rematar, terá que efectuar a recuperación sobre fragmentos máis pequenos.';
-$lang['revstop'] = 'O proceso de recuperación rematou correctamente.';
-$lang['note1'] = 'Nota: Esta procura distingue entre maiúsculas e minúsculas';
-$lang['note2'] = 'Nota: A páxina será revertida á última versión que non conteña o termo de spam <i>%s</i> indicado.';
+$lang['menu'] = 'Xestor de Reversión';
+$lang['filter'] = 'Procurar páxinas con correo-lixo';
+$lang['revert'] = 'Revertir as páxinas seleccionadas';
+$lang['reverted'] = '%s revertido á revisión %s';
+$lang['removed'] = '%s eliminado';
+$lang['revstart'] = 'Proceso de reversión iniciado. Isto podería demorar un anaco longo. Se o script fallar por superar o seu límite de tempo denantes de rematar, terás que facer a reversión en anacos máis pequenos.';
+$lang['revstop'] = 'O proceso de reversión rematou correctamente.';
+$lang['note1'] = 'Nota: esta procura distingue entre maiúsculas e minúsculas';
+$lang['note2'] = 'Nota: a páxina revertirase á última versión que non conteña o termo de correo-lixo <i>%s</i> indicado.';
diff --git a/lib/plugins/revert/lang/ia/intro.txt b/lib/plugins/revert/lang/ia/intro.txt
new file mode 100644
index 000000000..ae548e9df
--- /dev/null
+++ b/lib/plugins/revert/lang/ia/intro.txt
@@ -0,0 +1,3 @@
+====== Gestion de reversiones ======
+
+Iste pagina te adjuta con le reversion automatic de un attacco de spam. Pro cercar un lista de paginas spammose, primo entra un texto a cercar (p.ex. un URL de spam), postea confirma que le paginas trovate es realmente spam e reverte le modificationes. \ No newline at end of file
diff --git a/lib/plugins/revert/lang/ia/lang.php b/lib/plugins/revert/lang/ia/lang.php
new file mode 100644
index 000000000..bec2eca7b
--- /dev/null
+++ b/lib/plugins/revert/lang/ia/lang.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['menu'] = 'Gestion de reversiones';
+$lang['filter'] = 'Cercar paginas spammose';
+$lang['revert'] = 'Reverter le paginas seligite';
+$lang['reverted'] = '%s revertite al version %s';
+$lang['removed'] = '%s removite';
+$lang['revstart'] = 'Le processo de reversion ha comenciate. Isto pote durar multo. Si le script expira ante de finir, tu debe divider le reversiones in blocos minor.';
+$lang['revstop'] = 'Le processo de reversion ha succedite.';
+$lang['note1'] = 'Nota: iste recerca distingue inter majusculas e minusculas.';
+$lang['note2'] = 'Nota: le pagina essera revertite al ultime version que non contine le termino de spam specificate, <i>%s</i>.';
diff --git a/lib/plugins/revert/lang/it/intro.txt b/lib/plugins/revert/lang/it/intro.txt
index 1577af7ec..a5ef14680 100644
--- a/lib/plugins/revert/lang/it/intro.txt
+++ b/lib/plugins/revert/lang/it/intro.txt
@@ -1,3 +1,3 @@
====== Gestore di ripristini ======
-Questa pagina aiuta il controllo automatico degli attacchi spam. Per cercare una lista delle pagine con spam, inserisci innanzitutto una stringa di ricerca (ad esempio l'URL di un sito di spam), quindi conferma che le pagine trovate contengono realmente spam e ripristinale ad una versione precedente.
+Questa pagina aiuta il controllo automatico degli attacchi spam. Per cercare una lista delle pagine con spam, inserisci innanzitutto una stringa di ricerca (ad esempio l'URL di un sito di spam), quindi Verifica che le pagine trovate contengano realmente spam e ripristinale ad una versione precedente.
diff --git a/lib/plugins/revert/lang/lb/intro.txt b/lib/plugins/revert/lang/lb/intro.txt
new file mode 100644
index 000000000..59c5dfc14
--- /dev/null
+++ b/lib/plugins/revert/lang/lb/intro.txt
@@ -0,0 +1,3 @@
+====== Revert Manager ======
+
+Dës Säit hëlleft bei der automatescher zerécksetzung no enger Spamattack. Fir eng Lëscht vun zougespamte Säiten ze fannen, gëff fir d'éischt e Sichbegrëff an (z.B. eng Spamadress). Konfirméier dann dass déi Säite wierklech zougespamt goufen a setz se dann zréck. \ No newline at end of file
diff --git a/lib/plugins/revert/lang/lb/lang.php b/lib/plugins/revert/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/revert/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
diff --git a/lib/plugins/revert/lang/mk/lang.php b/lib/plugins/revert/lang/mk/lang.php
new file mode 100644
index 000000000..6d4530f79
--- /dev/null
+++ b/lib/plugins/revert/lang/mk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php
index 8ad68b5f8..437daf3d7 100644
--- a/lib/plugins/revert/lang/pl/lang.php
+++ b/lib/plugins/revert/lang/pl/lang.php
@@ -5,6 +5,8 @@
* @author Mariusz Kujawski <marinespl@gmail.com>
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['menu'] = 'Menadżer przywracania';
$lang['filter'] = 'Wyszukaj uszkodzone strony';
diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php
index 93c8bf4e1..4ee4432ee 100644
--- a/lib/plugins/revert/lang/pt-br/lang.php
+++ b/lib/plugins/revert/lang/pt-br/lang.php
@@ -13,6 +13,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['menu'] = 'Gerenciador de reversões';
$lang['filter'] = 'Procura por páginas com spam';
diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php
index a78210777..3ac43bc89 100644
--- a/lib/plugins/revert/lang/ru/lang.php
+++ b/lib/plugins/revert/lang/ru/lang.php
@@ -10,6 +10,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['menu'] = 'Менеджер откаток';
$lang['filter'] = 'Поиск спам-страниц';
diff --git a/lib/plugins/revert/lang/sq/intro.txt b/lib/plugins/revert/lang/sq/intro.txt
new file mode 100644
index 000000000..25e16b6eb
--- /dev/null
+++ b/lib/plugins/revert/lang/sq/intro.txt
@@ -0,0 +1,3 @@
+====== Menaxhuesi Rikthimit ======
+
+Kjo faqe ndihmon për rikthimin automatik në rast të një sulmi spam. Për të gjetur një listë me faqe spam në fillim fut një varg kërkimi (psh një URL spam), dhe pastaj konfirmo që faqet e gjetura janë me të vërtetë spam dhe rikthe redaktimet. \ No newline at end of file
diff --git a/lib/plugins/revert/lang/sq/lang.php b/lib/plugins/revert/lang/sq/lang.php
new file mode 100644
index 000000000..45ae4997c
--- /dev/null
+++ b/lib/plugins/revert/lang/sq/lang.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['menu'] = 'Menaxhuesi Rikthimit';
+$lang['filter'] = 'Kërko faqe me spam';
+$lang['revert'] = 'Rikthe faqet e përzgjedhura';
+$lang['reverted'] = '%s u rikthye në rishikimin %s';
+$lang['removed'] = '%s u hoq';
+$lang['revstart'] = 'Proçesi i rikthimit filloi. Kjo mund të zgjasë për një kohë të gjatë. Nëse koha e skriptit mbaron para përfundimit, atëherë rikthimi duhet të bëhet me copa të vogla.';
+$lang['revstop'] = 'Proçesi i rikthimit mbaroi me sukses.';
+$lang['note1'] = 'Shënim: në këtë kërkim bëhet dallim midis gërmave kapitale dhe gërmave të vogla.';
+$lang['note2'] = 'Shënim: faqja do të rikthehet në versionin e fundit që nuk përmban term-in spam të dhënë <i>%s</i>.';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index 6f368bd0f..64686fb2d 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -6,6 +6,7 @@
* @author Zbynek Krivka <zbynek.krivka@seznam.cz>
* @author Bohumir Zamecnik <bohumir@zamecnik.org>
* @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
*/
$lang['menu'] = 'Správa uživatelů';
$lang['noauth'] = '(autentizace uživatelů není k dispozici)';
diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php
index b57f999db..be745565d 100644
--- a/lib/plugins/usermanager/lang/de-informal/lang.php
+++ b/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -4,7 +4,7 @@
*
* @author Alexander Fischer <tbanus@os-forge.net>
* @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
*/
$lang['menu'] = 'Benutzerverwalter';
$lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)';
@@ -20,8 +20,8 @@ $lang['value'] = 'Wert';
$lang['add'] = 'Zufügen';
$lang['delete'] = 'Löschen';
$lang['delete_selected'] = 'Lösche ausgewähltes';
-$lang['edit'] = 'Editieren';
-$lang['edit_prompt'] = 'Editiere den Benutzer';
+$lang['edit'] = 'Bearbeiten';
+$lang['edit_prompt'] = 'Bearbeite diesen Benutzer';
$lang['modify'] = 'Änderungen speichern';
$lang['search'] = 'Suchen';
$lang['search_prompt'] = 'Suche ausführen';
@@ -45,5 +45,5 @@ $lang['note_group'] = 'Neue Benutzer werden zur Standardgruppe (%s) h
$lang['note_pass'] = 'Das Passwort wird automatisch erzeugt, wenn das Feld freigelassen wird und der Benutzer Benachrichtigungen aktiviert hat.';
$lang['add_ok'] = 'Benutzer erfolgreich hinzugefügt';
$lang['add_fail'] = 'Hinzufügen des Benutzers fehlgeschlagen';
-$lang['notify_ok'] = 'Benachrichtigungsmail wurde versendet';
-$lang['notify_fail'] = 'Benachrichtigungsmail konnte nicht gesendet werden';
+$lang['notify_ok'] = 'Benachrichtigungsemail wurde versendet';
+$lang['notify_fail'] = 'Benachrichtigungsemail konnte nicht gesendet werden';
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index c11ebcd93..c3b345642 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -16,6 +16,7 @@
* @author Marvin Ortega <maty1206@maryanlinux.com>
* @author Daniel Castro Alvarado <dancas2@gmail.com>
* @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
*/
$lang['menu'] = 'Administración de usuarios';
$lang['noauth'] = '(la autenticación de usuarios no está disponible)';
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 9229ee8e8..6ae537618 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -11,6 +11,8 @@
* @author Erik Pedersen <erik.pedersen@shaw.ca>
* @author olivier duperray <duperray.olivier@laposte.net>
* @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
*/
$lang['menu'] = 'Gestion des utilisateurs';
$lang['noauth'] = '(authentification utilisateur non disponible)';
@@ -26,8 +28,8 @@ $lang['value'] = 'Valeur';
$lang['add'] = 'Ajouter';
$lang['delete'] = 'Supprimer';
$lang['delete_selected'] = 'Supprimer la sélection';
-$lang['edit'] = 'Éditer';
-$lang['edit_prompt'] = 'Éditer cet utilisateur';
+$lang['edit'] = 'Modifier';
+$lang['edit_prompt'] = 'Modifier cet utilisateur';
$lang['modify'] = 'Enregistrer les modifications';
$lang['search'] = 'Rechercher';
$lang['search_prompt'] = 'Effectuer la recherche';
@@ -37,9 +39,9 @@ $lang['summary'] = 'Affichage des utilisateurs %1$d-%2$d parmi %3$
$lang['nonefound'] = 'Aucun utilisateur trouvé. %d utilisateur(s) au total.';
$lang['delete_ok'] = '%d utilisateurs effacés';
$lang['delete_fail'] = '%d effacement échoué.';
-$lang['update_ok'] = 'utilisateur mis à jour avec succès';
-$lang['update_fail'] = 'échec de la mise à jour utilisateur';
-$lang['update_exists'] = 'échec du changement de nom d\'utilisateur, le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).';
+$lang['update_ok'] = 'Utilisateur mis à jour avec succès';
+$lang['update_fail'] = 'Échec de la mise à jour utilisateur';
+$lang['update_exists'] = 'Échec du changement de nom d\'utilisateur, le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).';
$lang['start'] = 'Démarrage';
$lang['prev'] = 'Précédent';
$lang['next'] = 'Suivant';
diff --git a/lib/plugins/usermanager/lang/gl/add.txt b/lib/plugins/usermanager/lang/gl/add.txt
index cd1c487ff..7602c36ec 100644
--- a/lib/plugins/usermanager/lang/gl/add.txt
+++ b/lib/plugins/usermanager/lang/gl/add.txt
@@ -1 +1 @@
-===== Engadir unha persoa usuaria =====
+===== Engadir usuario ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/gl/delete.txt b/lib/plugins/usermanager/lang/gl/delete.txt
index f13133d6f..4262a0c05 100644
--- a/lib/plugins/usermanager/lang/gl/delete.txt
+++ b/lib/plugins/usermanager/lang/gl/delete.txt
@@ -1 +1 @@
-===== Eliminar unha persoa usuaria =====
+===== Eliminar usuario ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/gl/edit.txt b/lib/plugins/usermanager/lang/gl/edit.txt
index d33f9c335..11ef62cce 100644
--- a/lib/plugins/usermanager/lang/gl/edit.txt
+++ b/lib/plugins/usermanager/lang/gl/edit.txt
@@ -1 +1 @@
-===== Editar unha persoa usuaria =====
+===== Editar usuario ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/gl/intro.txt b/lib/plugins/usermanager/lang/gl/intro.txt
index 9b05a0c5e..77675e9d6 100644
--- a/lib/plugins/usermanager/lang/gl/intro.txt
+++ b/lib/plugins/usermanager/lang/gl/intro.txt
@@ -1 +1 @@
-====== Xestor de persoas usuarias ======
+====== Xestor de Usuarios ====== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php
index b6909c100..0a01ef750 100644
--- a/lib/plugins/usermanager/lang/gl/lang.php
+++ b/lib/plugins/usermanager/lang/gl/lang.php
@@ -2,48 +2,46 @@
/**
* Galicianlanguage file
*
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
*/
-$lang['menu'] = 'Xestor de persoas usuarias';
-$lang['noauth'] = '(a autenticación de persoas usuarias non está dispoñíbel)';
-$lang['nosupport'] = '(a xestión de persoas usuarias non está soportada)';
-$lang['badauth'] = 'o mecanismo de autenticación non é válido';
-$lang['user_id'] = 'Usuaria/o';
+$lang['menu'] = 'Xestor de Usuarios';
+$lang['noauth'] = '(autenticación de usuarios non dispoñible)';
+$lang['nosupport'] = '(xestión de usuarios non soportada)';
+$lang['badauth'] = 'mecanismo de autenticación non válido';
+$lang['user_id'] = 'Usuario';
$lang['user_pass'] = 'Contrasinal';
-$lang['user_name'] = 'Nome real';
-$lang['user_mail'] = 'Correo';
+$lang['user_name'] = 'Nome Real';
+$lang['user_mail'] = 'Correo-e';
$lang['user_groups'] = 'Grupos';
$lang['field'] = 'Campo';
$lang['value'] = 'Valor';
$lang['add'] = 'Engadir';
$lang['delete'] = 'Eliminar';
-$lang['delete_selected'] = 'Eliminar as seleccionadas';
+$lang['delete_selected'] = 'Eliminar Seleccionados';
$lang['edit'] = 'Editar';
-$lang['edit_prompt'] = 'Editar esta persoa usuaria';
-$lang['modify'] = 'Gardar os cambios';
+$lang['edit_prompt'] = 'Editar este usuario';
+$lang['modify'] = 'Gardar Trocos';
$lang['search'] = 'Procurar';
-$lang['search_prompt'] = 'Facer unha procura';
-$lang['clear'] = 'Reiniciar o filtro de procura';
+$lang['search_prompt'] = 'Facer procura';
+$lang['clear'] = 'Reiniciar Filtro de Procura';
$lang['filter'] = 'Filtro';
-$lang['summary'] = 'A mostrar as persoas usuarias %1$d-%2$d de %3$d encontradas. %4$d persoas usuarias en total.';
-$lang['nonefound'] = 'Non se encontraron persoas usuarias. %d persoas usuarias en total.';
-$lang['delete_ok'] = '%d persoas usuarias foron eliminadas';
-$lang['delete_fail'] = '%d non puideron ser eliminadas.';
-$lang['update_ok'] = 'A persoa usuaria foi actualizada correctamente';
-$lang['update_fail'] = 'Non se puido actualizar a persoa usuaria';
-$lang['update_exists'] = 'Non se puido mudar o nome da persoa usuaria; o nome especificado (%s) xa existe (o resto de cambios aplicaranse sen problemas).';
+$lang['summary'] = 'Amosando usuarios %1$d-%2$d de %3$d atopados. %4$d usuarios en total.';
+$lang['nonefound'] = 'Non se atoparon usuarios. %d usuarios en total.';
+$lang['delete_ok'] = '%d usuarios eliminados';
+$lang['delete_fail'] = '%d non puideron ser eliminados.';
+$lang['update_ok'] = 'Usuario actualizado correctamente';
+$lang['update_fail'] = 'Non se puido actualizar o usuario';
+$lang['update_exists'] = 'Non se puido mudar o nome do usuario, xa que o nome especificado (%s) xa existe (o resto de trocos aplicaranse sen problemas).';
$lang['start'] = 'comezo';
$lang['prev'] = 'anterior';
$lang['next'] = 'seguinte';
-$lang['last'] = 'última';
-$lang['edit_usermissing'] = 'Non se encontrou a persoa usuaria seleccionada; pode que o nome de usuaria/o teña sido eliminado ou alterado nalgún momento.';
-$lang['user_notify'] = 'Notificar á/ao usuaria/o';
-$lang['note_notify'] = 'Os correos de notificación envíanse só se a persoa usuaria obtén un contrasinal novo.';
-$lang['note_group'] = 'As persoas usuarias novas serán engadidas ao grupo predeterminado (%s) se non se especifica outro.';
-$lang['note_pass'] = 'Se deixa o campo baleiro e a notificación á/ao usuaria/o está activada, xerarase automaticamente o contrasinal.';
-$lang['add_ok'] = 'A persoa usuaria foi engadida correctamente';
-$lang['add_fail'] = 'Non se puido engadir a/o usuaria/o';
-$lang['notify_ok'] = 'O correo de notificación foi enviado';
-$lang['notify_fail'] = 'Non se puido enviar o correo de notificación';
+$lang['last'] = 'derradeiro';
+$lang['edit_usermissing'] = 'Non se atopou o usuario seleccionado, pode que o nome de usuario fose eliminado ou mudado nalgún intre.';
+$lang['user_notify'] = 'Notificar ao usuario';
+$lang['note_notify'] = 'Os correos-e de notificación envíanse só se o usuario obtén un novo contrasinal.';
+$lang['note_group'] = 'Os novos usuarios serán engadidos ao grupo por defecto (%s) se non se especifica outro.';
+$lang['note_pass'] = 'Se deixas o campo baleiro e a notificación ao usuario está activada xerarase automaticamente o contrasinal.';
+$lang['add_ok'] = 'Usuario engadido correctamente';
+$lang['add_fail'] = 'Non se puido engadir o usuario';
+$lang['notify_ok'] = 'Correo-e de notificación enviado';
+$lang['notify_fail'] = 'Non se puido enviar o correo-e de notificación';
diff --git a/lib/plugins/usermanager/lang/gl/list.txt b/lib/plugins/usermanager/lang/gl/list.txt
index 792afd7d1..013b2d7d8 100644
--- a/lib/plugins/usermanager/lang/gl/list.txt
+++ b/lib/plugins/usermanager/lang/gl/list.txt
@@ -1 +1 @@
-===== Listaxe de persoas usuarias =====
+===== Lista de Usuarios ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/add.txt b/lib/plugins/usermanager/lang/ia/add.txt
new file mode 100644
index 000000000..4695834f4
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/add.txt
@@ -0,0 +1 @@
+===== Adder usator ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/delete.txt b/lib/plugins/usermanager/lang/ia/delete.txt
new file mode 100644
index 000000000..db1b4c077
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/delete.txt
@@ -0,0 +1 @@
+===== Deler usator ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/edit.txt b/lib/plugins/usermanager/lang/ia/edit.txt
new file mode 100644
index 000000000..2fcf02378
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/edit.txt
@@ -0,0 +1 @@
+===== Modificar usator ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/intro.txt b/lib/plugins/usermanager/lang/ia/intro.txt
new file mode 100644
index 000000000..f4fafcb9b
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/intro.txt
@@ -0,0 +1 @@
+====== Gestion de usatores ====== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/lang.php b/lib/plugins/usermanager/lang/ia/lang.php
new file mode 100644
index 000000000..a8b8f45c0
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/lang.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['menu'] = 'Gestion de usatores';
+$lang['noauth'] = '(authentication de usatores non disponibile)';
+$lang['nosupport'] = '(gestion de usatores non supportate)';
+$lang['badauth'] = 'mechanismo de authentication invalide';
+$lang['user_id'] = 'Usator';
+$lang['user_pass'] = 'Contrasigno';
+$lang['user_name'] = 'Nomine real';
+$lang['user_mail'] = 'E-mail';
+$lang['user_groups'] = 'Gruppos';
+$lang['field'] = 'Campo';
+$lang['value'] = 'Valor';
+$lang['add'] = 'Adder';
+$lang['delete'] = 'Deler';
+$lang['delete_selected'] = 'Deler seligite';
+$lang['edit'] = 'Modificar';
+$lang['edit_prompt'] = 'Modificar iste usator';
+$lang['modify'] = 'Salveguardar cambios';
+$lang['search'] = 'Cercar';
+$lang['search_prompt'] = 'Executar recerca';
+$lang['clear'] = 'Reinitialisar filtro de recerca';
+$lang['filter'] = 'Filtro';
+$lang['summary'] = 'Presentation del usatores %1$d-%2$d de %3$d trovate. %4$d usatores in total.';
+$lang['nonefound'] = 'Nulle usator trovate. %d usatores in total.';
+$lang['delete_ok'] = '%d usatores delite';
+$lang['delete_fail'] = 'Deletion de %d usatores fallite.';
+$lang['update_ok'] = 'Actualisation del usator succedite';
+$lang['update_fail'] = 'Actualisation del usator fallite';
+$lang['update_exists'] = 'Le modification del nomine del usator ha fallite; le usator specificate (%s) ja existe. (Omne altere modificationes essera applicate.)
+';
+$lang['start'] = 'initio';
+$lang['prev'] = 'precedente';
+$lang['next'] = 'sequente';
+$lang['last'] = 'fin';
+$lang['edit_usermissing'] = 'Le usator seligite non ha essite trovate. Es possibile que le nomine de usator specificate ha essite delite o cambiate alterubi.';
+$lang['user_notify'] = 'Notificar usator';
+$lang['note_notify'] = 'Le messages de notification es solmente inviate un nove contrasigno es date al usator.';
+$lang['note_group'] = 'Nove usatores essera addite al gruppo predefinite (%s) si nulle gruppo es specificate.';
+$lang['note_pass'] = 'Le contrasigno essera automaticamente generate si le campo es lassate vacue e le notification del usator es activate.';
+$lang['add_ok'] = 'Addition del usator succedite';
+$lang['add_fail'] = 'Addition del usator fallite';
+$lang['notify_ok'] = 'Message de notification inviate';
+$lang['notify_fail'] = 'Le message de notification non poteva esser inviate';
diff --git a/lib/plugins/usermanager/lang/ia/list.txt b/lib/plugins/usermanager/lang/ia/list.txt
new file mode 100644
index 000000000..f545f06df
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/list.txt
@@ -0,0 +1 @@
+===== Lista de usatores ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/it/delete.txt b/lib/plugins/usermanager/lang/it/delete.txt
index fc36212af..270061f0d 100644
--- a/lib/plugins/usermanager/lang/it/delete.txt
+++ b/lib/plugins/usermanager/lang/it/delete.txt
@@ -1 +1 @@
-===== Cancella utente =====
+===== Elimina utente =====
diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php
index 67b17e9ec..d592fdf89 100644
--- a/lib/plugins/usermanager/lang/it/lang.php
+++ b/lib/plugins/usermanager/lang/it/lang.php
@@ -15,16 +15,16 @@ $lang['menu'] = 'Gestione Utenti';
$lang['noauth'] = '(autenticazione non disponibile)';
$lang['nosupport'] = '(gestione utenti non supportata)';
$lang['badauth'] = 'sistema di autenticazione non valido';
-$lang['user_id'] = 'User ID';
+$lang['user_id'] = 'ID utente';
$lang['user_pass'] = 'Password';
$lang['user_name'] = 'Nome completo';
-$lang['user_mail'] = 'E-mail';
+$lang['user_mail'] = 'Email';
$lang['user_groups'] = 'Gruppi';
$lang['field'] = 'Campo';
$lang['value'] = 'Valore';
$lang['add'] = 'Aggiungi';
-$lang['delete'] = 'Cancella';
-$lang['delete_selected'] = 'Cancella selezionati';
+$lang['delete'] = 'Elimina';
+$lang['delete_selected'] = 'Elimina selezionati';
$lang['edit'] = 'Modifica';
$lang['edit_prompt'] = 'Modifica questo utente';
$lang['modify'] = 'Salva modifiche';
@@ -34,20 +34,20 @@ $lang['clear'] = 'Azzera filtro di ricerca';
$lang['filter'] = 'Filtro';
$lang['summary'] = 'Visualizzazione utenti %1$d-%2$d di %3$d trovati. %4$d utenti totali.';
$lang['nonefound'] = 'Nessun utente trovato. %d utenti totali.';
-$lang['delete_ok'] = '%d utenti cancellati';
-$lang['delete_fail'] = 'Cancellazione %d fallita.';
+$lang['delete_ok'] = '%d utenti eliminati';
+$lang['delete_fail'] = 'Eliminazione %d fallita.';
$lang['update_ok'] = 'Aggiornamento utente riuscito';
$lang['update_fail'] = 'Aggiornamento utente fallito';
-$lang['update_exists'] = 'Modifica nome utente fallita, il nome utente specificato (%s) esiste già (qualunque altra modifica sarà applicata).';
+$lang['update_exists'] = 'Modifica nome utente fallita, il nome utente specificato (%s) esiste già (qualunque altra modifica sarà applicata).';
$lang['start'] = 'primo';
$lang['prev'] = 'precedente';
$lang['next'] = 'successivo';
$lang['last'] = 'ultimo';
-$lang['edit_usermissing'] = 'Utente selezionato non trovato, il nome utente specificato potrebbe essere stato cancellato o modificato altrove.';
+$lang['edit_usermissing'] = 'Utente selezionato non trovato, il nome utente specificato potrebbe essere stato eliminato o modificato altrove.';
$lang['user_notify'] = 'Notifica utente';
$lang['note_notify'] = 'Le email di notifica sono inviate soltanto se all\'utente è stata assegnata una nuova password.';
-$lang['note_group'] = 'Se non si specifica alcun gruppo, i nuovi utenti saranno aggiunti al gruppo di default (%s).';
-$lang['note_pass'] = 'La password verrà generata automaticamente qualora il campo di inserimento relatvivo venisse lasciato vuoto e le notifiche all\'utente fossero abilitate.';
+$lang['note_group'] = 'Se non si specifica alcun gruppo, i nuovi utenti saranno aggiunti al gruppo predefinito (%s).';
+$lang['note_pass'] = 'La password verrà generata automaticamente qualora il campo di inserimento relativo venisse lasciato vuoto e le notifiche all\'utente fossero abilitate.';
$lang['add_ok'] = 'Utente aggiunto correttamente';
$lang['add_fail'] = 'Aggiunta utente fallita';
$lang['notify_ok'] = 'Email di notifica inviata';
diff --git a/lib/plugins/usermanager/lang/lb/lang.php b/lib/plugins/usermanager/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/usermanager/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
diff --git a/lib/plugins/usermanager/lang/lb/list.txt b/lib/plugins/usermanager/lang/lb/list.txt
new file mode 100644
index 000000000..022afe831
--- /dev/null
+++ b/lib/plugins/usermanager/lang/lb/list.txt
@@ -0,0 +1 @@
+===== Benotzerlëscht ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/mk/add.txt b/lib/plugins/usermanager/lang/mk/add.txt
new file mode 100644
index 000000000..c90121d1b
--- /dev/null
+++ b/lib/plugins/usermanager/lang/mk/add.txt
@@ -0,0 +1 @@
+===== Додај корисник ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/mk/delete.txt b/lib/plugins/usermanager/lang/mk/delete.txt
new file mode 100644
index 000000000..8a6b5e9b5
--- /dev/null
+++ b/lib/plugins/usermanager/lang/mk/delete.txt
@@ -0,0 +1 @@
+===== Избриши корисник ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/mk/edit.txt b/lib/plugins/usermanager/lang/mk/edit.txt
new file mode 100644
index 000000000..da6306141
--- /dev/null
+++ b/lib/plugins/usermanager/lang/mk/edit.txt
@@ -0,0 +1 @@
+===== Уреди корисник ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/mk/intro.txt b/lib/plugins/usermanager/lang/mk/intro.txt
new file mode 100644
index 000000000..747d00921
--- /dev/null
+++ b/lib/plugins/usermanager/lang/mk/intro.txt
@@ -0,0 +1 @@
+===== Менаџер за корисник ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/mk/lang.php b/lib/plugins/usermanager/lang/mk/lang.php
new file mode 100644
index 000000000..97ef51369
--- /dev/null
+++ b/lib/plugins/usermanager/lang/mk/lang.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
+$lang['menu'] = 'Менаџер за корисник';
+$lang['noauth'] = '(автентикација на корисник не е достапна)';
+$lang['nosupport'] = '(менаџирање на корисник не е поддржано)';
+$lang['badauth'] = 'невалиден механизам за автентикација';
+$lang['user_id'] = 'Корисник';
+$lang['user_pass'] = 'Лозинка';
+$lang['user_name'] = 'Вистинско име';
+$lang['user_mail'] = 'Е-пошта';
+$lang['user_groups'] = 'Групи';
+$lang['field'] = 'Поле';
+$lang['value'] = 'Вредност';
+$lang['add'] = 'Додај';
+$lang['delete'] = 'Избриши';
+$lang['delete_selected'] = 'Избриши ги избраните';
+$lang['edit'] = 'Уреди';
+$lang['edit_prompt'] = 'Уреди го овој корисник';
+$lang['modify'] = 'Зачувај промени';
+$lang['search'] = 'Барај';
+$lang['search_prompt'] = 'Изврши пребарување';
+$lang['clear'] = 'Ресетирај го филтерот за пребарување';
+$lang['filter'] = 'Филтер';
+$lang['delete_ok'] = '%d корисници се избришани';
+$lang['delete_fail'] = '%d не успееја да се избришат.';
+$lang['update_ok'] = 'Корисникот е успешно ажуриран';
+$lang['update_fail'] = 'Корисникот не е успешно ажуриран';
+$lang['start'] = 'почеток';
+$lang['prev'] = 'претходна';
+$lang['next'] = 'следна';
+$lang['last'] = 'последна';
+$lang['user_notify'] = 'Извести го корисникот';
+$lang['add_ok'] = 'Корисникот е успешно додаден';
+$lang['add_fail'] = 'Додавањето на корисникот не е успешно';
diff --git a/lib/plugins/usermanager/lang/mk/list.txt b/lib/plugins/usermanager/lang/mk/list.txt
new file mode 100644
index 000000000..651462e9d
--- /dev/null
+++ b/lib/plugins/usermanager/lang/mk/list.txt
@@ -0,0 +1 @@
+===== Листа со корисници ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php
index 3db83b9b3..56add77f4 100644
--- a/lib/plugins/usermanager/lang/pl/lang.php
+++ b/lib/plugins/usermanager/lang/pl/lang.php
@@ -6,6 +6,8 @@
* @author Mariusz Kujawski <marinespl@gmail.com>
* @author Maciej Kurczewski <pipijajko@gmail.com>
* @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
*/
$lang['menu'] = 'Menadżer użytkowników';
$lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)';
diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php
index cf7e48ea7..2c9a281b9 100644
--- a/lib/plugins/usermanager/lang/pt-br/lang.php
+++ b/lib/plugins/usermanager/lang/pt-br/lang.php
@@ -13,6 +13,7 @@
* @author Frederico Guimarães <frederico@teia.bio.br>
* @author Jair Henrique <jair.henrique@gmail.com>
* @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
*/
$lang['menu'] = 'Gerenciamento de Usuários';
$lang['noauth'] = '(o gerenciamento de usuários não está disponível)';
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 7bfe3410d..5b48c6ba6 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -12,6 +12,7 @@
* @author Alexander Sorkin <kibizoid@gmail.com>
* @author Kirill Krasnov <krasnovforum@gmail.com>
* @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
*/
$lang['menu'] = 'Управление пользователями';
$lang['noauth'] = '(авторизация пользователей недоступна)';
diff --git a/lib/plugins/usermanager/lang/sq/add.txt b/lib/plugins/usermanager/lang/sq/add.txt
new file mode 100644
index 000000000..4c66aaf3e
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sq/add.txt
@@ -0,0 +1 @@
+===== Shto Përdorues ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sq/delete.txt b/lib/plugins/usermanager/lang/sq/delete.txt
new file mode 100644
index 000000000..34cb49173
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sq/delete.txt
@@ -0,0 +1 @@
+===== Fshi përdorues ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sq/edit.txt b/lib/plugins/usermanager/lang/sq/edit.txt
new file mode 100644
index 000000000..63131038f
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sq/edit.txt
@@ -0,0 +1 @@
+===== Redakto Përdorues ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sq/intro.txt b/lib/plugins/usermanager/lang/sq/intro.txt
new file mode 100644
index 000000000..e1ebea60c
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sq/intro.txt
@@ -0,0 +1 @@
+===== Menaxhuesi i Përdoruesit ===== \ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/sq/lang.php b/lib/plugins/usermanager/lang/sq/lang.php
new file mode 100644
index 000000000..bddf54d5b
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sq/lang.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['menu'] = 'Menaxhuesi Përdoruesve';
+$lang['noauth'] = '(autentikimi i përdoruesve nuk është i disponueshëm)';
+$lang['nosupport'] = '(menaxhimi i përdoruesve nuk suportohet)';
+$lang['badauth'] = '(mekanizëm i pavlefshëm autentikimi)';
+$lang['user_id'] = 'Përdoruesi';
+$lang['user_pass'] = 'Fjalëkalimi
+';
+$lang['user_name'] = 'Emri i Vërtetë';
+$lang['user_mail'] = 'Email';
+$lang['user_groups'] = 'Grupe';
+$lang['field'] = 'Fusha';
+$lang['value'] = 'Vlera';
+$lang['add'] = 'Shto';
+$lang['delete'] = 'Fshi';
+$lang['delete_selected'] = 'Fshi të Përzgjedhurën';
+$lang['edit'] = 'Redakto';
+$lang['edit_prompt'] = 'Redakto këtë përdorues';
+$lang['modify'] = 'Ruaj Ndryshimet';
+$lang['search'] = 'Kërko';
+$lang['search_prompt'] = 'Kryej kërkim';
+$lang['clear'] = 'Rivendos Filter Kërkimi';
+$lang['filter'] = 'Filter';
+$lang['summary'] = 'Duke treguar përdoruesit %1$d-%2$d nga %3$d të gjetur. %4$d përdorues në total.';
+$lang['nonefound'] = 'Asnjë përdorues nuk u gjet. %d përdorues në total.';
+$lang['delete_ok'] = '%d përdorues u fshinë.';
+$lang['delete_fail'] = '%d dështuan të fshihen.';
+$lang['update_ok'] = 'Përdoruesi u përditësia me sukses.';
+$lang['update_fail'] = 'Përditësimi i përdoruesit dështoi.';
+$lang['update_exists'] = 'Ndryshimi i emrit të përdoruesit dështoi, emri i përdoruesit i specifikuar (%s) ekziston tashmë (çdo ndryshim tjetër do të zbatohet).';
+$lang['start'] = 'Fillim';
+$lang['prev'] = 'Mëpara';
+$lang['next'] = 'Tjetra';
+$lang['last'] = 'Fundi';
+$lang['edit_usermissing'] = 'Përdoruesi i përzgjedhur nuk u gjet, emri i specifikuar i përdoruesit mund të jetë fshirë ose ndryshuar diku tjetër.';
+$lang['user_notify'] = 'Lajmëro përdoruesin';
+$lang['note_notify'] = 'Email-et e lajmërimit dërgohen vetëm nëse përdoruesit i jepet një fjalëkalim i ri.';
+$lang['note_group'] = 'Përdorues të rinj do të shtohen në grupin default (%s) nëse asnjë grup nuk specifikohet.';
+$lang['note_pass'] = 'Fjalëkalimi do të autogjenerohet nëse fusha lihet bosh dhe lajmërimi i përdoruesit është i aktivizuar.';
+$lang['add_ok'] = 'Përdoruesi u shtua me sukses.';
+$lang['add_fail'] = 'Shtimi i përdoruesit dështoi.';
+$lang['notify_ok'] = 'Email-i lajmërimit u dërgua.';
+$lang['notify_fail'] = 'Email-i lajmërimit nuk mundi të dërgohej.';
diff --git a/lib/plugins/usermanager/lang/sq/list.txt b/lib/plugins/usermanager/lang/sq/list.txt
new file mode 100644
index 000000000..68fc2e7c6
--- /dev/null
+++ b/lib/plugins/usermanager/lang/sq/list.txt
@@ -0,0 +1 @@
+===== Lista Përdoruesve ===== \ No newline at end of file
diff --git a/lib/scripts/drag.js b/lib/scripts/drag.js
index fa249a996..254eab4a6 100644
--- a/lib/scripts/drag.js
+++ b/lib/scripts/drag.js
@@ -50,8 +50,8 @@ var drag = {
this.oX = parseInt(this.obj.style.left);
this.oY = parseInt(this.obj.style.top);
- this.eX = drag.evX(e);
- this.eY = drag.evY(e);
+ this.eX = e.pageX;
+ this.eY = e.pageY;
var _this = this;
this.mousehandlers = [function (e) {return _this.drag(e);}, function (e) {return _this.stop(e);}];
@@ -80,23 +80,9 @@ var drag = {
*/
drag: function(e) {
if(this.obj) {
- this.obj.style.top = (this.evY(e)+this.oY-this.eY+'px');
- this.obj.style.left = (this.evX(e)+this.oX-this.eX+'px');
+ this.obj.style.top = (e.pageY+this.oY-this.eY+'px');
+ this.obj.style.left = (e.pageX+this.oX-this.eX+'px');
}
},
- /**
- * Returns the X position of the given event.
- */
- evX: function(e){
- return (e.pageX) ? e.pageX : e.clientX + document.body.scrollTop; //fixme shouldn't this be scrollLeft?
- },
-
- /**
- * Returns the Y position of the given event.
- */
- evY: function(e){
- return (e.pageY) ? e.pageY : e.clientY + document.body.scrollTop;
- }
-
};
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 483fcc3cc..58433f25c 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -166,14 +166,18 @@ function keyHandler(e){
// keep current indention for lists and code
var match = search.match(/(\n +([\*-] ?)?)/);
if(match){
+ var scroll = field.scrollHeight;
var match2 = search.match(/^\n +[\*-]\s*$/);
// Cancel list if the last item is empty (i. e. two times enter)
if (match2 && field.value.substr(selection.start).match(/^($|\n)/)) {
- field.value = field.value.substr(0, linestart) + "\n";
+ field.value = field.value.substr(0, linestart) + "\n" +
+ field.value.substr(selection.start);
+ selection.start = linestart + 1;
+ selection.end = linestart + 1;
+ setSelection(selection);
} else {
insertAtCarret(field.id,match[1]);
}
- var scroll = field.scrollHeight;
field.scrollTop += (field.scrollHeight - scroll);
e.preventDefault(); // prevent enter key
return false;
diff --git a/lib/scripts/events.js b/lib/scripts/events.js
index e7526ced7..2ea619085 100644
--- a/lib/scripts/events.js
+++ b/lib/scripts/events.js
@@ -55,6 +55,10 @@ function fixEvent(event) {
event.stopPropagation = fixEvent.stopPropagation;
// fix target
event.target = event.srcElement;
+ // fix coords
+ event.pageX = (typeof event.pageX !== 'undefined') ? event.pageX : event.clientX + document.body.scrollTop;
+ event.pageY = (typeof event.pageY !== 'undefined') ? event.pageY : event.clientY + document.body.scrollTop;
+
return event;
};
fixEvent.preventDefault = function() {
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 4528d9591..225868592 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -38,7 +38,7 @@ var linkwiz = {
LANG['linkwiz']+'</div>'+
'<div>'+LANG['linkto']+' <input type="text" class="edit" id="link__wiz_entry" autocomplete="off" /></div>'+
'<div id="link__wiz_result"></div>';
- textArea.form.parentNode.appendChild(linkwiz.wiz);
+ $('dw__editform').parentNode.appendChild(linkwiz.wiz);
linkwiz.textArea = textArea;
linkwiz.result = $('link__wiz_result');
linkwiz.entry = $('link__wiz_entry');
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 3e4213f19..f14db63d7 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -6,6 +6,13 @@
var media_manager = {
keepopen: false,
hide: false,
+ align: false,
+ popup: false,
+ id: false,
+ display: false,
+ link: false,
+ size: false,
+ ext: false,
/**
* Attach event handlers to all "folders" below the given element
@@ -218,24 +225,359 @@ var media_manager = {
},
/**
- * Insert the clicked image into the opener's textarea
- *
- * @author Andreas Gohr <andi@splitbrain.org>
+ * shows the popup for a image link
*/
select: function(event,link){
var id = link.name.substr(2);
+ media_manager.id = id;
if(!opener){
// if we don't run in popup display example
var ex = $('ex_'+id.replace(/:/g,'_'));
if(ex.style.display == ''){
ex.style.display = 'none';
- }else{
+ } else {
ex.style.display = '';
}
return false;
}
- opener.insertTags('wiki__text','{{'+id+'|','}}','');
+
+ media_manager.ext = false;
+ var dot = id.lastIndexOf(".");
+ if (dot != -1) {
+ var ext = id.substr(dot,id.length);
+
+ if (ext != '.jpg' && ext != '.jpeg' && ext != '.png' && ext != '.gif' && ext != '.swf') {
+ media_manager.insert(null);
+ return false;
+ }
+ } else {
+ media_manager.insert(null);
+ return false;
+ }
+
+ media_manager.popup.style.display = 'inline';
+ media_manager.popup.style.left = event.pageX + 'px';
+ media_manager.popup.style.top = event.pageY + 'px';
+
+ // set all buttons to outset
+ media_manager.outSet('media__linkbtn1');
+ media_manager.outSet('media__linkbtn2');
+ media_manager.outSet('media__linkbtn3');
+ media_manager.outSet('media__linkbtn4');
+
+ media_manager.outSet('media__alignbtn0');
+ media_manager.outSet('media__alignbtn1');
+ media_manager.outSet('media__alignbtn2');
+ media_manager.outSet('media__alignbtn3');
+
+ media_manager.outSet('media__sizebtn1');
+ media_manager.outSet('media__sizebtn2');
+ media_manager.outSet('media__sizebtn3');
+ media_manager.outSet('media__sizebtn4');
+
+
+ if (ext == '.swf') {
+ media_manager.ext = 'swf';
+
+ // disable display buttons for detail and linked image
+ $('media__linkbtn1').style.display = 'none';
+ $('media__linkbtn2').style.display = 'none';
+
+ // set the link button to default
+ if (media_manager.link != false) {
+ if ( media_manager.link == '2' || media_manager.link == '1') {
+ media_manager.inSet('media__linkbtn3');
+ media_manager.link = '3';
+ DokuCookie.setValue('link','3');
+ } else {
+ media_manager.inSet('media__linkbtn'+media_manager.link);
+ }
+ } else if (DokuCookie.getValue('link')) {
+ if ( DokuCookie.getValue('link') == '2' || DokuCookie.getValue('link') == '1') {
+ // this options are not availible
+ media_manager.inSet('media__linkbtn3');
+ media_manager.link = '3';
+ DokuCookie.setValue('link','3');
+ } else {
+ media_manager.inSet('media__linkbtn'+DokuCookie.getValue('link'));
+ media_manager.link = DokuCookie.getValue('link');
+ }
+ } else {
+ // default case
+ media_manager.link = '3';
+ media_manager.inSet('media__linkbtn3');
+ DokuCookie.setValue('link','3');
+ }
+
+ // disable button for original size
+ $('media__sizebtn4').style.display = 'none';
+
+ } else {
+ media_manager.ext = 'img';
+
+ // ensure that the display buttons are there
+ $('media__linkbtn1').style.display = 'inline';
+ $('media__linkbtn2').style.display = 'inline';
+ $('media__sizebtn4').style.display = 'inline';
+
+ // set the link button to default
+ if (DokuCookie.getValue('link')) {
+ media_manager.link = DokuCookie.getValue('link');
+ }
+ if (media_manager.link == false) {
+ // default case
+ media_manager.link = '1';
+ DokuCookie.setValue('link','1');
+ }
+ media_manager.inSet('media__linkbtn'+media_manager.link);
+ }
+
+ if (media_manager.link == '4') {
+ media_manager.align = false;
+ media_manager.size = false;
+ $('media__align').style.display = 'none';
+ $('media__size').style.display = 'none';
+ } else {
+ $('media__align').style.display = 'block';
+ $('media__size').style.display = 'block';
+
+ // set the align button to default
+ if (media_manager.align != false) {
+ media_manager.inSet('media__alignbtn'+media_manager.align);
+ } else if (DokuCookie.getValue('align')) {
+ media_manager.inSet('media__alignbtn'+DokuCookie.getValue('align'));
+ media_manager.align = DokuCookie.getValue('align');
+ } else {
+ // default case
+ media_manager.align = '0';
+ media_manager.inSet('media__alignbtn0');
+ DokuCookie.setValue('align','0');
+ }
+
+ // set the size button to default
+ if (DokuCookie.getValue('size')) {
+ media_manager.size = DokuCookie.getValue('size');
+ }
+ if (media_manager.size == false || (media_manager.size === '4' && ext === '.swf')) {
+ // default case
+ media_manager.size = '2';
+ DokuCookie.setValue('size','2');
+ }
+ media_manager.inSet('media__sizebtn'+media_manager.size);
+
+ $('media__sendbtn').focus();
+ }
+
+ return false;
+ },
+
+ /**
+ * build the popup window
+ *
+ * @author Dominik Eckelmann <eckelmann@cosmocode.de>
+ */
+ initpopup: function() {
+
+ media_manager.popup = document.createElement('div');
+ media_manager.popup.setAttribute('id','media__popup');
+
+ var root = document.getElementById('media__manager');
+ if (root == null) return;
+ root.appendChild(media_manager.popup);
+
+ var headline = document.createElement('h1');
+ headline.innerHTML = LANG.mediatitle;
+ var headlineimg = document.createElement('img');
+ headlineimg.src = DOKU_BASE + 'lib/images/close.png';
+ headlineimg.id = 'media__closeimg';
+ addEvent(headlineimg,'click',function(event){ return media_manager.closePopup(event,this); });
+ headline.insertBefore(headlineimg, headline.firstChild);
+ media_manager.popup.appendChild(headline);
+ drag.attach(media_manager.popup,headline);
+
+ // link
+
+ var linkp = document.createElement('p');
+
+ linkp.id = "media__linkstyle";
+ if (media_manager.display == "2") {
+ linkp.style.display = "none";
+ }
+
+ var linkl = document.createElement('label');
+ linkl.innerHTML = LANG.mediatarget;
+ linkp.appendChild(linkl);
+
+ var linkbtns = ['lnk', 'direct', 'nolnk', 'displaylnk'];
+ for (var i = 0 ; i < linkbtns.length ; ++i) {
+ var linkbtn = document.createElement('button');
+ linkbtn.className = 'button';
+ linkbtn.value = i + 1;
+ linkbtn.id = "media__linkbtn" + (i + 1);
+ linkbtn.title = LANG['media' + linkbtns[i]];
+ linkbtn.style.borderStyle = 'outset';
+ addEvent(linkbtn,'click',function(event){ return media_manager.setlink(event,this); });
+
+ var linkimg = document.createElement('img');
+ linkimg.src = DOKU_BASE + 'lib/images/media_link_' + linkbtns[i] + '.png';
+
+ linkbtn.appendChild(linkimg);
+ linkp.appendChild(linkbtn);
+ }
+
+ media_manager.popup.appendChild(linkp);
+
+ // align
+
+ var alignp = document.createElement('p');
+ var alignl = document.createElement('label');
+
+ alignp.appendChild(alignl);
+ alignp.id = 'media__align';
+ if (media_manager.display == "2") {
+ alignp.style.display = "none";
+ }
+ alignl.innerHTML = LANG['mediaalign'];
+
+ var alignbtns = ['noalign', 'left', 'center', 'right'];
+ for (var n = 0 ; n < alignbtns.length ; ++n) {
+ var alignbtn = document.createElement('button');
+ var alignimg = document.createElement('img');
+ alignimg.src = DOKU_BASE + 'lib/images/media_align_' + alignbtns[n] + '.png';
+
+ alignbtn.id = "media__alignbtn" + n;
+ alignbtn.value = n;
+ alignbtn.title = LANG['media' + alignbtns[n]];
+ alignbtn.className = 'button';
+ alignbtn.appendChild(alignimg);
+ alignbtn.style.borderStyle = 'outset';
+ addEvent(alignbtn,'click',function(event){ return media_manager.setalign(event,this); });
+
+ alignp.appendChild(alignbtn);
+ }
+
+ media_manager.popup.appendChild(alignp);
+
+ // size
+
+ var sizep = document.createElement('p');
+ var sizel = document.createElement('label');
+
+ sizep.id = 'media__size';
+ if (media_manager.display == "2") {
+ sizep.style.display = "none";
+ }
+ sizep.appendChild(sizel);
+ sizel.innerHTML = LANG['mediasize'];
+
+ var sizebtns = ['small', 'medium', 'large', 'original'];
+ for (var size = 0 ; size < sizebtns.length ; ++size) {
+ var sizebtn = document.createElement('button');
+ var sizeimg = document.createElement('img');
+
+ sizep.appendChild(sizebtn);
+ sizeimg.src = DOKU_BASE + 'lib/images/media_size_' + sizebtns[size] + '.png';
+
+ sizebtn.className = 'button';
+ sizebtn.appendChild(sizeimg);
+ sizebtn.value = size + 1;
+ sizebtn.id = 'media__sizebtn' + (size + 1);
+ sizebtn.title = LANG['media' + sizebtns[size]];
+ sizebtn.style.borderStyle = 'outset';
+ addEvent(sizebtn,'click',function(event){ return media_manager.setsize(event,this); });
+ }
+
+ media_manager.popup.appendChild(sizep);
+
+ // send and close button
+
+ var btnp = document.createElement('p');
+ media_manager.popup.appendChild(btnp);
+ btnp.setAttribute('class','btnlbl');
+
+ var cls = document.createElement('input');
+ cls.type = 'button';
+ cls.setAttribute('class','button');
+ cls.value = LANG['mediaclose'];
+ btnp.appendChild(cls);
+ addEvent(cls,'click',function(event){ return media_manager.closePopup(event,this); });
+
+ var btn = document.createElement('input');
+ btn.type = 'button';
+ btn.id = 'media__sendbtn';
+ btn.setAttribute('class','button');
+ btn.value = LANG['mediainsert'];
+ btnp.appendChild(btn);
+ addEvent(btn,'click',function(event){ return media_manager.insert(event); });
+ },
+
+ /**
+ * Insert the clicked image into the opener's textarea
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Dominik Eckelmann <eckelmann@cosmocode.de>
+ */
+ insert: function(event){
+ var id = media_manager.id;
+ // set syntax options
+ $('media__popup').style.display = 'none';
+
+ var opts = '';
+ var optsstart = '';
+ var alignleft = '';
+ var alignright = '';
+
+ if (media_manager.ext == 'img' || media_manager.ext == 'swf') {
+
+ if (media_manager.link == '4') {
+ opts = '?linkonly';
+ } else {
+
+ if (media_manager.link == "3" && media_manager.ext == 'img') {
+ opts = '?nolink';
+ optsstart = true;
+ } else if (media_manager.link == "2" && media_manager.ext == 'img') {
+ opts = '?direct';
+ optsstart = true;
+ }
+
+ var s = parseInt(media_manager.size);
+
+ if (s && s >= 1) {
+ opts += (optsstart)?'&':'?';
+ if (s=="1") {
+ opts += '100';
+ if (media_manager.ext == 'swf') {
+ opts += 'x62';
+ }
+ } else if (s=="2") {
+ opts += '200';
+ if (media_manager.ext == 'swf') {
+ opts += 'x123';
+ }
+ } else if (s=="3"){
+ opts += '300';
+ if (media_manager.ext == 'swf') {
+ opts += 'x185';
+ }
+ }
+ }
+ if (media_manager.align == '1') {
+ alignleft = '';
+ alignright = ' ';
+ }
+ if (media_manager.align == '2') {
+ alignleft = ' ';
+ alignright = ' ';
+ }
+ if (media_manager.align == '3') {
+ alignleft = ' ';
+ alignright = '';
+ }
+ }
+ }
+ opener.insertTags('wiki__text','{{'+alignleft+id+opts+alignright+'|','}}','');
if(!media_manager.keepopen) window.close();
opener.focus();
@@ -340,6 +682,116 @@ var media_manager = {
oflash.style.display = '';
};
oform.appendChild(clicky);
+ },
+
+ /**
+ * closes the link type popup
+ */
+ closePopup: function(event) {
+ $('media__popup').style.display = 'none';
+ },
+
+ /**
+ * set the align
+ *
+ * @author Dominik Eckelmann <eckelmann@cosmocode.de>
+ */
+ setalign: function(event,cb){
+ if(cb.value){
+ DokuCookie.setValue('align',cb.value);
+ media_manager.align = cb.value;
+ media_manager.outSet("media__alignbtn0");
+ media_manager.outSet("media__alignbtn1");
+ media_manager.outSet("media__alignbtn2");
+ media_manager.outSet("media__alignbtn3");
+ media_manager.inSet("media__alignbtn"+cb.value);
+ }else{
+ DokuCookie.setValue('align','');
+ media_manager.align = false;
+ }
+ },
+ /**
+ * set the link type
+ *
+ * @author Dominik Eckelmann <eckelmann@cosmocode.de>
+ */
+ setlink: function(event,cb){
+ if(cb.value){
+ DokuCookie.setValue('link',cb.value);
+ media_manager.link = cb.value;
+ media_manager.outSet("media__linkbtn1");
+ media_manager.outSet("media__linkbtn2");
+ media_manager.outSet("media__linkbtn3");
+ media_manager.outSet("media__linkbtn4");
+ media_manager.inSet("media__linkbtn"+cb.value);
+ var size = document.getElementById("media__size");
+ var align = document.getElementById("media__align");
+ if (cb.value != '4') {
+ size.style.display = "block";
+ align.style.display = "block";
+ } else {
+ size.style.display = "none";
+ align.style.display = "none";
+ }
+ }else{
+ DokuCookie.setValue('link','');
+ media_manager.link = false;
+ }
+ },
+
+ /**
+ * set the display type
+ *
+ * @author Dominik Eckelmann <eckelmann@cosmocode.de>
+ */
+ setdisplay: function(event,cb){
+ if(cb.value){
+ DokuCookie.setValue('display',cb.value);
+ media_manager.display = cb.value;
+ media_manager.outSet("media__displaybtn1");
+ media_manager.outSet("media__displaybtn2");
+ media_manager.inSet("media__displaybtn"+cb.value);
+
+ }else{
+ DokuCookie.setValue('display','');
+ media_manager.align = false;
+ }
+ },
+
+ /**
+ * sets the border to outset
+ */
+ outSet: function(id) {
+ var ele = document.getElementById(id);
+ if (ele == null) return;
+ ele.style.borderStyle = "outset";
+ },
+ /**
+ * sets the border to inset
+ */
+ inSet: function(id) {
+ var ele = document.getElementById(id);
+ if (ele == null) return;
+ ele.style.borderStyle = "inset";
+ },
+
+ /**
+ * set the image size
+ *
+ * @author Dominik Eckelmann <eckelmann@cosmocode.de>
+ */
+ setsize: function(event,cb){
+ if (cb.value) {
+ DokuCookie.setValue('size',cb.value);
+ media_manager.size = cb.value;
+ for (var i = 1 ; i <= 4 ; ++i) {
+ media_manager.outSet("media__sizebtn" + i);
+ }
+ media_manager.inSet("media__sizebtn"+cb.value);
+ } else {
+ DokuCookie.setValue('size','');
+ media_manager.width = false;
+ }
}
};
@@ -348,5 +800,6 @@ addInitEvent(function(){
media_manager.selectorattach($('media__content'));
media_manager.confirmattach($('media__content'));
media_manager.attachoptions($('media__opts'));
+ media_manager.initpopup();
media_manager.initFlashUpload();
});
diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index b611f980a..bf6f41ce5 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -215,10 +215,7 @@ function addTocToggle() {
prependChild(header,obj);
obj.parentNode.onclick = toggleToc;
- try {
- obj.parentNode.style.cursor = 'pointer';
- obj.parentNode.style.cursor = 'hand';
- }catch(e){}
+ obj.parentNode.style.cursor = 'pointer';
}
/**
@@ -535,38 +532,24 @@ addInitEvent(function(){
* @author Andreas Gohr <andi@splitbrain.org>
*/
addInitEvent(function(){
- var break_classes = new RegExp('secedit|toc|page');
var btns = getElementsByClass('btn_secedit',document,'form');
for(var i=0; i<btns.length; i++){
- switch(btns[i].parentNode.className.match(/editbutton_(\w+)/)[1]) {
- case 'plain':
- addEvent(btns[i],'mouseover',function(e){
- var tgt = e.target.form.parentNode;
- do {
- tgt = tgt.previousSibling;
- } while (tgt && !tgt.tagName);
- if (!tgt) return;
- if(tgt.nodeName != "DIV") tgt = tgt.previousSibling;
- while(!break_classes.test(tgt.className)) {
+ addEvent(btns[i],'mouseover',function(e){
+ var tgt = e.target.form.parentNode;
+ var nr = tgt.className.match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2];
+ do {
+ tgt = tgt.previousSibling;
+ } while (tgt !== null && typeof tgt.tagName === 'undefined');
+ if (tgt === null) return;
+ while(typeof tgt.className === 'undefined' ||
+ tgt.className.match('(\\s+|^)sectionedit' + nr + '(\\s+|$)') === null) {
+ if (typeof tgt.className !== 'undefined') {
tgt.className += ' section_highlight';
- if (tgt.tagName == 'H1') break;
- tgt = (tgt.previousSibling != null) ? tgt.previousSibling : tgt.parentNode;
}
- });
- break;
-
- case 'table':
- addEvent(btns[i],'mouseover',function(e){
- var tgt = e.target.form.parentNode;
- do {
- tgt = tgt.previousSibling;
- } while (tgt && !tgt.tagName);
- if (tgt && tgt.tagName === 'TABLE') {
- tgt.className += ' section_highlight';
- }
- });
- break;
- }
+ tgt = (tgt.previousSibling !== null) ? tgt.previousSibling : tgt.parentNode;
+ }
+ if (typeof tgt.className !== 'undefined') tgt.className += ' section_highlight';
+ });
addEvent(btns[i],'mouseout',function(e){
var secs = getElementsByClass('section_highlight');
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 99ad1bb9c..3f967448c 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -5,23 +5,31 @@ var pickercounter=0;
/**
* Create a toolbar
*
- * @param string tbid ID of the element where to insert the toolbar
- * @param string edid ID of the editor textarea
- * @param array tb Associative array defining the buttons
+ * @param string tbid ID of the element where to insert the toolbar
+ * @param string edid ID of the editor textarea
+ * @param array tb Associative array defining the buttons
+ * @param bool allowblock Allow buttons creating multiline content
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function initToolbar(tbid,edid,tb){
+function initToolbar(tbid,edid,tb, allowblock){
var toolbar = $(tbid);
if(!toolbar) return;
var edit = $(edid);
if(!edit) return;
if(edit.readOnly) return;
+ if (typeof allowblock === 'undefined') {
+ allowblock = true;
+ }
+
//empty the toolbar area:
toolbar.innerHTML='';
var cnt = tb.length;
for(var i=0; i<cnt; i++){
+ if (!allowblock && tb[i].block === true) {
+ continue;
+ }
var actionFunc;
// create new button
diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
new file mode 100644
index 000000000..7ac489929
--- /dev/null
+++ b/lib/tpl/default/_mediaoptions.css
@@ -0,0 +1,92 @@
+/* --- popup --- */
+
+#media__popup {
+ background-color:__background__;
+ display:none;
+ border: 1px solid __border__;
+ position: absolute;
+ width:270px;
+}
+
+#media__popup h1 {
+ text-align:center;
+ font-weight:normal;
+ background-color: __background_alt__;
+ height: 16px;
+ margin-bottom: 5px;
+ font-size:12px;
+ border-bottom: 0;
+}
+
+#media__popup p {
+ display:block;
+ line-height:14pt;
+ margin:0.5em;
+}
+
+#media_nolink {
+ padding:4px 0;
+}
+
+#media__popup label {
+ float:left;
+ width:9em;
+}
+
+#media__popup .button {
+ margin-left:auto;
+ margin-right:auto;
+}
+
+#media__popup .btnlbl {
+ text-align:center;
+}
+
+#media__popup .btnlbl input {
+ margin:0 1em;
+}
+
+#media__closeimg {
+ float:right;
+}
+
+/* --- display options --- */
+
+#media__linkopts label,
+#media__nolnk {
+ width: 80px;
+ float: left;
+ margin-left: 10px;
+}
+
+#media__linkopts label{
+ line-height: 20px;
+}
+
+#media__nolnk,
+#media__linkopts label.long{
+ margin-bottom: 8px;
+ line-height: 12px;
+}
+
+#media__linkopts label.long{
+ width: 150px;
+ float: none;
+}
+
+#media__linkopts br {
+ clear: both;
+}
+
+#media__linkopts select {
+ width: 60px;
+ margin-left: 10px;
+}
+
+#media__linkopts input.edit {
+ width:50px;
+ margin-left:10px;
+}
+#media__linkopts #media__title {
+ width:150px;
+}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 84d04e743..c5b2c31a5 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -11,6 +11,7 @@ design.css = screen
style.css = screen
media.css = screen
+_mediaoptions.css = screen
_admin.css = screen
_linkwiz.css = screen
_subscription.css = screen