Merge branch '3.0'

[GitHub/WoltLab/WCF.git] / wcfsetup / install / lang / en.xml

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 3caf311ead50f440a8935f1587e3d64c3d702510..9d277761aba7464da2c4cdbc244e62df21862603 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -765,7 +765,7 @@
                <item name="wcf.acp.language.name.description"><![CDATA[Language Name]]></item>
                <item name="wcf.acp.language.add.source.description"><![CDATA[The selected language will be used as origin, all phrases will be copied into the new language.]]></item>
                <item name="wcf.acp.language.item.oldValue"><![CDATA[Original Content]]></item>
-               <item name="wcf.acp.language.item.oldValue.description"><![CDATA[Your custom value was based on the original content that has changed on {$item->languageCustomItemDisableTime|date}.]]></item>
+               <item name="wcf.acp.language.item.oldValue.description"><![CDATA[Your custom value was based on the original content that has changed{if $item->languageCustomItemDisableTime} on {$item->languageCustomItemDisableTime|date}{/if}.]]></item>
                <item name="wcf.acp.language.item.recentlyDisabledCustomValues"><![CDATA[Recently disabled customized values (past 7 days)]]></item>
                <item name="wcf.acp.language.item.hasRecentlyDisabledCustomValues"><![CDATA[{if $recentlyDisabledCustomValues == 1}One{else}{#$recentlyDisabledCustomValues}{/if} customized {if $recentlyDisabledCustomValues == 1}phrase has been{else}phrases have been{/if} <a href="{link controller='LanguageItemList' hasRecentlyDisabledCustomValue=1}{/link}">automatically disabled</a> recently.]]></item>
        </category>
@@ -1361,6 +1361,7 @@ When prompted for the notification URL for the instant payment notifications, pl
                <item name="wcf.acp.option.google_maps_api_key.description"><![CDATA[Google provides a detailed description on how to get an API key <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.google.com/maps/documentation/javascript/get-api-key'|rawurlencode}" class="externalURL">here</a>.]]></item>
                <item name="wcf.acp.option.suffix.chars"><![CDATA[Chars]]></item>
                <item name="wcf.acp.option.suffix.days"><![CDATA[Days]]></item>
+               <item name="wcf.acp.option.suffix.hours"><![CDATA[Hours]]></item>
                <item name="wcf.acp.option.suffix.minutes"><![CDATA[Minutes]]></item>
                <item name="wcf.acp.option.suffix.percent"><![CDATA[%]]></item>
                <item name="wcf.acp.option.suffix.pixel"><![CDATA[Pixels]]></item>
@@ -1746,7 +1747,7 @@ When prompted for the notification URL for the instant payment notifications, pl
                <item name="wcf.acp.sitemap.cliInfo"><![CDATA[You can rebuild the sitemap using CLI. For that, execute <kbd>worker wcf\system\worker\SitemapRebuildWorker</kbd> in a CLI session.]]></item>
                <item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.user"><![CDATA[User]]></item>
                <item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.articleCategory"><![CDATA[Article categories]]></item>
-               <item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.article"><![CDATA[Article]]></item>
+               <item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.article"><![CDATA[Articles]]></item>
                <item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.simplePage"><![CDATA[Simple pages]]></item>
                <item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.multilingualPage"><![CDATA[Multilingual pages]]></item>
        </category>
@@ -2230,6 +2231,7 @@ full extend.]]></item>
                <item name="wcf.acp.user.action.sendMail"><![CDATA[Send Email]]></item>
                <item name="wcf.acp.user.action.sendNewPassword"><![CDATA[Send New Password]]></item>
                <item name="wcf.acp.user.action.sendNewPassword.confirmMessage"><![CDATA[Do you really want to send a new password to this user?]]></item>
+               <item name="wcf.acp.user.exportGdpr"><![CDATA[Export Personal Data (GDPR)]]></item>
        </category>
        
        <category name="wcf.acp.worker">
@@ -2814,7 +2816,7 @@ Email: {@$emailAddress} {* this line ends with a space *}
                
                <item name="wcf.editor.quote.author"><![CDATA[Source]]></item>
                <item name="wcf.editor.quote.edit"><![CDATA[Edit Quote]]></item>
-               <item name="wcf.editor.quote.title"><![CDATA[{if $author}Quote from {$author}{else}Quote{/if}]]></item>
+               <item name="wcf.editor.quote.title"><![CDATA[{if $author}Quote from {@$author}{else}Quote{/if}]]></item>
                <item name="wcf.editor.quote.url"><![CDATA[Link]]></item>
                <item name="wcf.editor.quote.url.description"><![CDATA[Optional: Specify the link to the source.]]></item>
                <item name="wcf.editor.quote.url.error.invalid"><![CDATA[You have entered an invalid link.]]></item>
@@ -4008,7 +4010,7 @@ your notifications on <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language}
                <item name="wcf.user.notification.mail.daily.subject"><![CDATA[{if $count == 1}New Notification{else}{#$count} New Notifications{/if}]]></item>
                <item name="wcf.user.notification.mail.daily.plaintext.intro"><![CDATA[Dear {@$mailbox->getUser()->username},
 
-You currently have got {#$notifications|count} unread notification{if $notifications|count != 1}s{/if} that {if $notifications|count == 1}is{else}are{/if} older than 24 hours:]]></item>
+You currently have got {#$notifications|count} unread notification{if $notifications|count != 1}s{/if} older than 24 hours:]]></item>
                <item name="wcf.user.notification.mail.daily.plaintext.outro"><![CDATA[{if $notifications|count > $maximum}Visit your notification list [URL:{link controller='NotificationList' isEmail=true}{/link}] to view the remaining {#$remaining} notifications.
 
 {/if}This is an automatic notification, PLEASE DO NOT REPLY TO THIS EMAIL!
@@ -4020,7 +4022,7 @@ If you wish to disable all email notifications you can do so by visiting:
 {link controller='NotificationDisable' isEmail=true}userID={@$mailbox->getUser()->userID}&token={@$mailbox->getUser()->notificationMailToken}{/link}]]></item>
                <item name="wcf.user.notification.mail.daily.html.intro"><![CDATA[<h2>Dear {@$mailbox->getUser()->username},</h2>
 
-<p>You currently have got {#$notifications|count} unread notification{if $notifications|count != 1}s{/if} that {if $notifications|count == 1}is{else}are{/if} older than 24 hours:</p>]]></item>
+<p>You currently have got {#$notifications|count} unread notification{if $notifications|count != 1}s{/if} older than 24 hours:</p>]]></item>
                <item name="wcf.user.notification.mail.daily.html.outro"><![CDATA[<p>{if $notifications|count > $maximum}Visit your <a href="{link controller='NotificationList' isEmail=true}{/link}">notification list</a> to view the remaining {#$remaining} notifications.</p>{/if}
 
 <p>This is an automatic notification, <b>please do not reply to this email</b>!</p>