summaryrefslogtreecommitdiff
path: root/inc/lang/en
diff options
context:
space:
mode:
Diffstat (limited to 'inc/lang/en')
-rw-r--r--inc/lang/en/install.html2
-rw-r--r--inc/lang/en/lang.php34
-rw-r--r--inc/lang/en/mailwrap.html13
-rw-r--r--inc/lang/en/newpage.txt2
-rw-r--r--inc/lang/en/norev.txt2
-rw-r--r--inc/lang/en/resetpwd.txt4
-rw-r--r--inc/lang/en/searchpage.txt2
-rw-r--r--inc/lang/en/subscr_digest.txt2
-rw-r--r--inc/lang/en/subscr_list.txt2
-rw-r--r--inc/lang/en/subscr_single.txt2
10 files changed, 36 insertions, 29 deletions
diff --git a/inc/lang/en/install.html b/inc/lang/en/install.html
index 0f94839a6..df2b69935 100644
--- a/inc/lang/en/install.html
+++ b/inc/lang/en/install.html
@@ -12,7 +12,7 @@ normally needs to be done directly on a command shell or if you are using hostin
through FTP or your hosting control panel (e.g. cPanel).</p>
<p>This installer will setup your DokuWiki configuration for
-<acronym title="access control list">ACL</acronym>, which in turn allows administrator
+<abbr title="access control list">ACL</abbr>, which in turn allows administrator
login and access to DokuWiki's admin menu for installing plugins, managing
users, managing access to wiki pages and alteration of configuration settings.
It isn't required for DokuWiki to operate, however it will make Dokuwiki easier
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 89a7c4d40..0e5a9ac3c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -43,7 +43,7 @@ $lang['btn_backtomedia'] = 'Back to Mediafile Selection';
$lang['btn_subscribe'] = 'Manage Subscriptions';
$lang['btn_profile'] = 'Update Profile';
$lang['btn_reset'] = 'Reset';
-$lang['btn_resendpwd'] = 'Send new password';
+$lang['btn_resendpwd'] = 'Set new password';
$lang['btn_draft'] = 'Edit draft';
$lang['btn_recover'] = 'Recover draft';
$lang['btn_draftdel'] = 'Delete draft';
@@ -84,7 +84,7 @@ $lang['profchanged'] = 'User profile successfully updated.';
$lang['pwdforget'] = 'Forgotten your password? Get a new one';
$lang['resendna'] = 'This wiki does not support password resending.';
-$lang['resendpwd'] = 'Send new password for';
+$lang['resendpwd'] = 'Set new password for';
$lang['resendpwdmissing'] = 'Sorry, you must fill in all fields.';
$lang['resendpwdnouser'] = 'Sorry, we can\'t find this user in our database.';
$lang['resendpwdbadauth'] = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.';
@@ -99,6 +99,7 @@ $lang['searchmedia_in'] = 'Search in %s';
$lang['txt_upload'] = 'Select file to upload';
$lang['txt_filename'] = 'Upload as (optional)';
$lang['txt_overwrt'] = 'Overwrite existing file';
+$lang['maxuploadsize'] = 'Upload max. %s per file.';
$lang['lockedby'] = 'Currently locked by';
$lang['lockexpire'] = 'Lock expires at';
@@ -166,7 +167,7 @@ $lang['accessdenied'] = 'You are not allowed to view this page.';
$lang['mediausage'] = 'Use the following syntax to reference this file:';
$lang['mediaview'] = 'View original file';
$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. Files also can be selected by drag and drop.';
+$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your filename separated by colons after you selected the files. Files can also be selected by drag and drop.';
$lang['mediaextchange'] = 'Filextension changed from .%s to .%s!';
$lang['reference'] = 'References for';
$lang['ref_inuse'] = 'The file can\'t be deleted, because it\'s still used by the following pages:';
@@ -190,11 +191,17 @@ $lang['lastmod'] = 'Last modified';
$lang['by'] = 'by';
$lang['deleted'] = 'removed';
$lang['created'] = 'created';
-$lang['restored'] = 'old revision restored';
+$lang['restored'] = 'old revision restored (%s)';
$lang['external_edit'] = 'external edit';
$lang['summary'] = 'Edit summary';
$lang['noflash'] = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
$lang['download'] = 'Download Snippet';
+$lang['tools'] = 'Tools';
+$lang['user_tools'] = 'User Tools';
+$lang['site_tools'] = 'Site Tools';
+$lang['page_tools'] = 'Page Tools';
+$lang['skip_to_content'] = 'skip to content';
+$lang['sidebar'] = 'Sidebar';
$lang['mail_newpage'] = 'page added:';
$lang['mail_changed'] = 'page changed:';
@@ -275,6 +282,7 @@ $lang['subscr_style_list'] = 'list of changed pages since last email (e
/* auth.class language support */
$lang['authmodfailed'] = 'Bad user authentication configuration. Please inform your Wiki Admin.';
$lang['authtempfail'] = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
+$lang['authpwdexpire'] = 'Your password will expire in %d days, you should change it soon.';
/* installer strings */
$lang['i_chooselang'] = 'Choose your language';
@@ -304,22 +312,6 @@ $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registere
$lang['i_retry'] = 'Retry';
$lang['i_license'] = 'Please choose the license you want to put your content under:';
-$lang['mu_intro'] = 'Here you can upload multiple files at once. Click the browse button to add them to the queue. Press upload when done.';
-$lang['mu_gridname'] = 'Filename';
-$lang['mu_gridsize'] = 'Size';
-$lang['mu_gridstat'] = 'Status';
-$lang['mu_namespace'] = 'Namespace';
-$lang['mu_browse'] = 'Browse';
-$lang['mu_toobig'] = 'too big';
-$lang['mu_ready'] = 'ready for upload';
-$lang['mu_done'] = 'complete';
-$lang['mu_fail'] = 'failed';
-$lang['mu_authfail'] = 'session expired';
-$lang['mu_progress'] = '@PCT@% uploaded';
-$lang['mu_filetypes'] = 'Allowed Filetypes';
-$lang['mu_info'] = 'files uploaded.';
-$lang['mu_lasterr'] = 'Last error:';
-
$lang['recent_global'] = 'You\'re currently watching the changes inside the <b>%s</b> namespace. You can also <a href="%s">view the recent changes of the whole wiki</a>.';
$lang['years'] = '%d years ago';
$lang['months'] = '%d months ago';
@@ -355,6 +347,4 @@ $lang['media_perm_upload'] = 'Sorry, you don\'t have enough rights to upload
$lang['media_update'] = 'Upload new version';
$lang['media_restore'] = 'Restore this version';
-$lang['plugin_install_err'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
-
//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/en/mailwrap.html b/inc/lang/en/mailwrap.html
new file mode 100644
index 000000000..f9f80fd80
--- /dev/null
+++ b/inc/lang/en/mailwrap.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+ <title>@TITLE@</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+@HTMLBODY@
+
+<br /><hr />
+<small>This mail was generated by DokuWiki at @DOKUWIKIURL@.</small>
+</body>
+</html>
diff --git a/inc/lang/en/newpage.txt b/inc/lang/en/newpage.txt
index 848d4df09..e78b534a0 100644
--- a/inc/lang/en/newpage.txt
+++ b/inc/lang/en/newpage.txt
@@ -1,4 +1,4 @@
====== This topic does not exist yet ======
-You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by using the ''Create this page'' button.
+You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by clicking on "Create this page".
diff --git a/inc/lang/en/norev.txt b/inc/lang/en/norev.txt
index 0b21bf3f0..27c336be7 100644
--- a/inc/lang/en/norev.txt
+++ b/inc/lang/en/norev.txt
@@ -1,4 +1,4 @@
====== No such revision ======
-The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
+The specified revision doesn't exist. Click on "Old revisions" for a list of old revisions of this document.
diff --git a/inc/lang/en/resetpwd.txt b/inc/lang/en/resetpwd.txt
new file mode 100644
index 000000000..993b48765
--- /dev/null
+++ b/inc/lang/en/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Set new password ======
+
+Please enter a new password for your account in this wiki.
+
diff --git a/inc/lang/en/searchpage.txt b/inc/lang/en/searchpage.txt
index e357d6cdd..50578db3f 100644
--- a/inc/lang/en/searchpage.txt
+++ b/inc/lang/en/searchpage.txt
@@ -1,5 +1,5 @@
====== Search ======
-You can find the results of your search below. If you didn't find what you were looking for, you can create or edit the page named after your query with the appropriate button.
+You can find the results of your search below. If you didn't find what you were looking for, you can create or edit the page named after your query with the appropriate tool.
===== Results =====
diff --git a/inc/lang/en/subscr_digest.txt b/inc/lang/en/subscr_digest.txt
index fac8564bd..35011b6e6 100644
--- a/inc/lang/en/subscr_digest.txt
+++ b/inc/lang/en/subscr_digest.txt
@@ -15,6 +15,6 @@ To cancel the page notifications, log into the wiki at
@SUBSCRIBE@
and unsubscribe page and/or namespace changes.
---
+--
This mail was generated by DokuWiki at
@DOKUWIKIURL@
diff --git a/inc/lang/en/subscr_list.txt b/inc/lang/en/subscr_list.txt
index efe27d866..4c38b9326 100644
--- a/inc/lang/en/subscr_list.txt
+++ b/inc/lang/en/subscr_list.txt
@@ -12,6 +12,6 @@ To cancel the page notifications, log into the wiki at
@SUBSCRIBE@
and unsubscribe page and/or namespace changes.
---
+--
This mail was generated by DokuWiki at
@DOKUWIKIURL@
diff --git a/inc/lang/en/subscr_single.txt b/inc/lang/en/subscr_single.txt
index f2abe6d77..673c4c32a 100644
--- a/inc/lang/en/subscr_single.txt
+++ b/inc/lang/en/subscr_single.txt
@@ -18,6 +18,6 @@ To cancel the page notifications, log into the wiki at
@NEWPAGE@
and unsubscribe page and/or namespace changes.
---
+--
This mail was generated by DokuWiki at
@DOKUWIKIURL@
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 12:43:13 +0000