From 633dc76cb077e18680e4520e3df6c16e892dca9d Mon Sep 17 00:00:00 2001 From: Smooey Date: Thu, 11 May 2017 08:11:43 -0400 Subject: [PATCH] WCF 2.1 phrase adjustments 1st wave (#2260) * WCF 2.1 phrase adjustments 1st wave * WCF 2.1 phrase adjustments 2nd wave * WCF 2.1 phrase adjustments 2nd wave * WCF 2.1 phrase adjustments 3rd wave Keeping users online location short, less descriptive, less intrusive/nosy, yet try to be consistent. --- wcfsetup/install/lang/en.xml | 113 +++++++++++++++++------------------ 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 2b79a787a2..7ec65fa1dc 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -80,7 +80,7 @@ - + @@ -103,8 +103,7 @@ {$ID} will be replaced with the medium ID as shown above.{/literal}]]> - getPath()}acp/dereferrer.php?url=http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FRegular_expression">regular expression. Enter one expression per line. -Examples for medium ID detection: + getPath()}acp/dereferrer.php?url=http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FRegular_expression">regular expression. Enter one expression per line. Examples for medium ID detection:
  • (?<ID>[0-9]+) detects a numeric ID.
  • (?<ID>[0-9a-zA-Z]+) detects an alphanumeric ID.
    • @@ -141,7 +140,7 @@ Examples for medium ID detection: - + question|language}”?]]> @@ -273,7 +272,7 @@ Examples for medium ID detection: - + @@ -288,8 +287,8 @@ Examples for medium ID detection: - - + + @@ -572,7 +571,7 @@ Examples for medium ID detection: - + @@ -686,7 +685,7 @@ Examples for medium ID detection: - + @@ -701,13 +700,13 @@ Examples for medium ID detection: memcached.org.]]> - + - + @@ -763,7 +762,7 @@ Examples for medium ID detection: - + @@ -830,13 +829,13 @@ Examples for medium ID detection: - + reCAPTCHA website.]]> - + @@ -975,7 +974,7 @@ Examples for medium ID detection: - + @@ -1075,7 +1074,7 @@ Examples for medium ID detection: - + @@ -1202,7 +1201,7 @@ Examples for medium ID detection: - + @@ -1418,9 +1417,9 @@ Examples for medium ID detection: - - - + + + @@ -1599,7 +1598,7 @@ Examples for medium ID detection: - + @@ -1642,7 +1641,7 @@ You can define the default sender in System -> Options -> General -> - + optionName}{/lang}”?]]> @@ -1656,13 +1655,13 @@ You can define the default sender in System -> Options -> General -> - + - + @@ -1765,7 +1764,7 @@ You can now fully access the website.]]> - + @@ -2197,7 +2196,7 @@ Errors are: - + @@ -2220,7 +2219,7 @@ Errors are: - + @@ -2717,7 +2716,7 @@ Errors are: - + user->username}]]> @@ -2729,7 +2728,7 @@ Errors are: 1} ({#$number}×){/if}{/implode}.]]> user->banExpires != 0} until {@$__wcf->user->banExpires|plainTime}{/if}{if $__wcf->user->banReason}: {@$__wcf->user->banReason|htmlspecialchars|nl2br}{else}.{/if}]]> - + @@ -2863,9 +2862,9 @@ If you cannot activate your email address or have any troubles following the ins - + - + @@ -2909,8 +2908,8 @@ If you cannot activate your email address or have any troubles following the ins - - username} has been banned{if $user->banExpires != 0} until {@$user->banExpires|date}{/if}.]]> + + username}” has been banned{if $user->banExpires != 0} until {@$user->banExpires|date}{/if}.]]> @@ -3002,18 +3001,18 @@ You can safely ignore this email if you did not register with the website: {@PAG {/if}]]> - userID}">{$user->username}]]> + userID}">{$user->username}]]> - + - - - - - - - + + + + + + + @@ -3089,12 +3088,12 @@ You can safely ignore this email if you did not register with the website: {@PAG - - - - - - + + + + + + @@ -3119,16 +3118,16 @@ You can safely ignore this email if you did not register with the website: {@PAG - - + + - - + + - - + + @@ -3225,7 +3224,7 @@ If you do not want to receive further email notifications for this event, you ca getUser()->userID}You have not provided any details yet.{else}There are not any details visible to you.{/if}]]> - username}’s Follower]]> + username}’s Followers]]> username} Follows]]> @@ -3265,7 +3264,7 @@ If you do not want to receive further email notifications for this event, you ca - + @@ -3319,4 +3318,4 @@ If you do not want to receive further email notifications for this event, you ca - + \ No newline at end of file -- 2.20.1