From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 28 Apr 2016 15:32:19 +0000 (+0200)
Subject: Added generic phrases used for pages
X-Git-Tag: 3.0.0_Beta_1~1804
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee2a42f7c22f7e8bdd2d78d239a5421e679a6126;p=GitHub%2FWoltLab%2FWCF.git

Added generic phrases used for pages
---

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 842b975d99..1fb6347d57 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2523,38 +2523,9 @@ Fehler sind beispielsweise:
 		<item name="wcf.page.category.com.woltlab.wcf.moderation"><![CDATA[Moderation]]></item>
 		<item name="wcf.page.category.com.woltlab.wcf.other"><![CDATA[Weitere Seiten]]></item>
 		<item name="wcf.page.category.com.woltlab.wcf.user"><![CDATA[Benutzer]]></item>
-		<item name="wcf.page.com.woltlab.wcf.AccountManagementForm"><![CDATA[Benutzerkonto-Verwaltung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.AvatarEditForm"><![CDATA[Avatar-Verwaltung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.DisclaimerForm"><![CDATA[Disclaimer]]></item>
-		<item name="wcf.page.com.woltlab.wcf.EmailActivationForm"><![CDATA[Aktivierung neuer E-Mail-Adresse]]></item>
-		<item name="wcf.page.com.woltlab.wcf.EmailNewActivationCodeForm"><![CDATA[E-Mail-Aktivierungscode-Anforderung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.LoginForm"><![CDATA[Anmeldung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.LostPasswordForm"><![CDATA[Kennwort vergessen]]></item>
-		<item name="wcf.page.com.woltlab.wcf.MailForm"><![CDATA[E-Mail-Formular]]></item>
-		<item name="wcf.page.com.woltlab.wcf.ModerationActivationForm"><![CDATA[Inhaltsfreischaltung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.ModerationReportForm"><![CDATA[Inhaltsmeldung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.NewPasswordForm"><![CDATA[Neues Kennwort]]></item>
-		<item name="wcf.page.com.woltlab.wcf.NotificationSettingsForm"><![CDATA[Benachrichtigungseinstellungen]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RegisterActivationForm"><![CDATA[Registrierung abschließen]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RegisterForm"><![CDATA[Registrierung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RegisterNewActivationCodeForm"><![CDATA[Aktivierungscode-Anforderung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SearchForm"><![CDATA[Suche]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SettingsForm"><![CDATA[Einstellungen]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SignatureEditForm"><![CDATA[Signatur-Verwaltung]]></item>
-		<item name="wcf.page.com.woltlab.wcf.UserSearchForm"><![CDATA[Mitgliedersuche]]></item>
-		<item name="wcf.page.com.woltlab.wcf.DeletedContentListPage"><![CDATA[Gelöschte Inhalte]]></item>
-		<item name="wcf.page.com.woltlab.wcf.FollowingPage"><![CDATA[Benutzer, denen Sie folgen]]></item>
-		<item name="wcf.page.com.woltlab.wcf.IgnoredUsersPage"><![CDATA[Blockierte Benutzer]]></item>
-		<item name="wcf.page.com.woltlab.wcf.MembersListPage"><![CDATA[Mitglieder]]></item>
-		<item name="wcf.page.com.woltlab.wcf.ModerationListPage"><![CDATA[Moderation]]></item>
-		<item name="wcf.page.com.woltlab.wcf.NotificationListPage"><![CDATA[Benachrichtigungen]]></item>
-		<item name="wcf.page.com.woltlab.wcf.PaidSubscriptionListPage"><![CDATA[Bezahlte Mitgliedschaften]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RecentActivityListPage"><![CDATA[Letzte Aktivitäten]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SearchResultPage"><![CDATA[Suchergebnisse]]></item>
-		<item name="wcf.page.com.woltlab.wcf.TaggedPage"><![CDATA[Inhalte mit bestimmtem Tag]]></item>
-		<item name="wcf.page.com.woltlab.wcf.TeamPage"><![CDATA[Team-Mitglieder]]></item>
-		<item name="wcf.page.com.woltlab.wcf.UserPage"><![CDATA[Benutzerprofil]]></item>
-		<item name="wcf.page.com.woltlab.wcf.UsersOnlineListPage"><![CDATA[Benutzer online]]></item>
+		<item name="wcf.page.comments"><![CDATA[Kommentare]]></item>
+		
+		<!-- TODO: these variables are mostly irrelevant, but some are still of use, such as the custom phrase for the user profile -->
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[Benutzerprofil von <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.UsersOnlineList"><![CDATA[Benutzer-Online-Liste]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.MembersList"><![CDATA[Mitgliederliste]]></item>
@@ -2566,7 +2537,41 @@ Fehler sind beispielsweise:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.AvatarEdit"><![CDATA[Avatar-Verwaltung]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Settings"><![CDATA[Einstellungen]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.SignatureEdit"><![CDATA[Signatur-Verwaltung]]></item>
-		<item name="wcf.page.comments"><![CDATA[Kommentare]]></item>
+		
+		<item name="wcf.page.com.woltlab.wcf.AccountManagement"><![CDATA[Benutzerkonto-Verwaltung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.AvatarEdit"><![CDATA[Avatar-Verwaltung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Dashboard"><![CDATA[Dashboard]]></item>
+		<item name="wcf.page.com.woltlab.wcf.DeletedContentList"><![CDATA[Gelöschte Inhalte]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Disclaimer"><![CDATA[Disclaimer]]></item>
+		<item name="wcf.page.com.woltlab.wcf.EditHistory"><![CDATA[TODO]]></item>
+		<item name="wcf.page.com.woltlab.wcf.EmailActivation"><![CDATA[Aktivierung neuer E-Mail-Adresse]]></item>
+		<item name="wcf.page.com.woltlab.wcf.EmailNewActivationCode"><![CDATA[E-Mail-Aktivierungscode-Anforderung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Following"><![CDATA[Benutzer, denen Sie folgen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.IgnoredUsers"><![CDATA[Blockierte Benutzer]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Login"><![CDATA[Anmeldung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.LostPassword"><![CDATA[Kennwort vergessen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Mail"><![CDATA[E-Mail-Formular]]></item>
+		<item name="wcf.page.com.woltlab.wcf.MembersList"><![CDATA[Mitglieder]]></item>
+		<item name="wcf.page.com.woltlab.wcf.ModerationActivation"><![CDATA[Inhaltsfreischaltung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.ModerationList"><![CDATA[Moderation]]></item>
+		<item name="wcf.page.com.woltlab.wcf.ModerationReport"><![CDATA[Inhaltsmeldung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.NewPassword"><![CDATA[Neues Kennwort]]></item>
+		<item name="wcf.page.com.woltlab.wcf.NotificationList"><![CDATA[Benachrichtigungen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.NotificationSettings"><![CDATA[Benachrichtigungseinstellungen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.PaidSubscriptionList"><![CDATA[Bezahlte Mitgliedschaften]]></item>
+		<item name="wcf.page.com.woltlab.wcf.RecentActivityList"><![CDATA[Letzte Aktivitäten]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Register"><![CDATA[Registrierung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.RegisterActivation"><![CDATA[Registrierung abschließen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.RegisterNewActivationCode"><![CDATA[Aktivierungscode-Anforderung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Search"><![CDATA[Suche]]></item>
+		<item name="wcf.page.com.woltlab.wcf.SearchResult"><![CDATA[Suchergebnisse]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Settings"><![CDATA[Einstellungen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.SignatureEdit"><![CDATA[Signatur-Verwaltung]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Tagged"><![CDATA[Inhalte mit bestimmtem Tag]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Team"><![CDATA[Team]]></item>
+		<item name="wcf.page.com.woltlab.wcf.User"><![CDATA[Benutzerprofil]]></item>
+		<item name="wcf.page.com.woltlab.wcf.UserSearch"><![CDATA[Benutzer suchen]]></item>
+		<item name="wcf.page.com.woltlab.wcf.UsersOnlineList"><![CDATA[Benutzer Online]]></item>
 	</category>
 	
 	<category name="wcf.paidSubscription">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 190d55d411..c38d614a16 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2560,38 +2560,9 @@ Errors are:
 		<item name="wcf.page.category.com.woltlab.wcf.moderation"><![CDATA[Moderation]]></item>
 		<item name="wcf.page.category.com.woltlab.wcf.other"><![CDATA[Other Pages]]></item>
 		<item name="wcf.page.category.com.woltlab.wcf.user"><![CDATA[Users]]></item>
-		<item name="wcf.page.com.woltlab.wcf.AccountManagementForm"><![CDATA[Account Management]]></item>
-		<item name="wcf.page.com.woltlab.wcf.AvatarEditForm"><![CDATA[Avatar Management]]></item>
-		<item name="wcf.page.com.woltlab.wcf.DisclaimerForm"><![CDATA[Disclaimer]]></item>
-		<item name="wcf.page.com.woltlab.wcf.EmailActivationForm"><![CDATA[New Email Address Verification]]></item>
-		<item name="wcf.page.com.woltlab.wcf.EmailNewActivationCodeForm"><![CDATA[New Email Activation Code Request]]></item>
-		<item name="wcf.page.com.woltlab.wcf.LoginForm"><![CDATA[Login]]></item>
-		<item name="wcf.page.com.woltlab.wcf.LostPasswordForm"><![CDATA[Lost Password]]></item>
-		<item name="wcf.page.com.woltlab.wcf.MailForm"><![CDATA[Mail Form]]></item>
-		<item name="wcf.page.com.woltlab.wcf.ModerationActivationForm"><![CDATA[Content Approval]]></item>
-		<item name="wcf.page.com.woltlab.wcf.ModerationReportForm"><![CDATA[Content Report]]></item>
-		<item name="wcf.page.com.woltlab.wcf.NewPasswordForm"><![CDATA[New Password Request]]></item>
-		<item name="wcf.page.com.woltlab.wcf.NotificationSettingsForm"><![CDATA[Notification Settings]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RegisterActivationForm"><![CDATA[Complete Registration]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RegisterForm"><![CDATA[Registration]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RegisterNewActivationCodeForm"><![CDATA[New Activation Code Request]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SearchForm"><![CDATA[Search]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SettingsForm"><![CDATA[Settings]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SignatureEditForm"><![CDATA[Signature Management]]></item>
-		<item name="wcf.page.com.woltlab.wcf.UserSearchForm"><![CDATA[Members Search]]></item>
-		<item name="wcf.page.com.woltlab.wcf.DeletedContentListPage"><![CDATA[Deleted Content]]></item>
-		<item name="wcf.page.com.woltlab.wcf.FollowingPage"><![CDATA[Followed Users]]></item>
-		<item name="wcf.page.com.woltlab.wcf.IgnoredUsersPage"><![CDATA[Blocked Users]]></item>
-		<item name="wcf.page.com.woltlab.wcf.MembersListPage"><![CDATA[Members]]></item>
-		<item name="wcf.page.com.woltlab.wcf.ModerationListPage"><![CDATA[Moderation]]></item>
-		<item name="wcf.page.com.woltlab.wcf.NotificationListPage"><![CDATA[Notifications]]></item>
-		<item name="wcf.page.com.woltlab.wcf.PaidSubscriptionListPage"><![CDATA[Paid Subscriptions]]></item>
-		<item name="wcf.page.com.woltlab.wcf.RecentActivityListPage"><![CDATA[Recent Activities]]></item>
-		<item name="wcf.page.com.woltlab.wcf.SearchResultPage"><![CDATA[Search Results]]></item>
-		<item name="wcf.page.com.woltlab.wcf.TaggedPage"><![CDATA[Content With Particular Tag]]></item>
-		<item name="wcf.page.com.woltlab.wcf.TeamPage"><![CDATA[Staff Members]]></item>
-		<item name="wcf.page.com.woltlab.wcf.UserPage"><![CDATA[User Profile]]></item>
-		<item name="wcf.page.com.woltlab.wcf.UsersOnlineListPage"><![CDATA[Users Online]]></item>
+		<item name="wcf.page.comments"><![CDATA[Comments]]></item>
+		
+		<!-- TODO: these variables are mostly irrelevant, but some are still of use, such as the custom phrase for the user profile -->
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.UsersOnlineList"><![CDATA[List of Users Online]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.MembersList"><![CDATA[Members List]]></item>
@@ -2603,7 +2574,41 @@ Errors are:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.AvatarEdit"><![CDATA[Avatar Management]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Settings"><![CDATA[Settings]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.SignatureEdit"><![CDATA[Signature Management]]></item>
-		<item name="wcf.page.comments"><![CDATA[Comments]]></item>
+		
+		<item name="wcf.page.com.woltlab.wcf.AccountManagement"><![CDATA[Account Management]]></item>
+		<item name="wcf.page.com.woltlab.wcf.AvatarEdit"><![CDATA[Avatar Management]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Dashboard"><![CDATA[Dashboard]]></item>
+		<item name="wcf.page.com.woltlab.wcf.DeletedContentList"><![CDATA[Deleted Content]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Disclaimer"><![CDATA[Disclaimer]]></item>
+		<item name="wcf.page.com.woltlab.wcf.EditHistory"><![CDATA[TODO]]></item>
+		<item name="wcf.page.com.woltlab.wcf.EmailActivation"><![CDATA[New Email Address Verification]]></item>
+		<item name="wcf.page.com.woltlab.wcf.EmailNewActivationCode"><![CDATA[New Email Activation Code Request]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Following"><![CDATA[Followed Users]]></item>
+		<item name="wcf.page.com.woltlab.wcf.IgnoredUsers"><![CDATA[Blocked Users]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Login"><![CDATA[Login]]></item>
+		<item name="wcf.page.com.woltlab.wcf.LostPassword"><![CDATA[Lost Password]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Mail"><![CDATA[Mail Form]]></item>
+		<item name="wcf.page.com.woltlab.wcf.MembersList"><![CDATA[Members]]></item>
+		<item name="wcf.page.com.woltlab.wcf.ModerationActivation"><![CDATA[Content Approval]]></item>
+		<item name="wcf.page.com.woltlab.wcf.ModerationList"><![CDATA[Moderation]]></item>
+		<item name="wcf.page.com.woltlab.wcf.ModerationReport"><![CDATA[Content Report]]></item>
+		<item name="wcf.page.com.woltlab.wcf.NewPassword"><![CDATA[New Password Request]]></item>
+		<item name="wcf.page.com.woltlab.wcf.NotificationList"><![CDATA[Notifications]]></item>
+		<item name="wcf.page.com.woltlab.wcf.NotificationSettings"><![CDATA[Notification Settings]]></item>
+		<item name="wcf.page.com.woltlab.wcf.PaidSubscriptionList"><![CDATA[Paid Subscriptions]]></item>
+		<item name="wcf.page.com.woltlab.wcf.RecentActivityList"><![CDATA[Recent Activities]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Register"><![CDATA[Registration]]></item>
+		<item name="wcf.page.com.woltlab.wcf.RegisterActivation"><![CDATA[Complete Registration]]></item>
+		<item name="wcf.page.com.woltlab.wcf.RegisterNewActivationCode"><![CDATA[New Activation Code Request]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Search"><![CDATA[Search]]></item>
+		<item name="wcf.page.com.woltlab.wcf.SearchResult"><![CDATA[Search Results]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Settings"><![CDATA[Settings]]></item>
+		<item name="wcf.page.com.woltlab.wcf.SignatureEdit"><![CDATA[Signature Management]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Tagged"><![CDATA[Content With Particular Tag]]></item>
+		<item name="wcf.page.com.woltlab.wcf.Team"><![CDATA[Team]]></item>
+		<item name="wcf.page.com.woltlab.wcf.User"><![CDATA[User Profile]]></item>
+		<item name="wcf.page.com.woltlab.wcf.UserSearch"><![CDATA[Search Users]]></item>
+		<item name="wcf.page.com.woltlab.wcf.UsersOnlineList"><![CDATA[Users Online]]></item>
 	</category>
 	
 	<category name="wcf.paidSubscription">