From cc204bbd1f1625352ddd0edaacdd297fe022881c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 31 Oct 2011 15:41:53 +0100
Subject: honor autopasswd setting for resend password

When autopasswd is disabled, the resend password option now asks for a
new password instead of autogenerating a new one and sending it by mail.

Note to translators: the wording for btn_resendpwd and resendpwd changed
to be more universal. English and German language files where updated -
other languages need to be adjusted.

Conflicts:

	inc/lang/en/lang.php
---
 inc/lang/en/lang.php     | 4 ++--
 inc/lang/en/resetpwd.txt | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 inc/lang/en/resetpwd.txt

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 89a7c4d40..9d26a4957 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.';
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.
+
-- 
cgit v1.2.3


From b2117c6969fc31aa958f6019fd1e4e258f555db7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 7 Nov 2011 14:49:29 +0100
Subject: translatable AD expiry warning and link to update profile page

---
 inc/lang/en/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 89a7c4d40..9250d119a 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -275,6 +275,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 <a href="?do=profile">change it</a>.';
 
 /* installer strings */
 $lang['i_chooselang']          = 'Choose your language';
-- 
cgit v1.2.3


From f08086ec453c4529ae7361f9540b430ee61238f0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 13 Nov 2011 12:37:45 +0100
Subject: Added HTML wrapper for mails

The mailwrap.html adds the standard headers and footers to all HTML
mails. The signature present in the text body will be removed before
inserting in the wrapper, allowing a nicer footer for HTML.

Users can overwrite the file with their own to create HTML mails in
corporate design. However, a way to automatically embed referenced
images is missing currently.
---
 inc/lang/en/mailwrap.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 inc/lang/en/mailwrap.html

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/mailwrap.html b/inc/lang/en/mailwrap.html
new file mode 100644
index 000000000..d67644c95
--- /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 /><br /><hr />
+<small>This mail was generated by DokuWiki at @DOKUWIKIURL@.</small>
+</body>
+</html>
-- 
cgit v1.2.3


From 850dbf1f4b1e2bdee8b2e5f0438a5625d0a1bedf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 13 Nov 2011 13:06:07 +0100
Subject: allow image embeds in HTML mail templates

Using the place holder @MEDIA(<mediaid>)@ you now can directly embed
images from the media repository into your HTML mail template.

An example was added to the mailwrap.html, but because images are
embedded as is (no prescaling) this is suboptimal. If we keep it, a
smaller version of the DokuWiki logo should be shipped with DokuWiki.
---
 inc/lang/en/mailwrap.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/mailwrap.html b/inc/lang/en/mailwrap.html
index d67644c95..00daf29ac 100644
--- a/inc/lang/en/mailwrap.html
+++ b/inc/lang/en/mailwrap.html
@@ -8,6 +8,7 @@
 @HTMLBODY@
 
 <br /><br /><hr />
+<img src="@MEDIA(wiki:dokuwiki-128.png)@" width="32" height="32" alt="DokuWiki" align="left" />
 <small>This mail was generated by DokuWiki at @DOKUWIKIURL@.</small>
 </body>
 </html>
-- 
cgit v1.2.3


From 61917024a6e927db44aff03e4d7ea5a64bd3ec08 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 29 Jan 2012 18:25:52 +0000
Subject: added 5 new language strings for action tools and skip link (needs
 translations)

This is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them.
---
 inc/lang/en/lang.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 3f74a8d9c..24974ea5e 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -195,6 +195,11 @@ $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['mail_newpage']          = 'page added:';
 $lang['mail_changed']          = 'page changed:';
-- 
cgit v1.2.3


From 69995a164f9dbb51adfe17f09901e0200ea8dc7a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 17 Feb 2012 13:39:38 +0100
Subject: do not hardcode profile link in AD pass expire message

Changing passwords might not be available.
---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 9250d119a..5c8628da5 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -275,7 +275,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 <a href="?do=profile">change it</a>.';
+$lang['authpwdexpire']         = 'Your password will expire in %d days, you should change it soon.';
 
 /* installer strings */
 $lang['i_chooselang']          = 'Choose your language';
-- 
cgit v1.2.3


From d2113a3cac4f670858d94dc53de4f653828dac91 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Mar 2012 09:19:30 +0100
Subject: removed footer image from HTML mails

---
 inc/lang/en/mailwrap.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/mailwrap.html b/inc/lang/en/mailwrap.html
index 00daf29ac..f9f80fd80 100644
--- a/inc/lang/en/mailwrap.html
+++ b/inc/lang/en/mailwrap.html
@@ -7,8 +7,7 @@
 
 @HTMLBODY@
 
-<br /><br /><hr />
-<img src="@MEDIA(wiki:dokuwiki-128.png)@" width="32" height="32" alt="DokuWiki" align="left" />
+<br /><hr />
 <small>This mail was generated by DokuWiki at @DOKUWIKIURL@.</small>
 </body>
 </html>
-- 
cgit v1.2.3


From 6e87cfd37115039280bb5d88291d188c94b07a38 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Mar 2012 12:50:47 +0100
Subject: fixed subscriber mail signatures

---
 inc/lang/en/subscr_digest.txt | 2 +-
 inc/lang/en/subscr_list.txt   | 2 +-
 inc/lang/en/subscr_single.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/lang/en')

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@
-- 
cgit v1.2.3


From f940e4a0129ffeefd746c0ebdb25132413e388c0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 23 Apr 2012 13:23:20 +0200
Subject: display uploadable file size in media manager FS#2425

---
 inc/lang/en/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 2ba220e64..c1fc543fb 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -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';
 
-- 
cgit v1.2.3


From d6b9c7bffaacf3b0b983386eca336e4f8d60a2f3 Mon Sep 17 00:00:00 2001
From: lupo49 <post@lupo49.de>
Date: Tue, 8 May 2012 20:18:35 +0200
Subject: Restore page versions - add timestamp of the restored version to to
 the summary field. This allows easier identifying of which version has been
 restored. (FS#2522)

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index c1fc543fb..7f0bf05e9 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -191,7 +191,7 @@ $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.';
-- 
cgit v1.2.3


From a655c8784a73a3fcef7f41f59f871e7a78d3101b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 8 Jul 2012 23:28:07 +0100
Subject: added lang string for 'Sidebar'

---
 inc/lang/en/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 7f0bf05e9..3c51ba224 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -201,6 +201,7 @@ $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:';
-- 
cgit v1.2.3


From d6ba7eb1ef8c1fe1b561e77b0788611bde35c527 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 14 Jul 2012 12:46:37 +0100
Subject: fixed validation errors in the installer

---
 inc/lang/en/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/lang/en')

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
-- 
cgit v1.2.3


From 71e14df475a4a212fd2a7b6efa38ef95352401f8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 15 Jul 2012 21:56:17 +0100
Subject: reworded the word 'button' to be more generic and independent from
 template (FS#2543)

---
 inc/lang/en/newpage.txt    | 2 +-
 inc/lang/en/norev.txt      | 2 +-
 inc/lang/en/searchpage.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/lang/en')

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/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 =====
-- 
cgit v1.2.3


From eef93e99be0d44ec6dc4fa86373ba6fd2b8c5f48 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 8 Sep 2012 13:22:44 +0200
Subject: Use hardcoded plugin loading error message as $lang isn't initialized

When loading plugins, $lang might not be initialized yet, so use a
hardcoded error message instead, especially as this error should only be
displayed for the admin (and then fixed). This also removes the
previously localized message, it might be re-added as part of the new
extension manager.
---
 inc/lang/en/lang.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'inc/lang/en')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 3c51ba224..0e5a9ac3c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -347,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 :
-- 
cgit v1.2.3