Florianschmidtwelzow has submitted this change and it was merged.
Change subject: Consistency tweaks/i18n review
......................................................................
Consistency tweaks/i18n review
* Make wording consistent with other extensions and core
* Remove Title Case
* Use {{int:..}} syntax
* Delete i18n/de-formal.json because it is widely a dupe of de.json
** Hint: Only translate messages to de-formal where is a difference
(Du->Sie)
* Fix license-name key per LICENSE file
* Message documantation added
Change-Id: I8982cb7e157420e2d4b559cbb0b1a9586674a98c
---
M GoogleLogin.php
D i18n/de-formal.json
M i18n/de.json
M i18n/en.json
A i18n/qqq.json
5 files changed, 68 insertions(+), 55 deletions(-)
Approvals:
Florianschmidtwelzow: Verified; Looks good to me, approved
diff --git a/GoogleLogin.php b/GoogleLogin.php
index 5e296f4..48c5ccb 100644
--- a/GoogleLogin.php
+++ b/GoogleLogin.php
@@ -33,7 +33,7 @@
'url' => 'https://www.mediawiki.org/wiki/Extension:GoogleLogin',
'descriptionmsg' => 'googlelogin-desc',
'version' => '0.1.0',
- 'license-name' => "Lizenz",
+ 'license-name' => "MIT",
);
// Autoload Classes
diff --git a/i18n/de-formal.json b/i18n/de-formal.json
deleted file mode 100644
index 54329ec..0000000
--- a/i18n/de-formal.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "googlelogin": "Anmelden mit Google",
- "googlelogin-parerror": "Die aufgerufene Unterseite existiert nicht.
Bitte gehen Sie zurück und versuchen die Aktion erneut.
- "googlelogin-unexpected-error": "Oops, da war ein unbekanntes Problem.
Bitte gehen Sie zurück und versuchen die Aktion erneut.",
- "googlelogin-form-choosename-title": "Wähle Benutzername",
- "googlelogin-form-choosename": "Wähle deinen Benutzernamen um ein
Wikibenutzer zu erstellen",
- "googlelogin-form-choosename-finish-title": "Benutzerkonto erstellen",
- "googlelogin-form-choosename-finish-body": "Glückwunsch! Du hast
erfolgreich den Wikibenutzer $1 erstellt und mit deinem Googlekonto verbunden.",
- "googlelogin-form-choosename-error": "Du musst einen Benutzernamen
eintragen, oder wähle einen unserer Vorschläge.",
- "googlelogin-form-choosename-existerror": "Der Benutzername ''$1'' ist
bereits vergeben. Bitte wähle einen anderen.",
- "googlelogin-form-chooseown": "Eigener Name",
- "googlelogin-form-chooseown-error": "Bitte teile uns deinen gewünschten
Benutzernamen mit, oder wähle einen unserer Vorschläge.",
- "googlelogin-form-choosename-help": "'Eigener Name' wird nur beachtet,
wenn 'Eigener Name' ausgewählt wurde.",
- "googlelogin-form-merge-title": "Benutzerkonten zusammenführen",
- "googlelogin-form-logout": "Mit einem anderen Googlekonto anmelden",
- "googlelogin-form-backlink": "Zurück zu Google Login",
- "googlelogin-form-create": "Benutzerkonto erstellen",
- "googlelogin-form-merge": "Verknüpfe Google- und Wiki-konto",
- "googlelogin-form-unlink": "Löse Google- und Wiki-konto-Verknüpfung",
- "googlelogin-username": "Benutzername",
- "googlelogin-email": "E-Mail-Adress",
- "googlelogin-googleuser": "Google-Benutzer",
- "googlelogin-information-title": "Kontoinformationen",
- "googlelogin-information-body": "In der folgenden Tabelle findest du
Informationen zu deinem Google-Konto und ob dieser mit einem Wikibenutzer
verknüpft ist oder nicht.",
- "googlelogin-linkstatus": "Status der Verknüpfung",
- "googlelogin-linked": "verknüpft",
- "googlelogin-unlinked": "nicht verknüpft",
- "googlelogin-link-other": "Dein Google-Konto ist bereits mit einem
anderen Wikibenutzer verknüpft. Je Google-Nutzer ist nur eine Verknüpfung
erlaubt. Bitte löse zuerst die Verknüpfung zu deinem anderen Konto oder
kontaktiere einen Administrator, wenn du kein anderes Konto besitzt.",
- "googlelogin-success-merge": "Glückwunsch! Dein Wikiaccount ist nun mit
deinem Googlekonto verknüpft.",
- "googlelogin-success-unlink": "Glückwunsch! Dein Wikiaccount ist nicht
länger mit deinem Googleaccount verknüpft."
-}
\ No newline at end of file
diff --git a/i18n/de.json b/i18n/de.json
index 12f2f9a..04aa5c9 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -1,4 +1,9 @@
{
+ "@metadata": {
+ "authors": [
+ "Florian Schmidt"
+ ]
+ },
"googlelogin": "Anmelden mit Google",
"googlelogin-desc": "Stellt eine [[Special:GoogleLogin|Spezialseite]]
zur Verfügung, die es Nutzern erlaubt, sich mit Ihrem Googlekonto anzumelden.",
"googlelogin-parerror": "Die aufgerufene Unterseite existiert nicht.
Bitte gehen Sie zurück und versuchen die Aktion erneut.",
@@ -18,7 +23,6 @@
"googlelogin-form-create": "Benutzerkonto erstellen",
"googlelogin-form-merge": "Verknüpfe Google- und Wiki-konto",
"googlelogin-form-unlink": "Löse Google- und Wiki-konto-Verknüpfung",
- "googlelogin-username": "Benutzername",
"googlelogin-email": "E-Mail-Adress",
"googlelogin-googleuser": "Google-Benutzer",
"googlelogin-information-title": "Kontoinformationen",
diff --git a/i18n/en.json b/i18n/en.json
index d8e9e8b..49bdc41 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,32 +1,36 @@
{
+ "@metadata": {
+ "authors": [
+ "Florian Schmidt"
+ ]
+ },
"googlelogin": "Login with Google",
- "googlelogin-desc": "Provides a [[Special:GoogleLogin|Special page]] to
allow users to login with thier Google accounts.",
+ "googlelogin-desc": "Provides a [[Special:GoogleLogin|Special page]] to
allow users to login with their Google accounts",
"googlelogin-parerror": "The requested page doesn't exist. Please go
back and try the action again.",
"googlelogin-unexpected-error": "Oops, there was an unexpected error.
Please go back and try again.",
- "googlelogin-form-choosename-title": "Choose Username",
- "googlelogin-form-choosename": "Please choose your Username to create a
Wikiaccount",
- "googlelogin-form-choosename-finish-title": "Create Useraccount",
- "googlelogin-form-choosename-finish-body": "Congratulations! You have
created the Wikiaccount $1 and linked it with your Google account.",
+ "googlelogin-form-choosename-title": "Choose username",
+ "googlelogin-form-choosename": "Please choose your username to create a
wiki account",
+ "googlelogin-form-choosename-finish-title": "Create wiki account",
+ "googlelogin-form-choosename-finish-body": "Congratulations! You have
created the wiki account $1 and linked it with your Google account.",
"googlelogin-form-choosename-error": "You must choose an username or
choose one of our suggestion.",
- "googlelogin-form-choosename-existerror": "The Username ''$1'' is
already in use, please choose another.",
+ "googlelogin-form-choosename-existerror": "The username ''$1'' is
already in use, please choose another.",
"googlelogin-form-chooseown": "Choose own",
- "googlelogin-form-chooseown-error": "Please let us know your desired
Username or take one of our suggestions.",
- "googlelogin-form-choosename-help": "'Own name' is only observed, if
you choose 'Choose own'.",
- "googlelogin-form-merge-title": "Merge Useraccount",
- "googlelogin-form-logout": "Login with another Google Account",
- "googlelogin-form-backlink": "Back to Google Login",
+ "googlelogin-form-chooseown-error": "Please let us know your desired
username or take one of our suggestions.",
+ "googlelogin-form-choosename-help": "'Own name' is only observed, if
you choose '{{int:googlelogin-form-chooseown}}'.",
+ "googlelogin-form-merge-title": "Merge useraccount",
+ "googlelogin-form-logout": "Login with another Google account",
+ "googlelogin-form-backlink": "Back to Google login",
"googlelogin-form-create": "Create account",
- "googlelogin-form-merge": "Merge Google to Wiki account",
- "googlelogin-form-unlink": "Unlink Google->Wiki account",
- "googlelogin-username": "Username",
- "googlelogin-email": "E-mail adress",
- "googlelogin-googleuser": "Google-User",
- "googlelogin-information-title": "Accountinformation",
- "googlelogin-information-body": "In the following table you find
information about your Google account and if it is linked to an Wikiaccount or
not.",
- "googlelogin-linkstatus": "Link-Status",
+ "googlelogin-form-merge": "Merge Google to wiki account",
+ "googlelogin-form-unlink": "Unlink Google -> wiki account",
+ "googlelogin-email": "Email adress",
+ "googlelogin-googleuser": "Google user",
+ "googlelogin-information-title": "Account information",
+ "googlelogin-information-body": "In the following table you find
information about your Google account and if it is linked to a wiki account or
not.",
+ "googlelogin-linkstatus": "Link status",
"googlelogin-linked": "linked",
"googlelogin-unlinked": "not linked",
- "googlelogin-link-other": "Your Google Account is already linked to
another user. Your Google Account can linked only to one Wikiaccount. Please
unlink the connection to your other Wikiaccount or contact an administrator, if
you haven't another Wikiaccount.",
- "googlelogin-success-merge": "Congratulations! Your Wikiaccount is now
linked to your Google Account.",
- "googlelogin-success-unlink": "Congratulations! Your Wikiaccount isn't
linked to your Google Account anymore."
+ "googlelogin-link-other": "Your Google account is already linked to
another user. Your Google account can linked only to one wiki account. Please
unlink the connection to your other wiki account or contact an administrator,
if you haven't another wiki account.",
+ "googlelogin-success-merge": "Congratulations! Your wiki account is now
linked to your Google account.",
+ "googlelogin-success-unlink": "Congratulations! Your wiki account isn't
linked to your Google account anymore."
}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 0000000..0b7b795
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,36 @@
+{
+ "@metadata": {
+ "authors": [
+ "Florian Schmidt"
+ ]
+ },
+ "googlelogin": "Main title of Extension's Special page.",
+ "googlelogin-desc": "Extension description in Special:Version.",
+ "googlelogin-parerror": "Error message when a Subpage of
Special:GoogleLogin is requested, which does not exist.",
+ "googlelogin-unexpected-error": "Generic error message for errors with
not specific error message (unexpected generic error)",
+ "googlelogin-form-choosename-title": "Title of SpecialPage when the
user can create a new user and has to choose an Username.",
+ "googlelogin-form-choosename": "Title of fieldset to explain shortly,
what the user has to do (choose username).",
+ "googlelogin-form-choosename-finish-title": "Title of Subpage 'Finish'
after the Useraccount is successful created.",
+ "googlelogin-form-choosename-finish-body": "Message for Subpage
'Finish' after the Useraccount is successful created.",
+ "googlelogin-form-choosename-error": "Message after the user did not
provide a Username to explain, that he must choose a Username (own or one of
the suggestions)",
+ "googlelogin-form-choosename-existerror": "The Username the user want
to use for his Useraccount already exists, he must use another.",
+ "googlelogin-form-chooseown": "Name of radio element to choose an own
Username for the creation of a new Useraccount.",
+ "googlelogin-form-chooseown-error": "The user want to choose an own
Username, but the input field for the username is empty. The user must provide
a username or choose one of the suggestions.",
+ "googlelogin-form-choosename-help": "Displays a help text under
textfield to provide an own Username, that this is only observed, if the user
selected that he want to use an own Username.",
+ "googlelogin-form-merge-title": "Title of button to merge the wiki and
Google account.",
+ "googlelogin-form-logout": "Title of button to choose another Google
account to merge/create (to/a new) wiki account. (logout the currently Google
account in wiki)",
+ "googlelogin-form-backlink": "Backlink on Subpages of
Special:GoogleLogin to go back to Main Specialpage.",
+ "googlelogin-form-create": "Title of button to create a new Useraccount
on form to choose the Username.",
+ "googlelogin-form-merge": "Title of button to merge the wikiaccount and
Google account, if the user is logged into a wikiaccount (and not connected to
a Google account) and navigates to Special:GoogleLogin.",
+ "googlelogin-form-unlink": "Title of button to unlink the connection
between the wiki user account and Google account.",
+ "googlelogin-email": "Title of value E-Mailadress in account
information table on Special:GoogleLogin.",
+ "googlelogin-googleuser": "Title of value Google-Account (Google
username) in account information table on Special:GoogleLogin.",
+ "googlelogin-information-title": "Title of fieldset containing the
table with account information.",
+ "googlelogin-information-body": "Information text above account
information table, that the following table contains information about the
Google and wiki account and the link status (linked, not linked).",
+ "googlelogin-linkstatus": "Title of value Link status in account
information table on Special:GoogleLogin (is wiki account linked to Google
account?).",
+ "googlelogin-linked": "Google and wiki account are linked. (Used in
account information table)",
+ "googlelogin-unlinked": "Google and wiki account aren't linked. (Used
in account information table)",
+ "googlelogin-link-other": "The Google account is already linked to a
wiki user, but not to the actual logged in wiki user. To link the Google
account with the actual wiki account, the user must unlink the connection wit
the other wiki account, only one connection per Google account is allowed.",
+ "googlelogin-success-merge": "Successful message, that the wiki account
is now linked with the Google account.",
+ "googlelogin-success-unlink": "Successful message, that the wiki
account isn't linked anymore with the Google account."
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/142490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8982cb7e157420e2d4b559cbb0b1a9586674a98c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
