diff options
| -rw-r--r-- | inc/lang/en/admin.txt | 3 | ||||
| -rw-r--r-- | inc/lang/en/conflict.txt | 7 | ||||
| -rw-r--r-- | inc/lang/en/diff.txt | 3 | ||||
| -rw-r--r-- | inc/lang/en/draft.txt | 7 | ||||
| -rw-r--r-- | inc/lang/en/edit.txt | 5 | ||||
| -rw-r--r-- | inc/lang/en/editrev.txt | 3 | ||||
| -rw-r--r-- | inc/lang/en/locked.txt | 3 | ||||
| -rw-r--r-- | inc/lang/en/login.txt | 3 | ||||
| -rw-r--r-- | inc/lang/en/newpage.txt | 4 | ||||
| -rw-r--r-- | inc/lang/en/register.txt | 5 | ||||
| -rw-r--r-- | inc/lang/en/resendpwd.txt | 4 | ||||
| -rw-r--r-- | inc/lang/en/searchpage.txt | 4 | ||||
| -rw-r--r-- | inc/lang/en/wordblock.txt | 4 |
13 files changed, 15 insertions, 40 deletions
diff --git a/inc/lang/en/admin.txt b/inc/lang/en/admin.txt index b04a344d1..cfd21b217 100644 --- a/inc/lang/en/admin.txt +++ b/inc/lang/en/admin.txt @@ -1,5 +1,4 @@ ====== Administration ====== -Below you can find a list of administrative tasks available in -DokuWiki. +Below you can find a list of administrative tasks available in DokuWiki. diff --git a/inc/lang/en/conflict.txt b/inc/lang/en/conflict.txt index 197bbd6e3..624f17b21 100644 --- a/inc/lang/en/conflict.txt +++ b/inc/lang/en/conflict.txt @@ -1,9 +1,6 @@ ====== A newer version exists ====== -A newer version of the document you edited exists. This happens when another -user changed the document while you were editing it. +A newer version of the document you edited exists. This happens when another user changed the document while you were editing it. -Examine the differences shown below thoroughly, then decide which version to -keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to -keep the current version. +Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version. diff --git a/inc/lang/en/diff.txt b/inc/lang/en/diff.txt index b56efc866..4fa0f4689 100644 --- a/inc/lang/en/diff.txt +++ b/inc/lang/en/diff.txt @@ -1,5 +1,4 @@ ======Differences====== -This shows you the differences between the selected revision and the current -version of the page. +This shows you the differences between the selected revision and the current version of the page. diff --git a/inc/lang/en/draft.txt b/inc/lang/en/draft.txt index cbe1ea1b4..e84d34a5b 100644 --- a/inc/lang/en/draft.txt +++ b/inc/lang/en/draft.txt @@ -1,9 +1,6 @@ ====== Draft file found ====== -Your last edit session on this page was not completed correctly. DokuWiki -automatically saved a draft during your work which you may now use to continue -your editing. Below you can see the data that was saved from your last session. +Your last edit session on this page was not completed correctly. DokuWiki automatically saved a draft during your work which you may now use to continue your editing. Below you can see the data that was saved from your last session. -Please decide if you want to //recover// your lost edit session, //delete// -the autosaved draft or //cancel// the editing process. +Please decide if you want to //recover// your lost edit session, //delete// the autosaved draft or //cancel// the editing process. diff --git a/inc/lang/en/edit.txt b/inc/lang/en/edit.txt index 6c4a2aee9..48c9c296d 100644 --- a/inc/lang/en/edit.txt +++ b/inc/lang/en/edit.txt @@ -1,5 +1,2 @@ -Edit the page and hit ''Save''. See [[wiki:syntax]] for -Wiki syntax. Please edit the page only if you can **improve** it. If you -want to test some things, learn to make your first steps on the -[[playground:playground|playground]]. +Edit the page and hit ''Save''. See [[wiki:syntax]] for Wiki syntax. Please edit the page only if you can **improve** it. If you want to test some things, learn to make your first steps on the [[playground:playground|playground]]. diff --git a/inc/lang/en/editrev.txt b/inc/lang/en/editrev.txt index 3b68afaf1..638216b07 100644 --- a/inc/lang/en/editrev.txt +++ b/inc/lang/en/editrev.txt @@ -1,3 +1,2 @@ -**You've loaded an old revision of the document!** If you save it, you will create -a new version with this data. +**You've loaded an old revision of the document!** If you save it, you will create a new version with this data. ---- diff --git a/inc/lang/en/locked.txt b/inc/lang/en/locked.txt index 89dceacb6..af6347a96 100644 --- a/inc/lang/en/locked.txt +++ b/inc/lang/en/locked.txt @@ -1,4 +1,3 @@ ====== Page locked ====== -This page is currently locked for editing by another user. You have to wait -until this user finishes editing or the lock expires. +This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires. diff --git a/inc/lang/en/login.txt b/inc/lang/en/login.txt index d108cf739..2004ea198 100644 --- a/inc/lang/en/login.txt +++ b/inc/lang/en/login.txt @@ -1,5 +1,4 @@ ====== Login ====== -You are currently not logged in! Enter your authentication credentials below to log in. -You need to have cookies enabled to log in. +You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in. diff --git a/inc/lang/en/newpage.txt b/inc/lang/en/newpage.txt index f82c8a13d..03d703cd0 100644 --- a/inc/lang/en/newpage.txt +++ b/inc/lang/en/newpage.txt @@ -1,6 +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 using the ''Create this page'' button. diff --git a/inc/lang/en/register.txt b/inc/lang/en/register.txt index 405166a8a..4ebcb7e45 100644 --- a/inc/lang/en/register.txt +++ b/inc/lang/en/register.txt @@ -1,7 +1,4 @@ ====== Register as new user ====== -Fill in all the information below to create a new account in this wiki. -Make sure you supply a **valid e-mail address** - if you are not asked -to enter a password here, a new one will be sent to that address. -The login name should be a valid [[doku>wiki:pagename|pagename]]. +Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - if you are not asked to enter a password here, a new one will be sent to that address. The login name should be a valid [[doku>wiki:pagename|pagename]]. diff --git a/inc/lang/en/resendpwd.txt b/inc/lang/en/resendpwd.txt index d8b1bf90b..98c8c756b 100644 --- a/inc/lang/en/resendpwd.txt +++ b/inc/lang/en/resendpwd.txt @@ -1,6 +1,4 @@ ====== Send new password ====== -Please enter your user name in the form below to request a new password for your -account in this wiki. A confirmation link will be sent to your registered email -address. +Please enter your user name in the form below to request a new password for your account in this wiki. A confirmation link will be sent to your registered email address. diff --git a/inc/lang/en/searchpage.txt b/inc/lang/en/searchpage.txt index 041609db6..cfa525d7b 100644 --- a/inc/lang/en/searchpage.txt +++ b/inc/lang/en/searchpage.txt @@ -1,7 +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 button. =====Results===== diff --git a/inc/lang/en/wordblock.txt b/inc/lang/en/wordblock.txt index f3a1518df..3351e5959 100644 --- a/inc/lang/en/wordblock.txt +++ b/inc/lang/en/wordblock.txt @@ -1,6 +1,4 @@ ======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. +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. |