r74414 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r74413‎ | r74414 | r74415 >
Date:06:49, 7 October 2010
Author:raymond
Status:ok
Tags:
Comment:
First run of i18n review: Consistenxy tweaks:
* Email -> e-mail
* Add line breaks per sentence (invisible in the output but helpful for translators)
Modified paths:
  • /trunk/extensions/TradeTrack/TradeTrack.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/TradeTrack/TradeTrack.i18n.php
@@ -8,8 +8,9 @@
99 'tradetrack-desc' => 'Trade Track, a tool for tracking Wikimedia trademark requests',
1010 'tradetrack-header' => 'Requests to use Wikimedia trademarks',
1111 'tradetrack-all-fields-required' => 'All fields are required.',
12 - 'tradetrack-overview' => "Although the user-generated content of Wikimedia projects are generally licensed through open-source licensing schemes such as Creative Commons, the same is not true of Wikimedia trademarks and word marks. The Wikimedia Foundation owns all Wikimedia trademarks, logos, and word marks associated with Wikimedia projects, and use of that content without the Foundation's permission is prohibited.
13 - If you or the agency you represent would like to use a word mark or trademarked logo owned by the Wikimedia Foundation, please submit a request using the form below.",
 12+ 'tradetrack-overview' => "Although the user-generated content of Wikimedia projects are generally licensed through open-source licensing schemes such as Creative Commons, the same is not true of Wikimedia trademarks and word marks.
 13+The Wikimedia Foundation owns all Wikimedia trademarks, logos, and word marks associated with Wikimedia projects, and use of that content without the Foundation's permission is prohibited.
 14+If you or the agency you represent would like to use a word mark or trademarked logo owned by the Wikimedia Foundation, please submit a request using the form below.",
1415 'tradetrack-purpose-question' => 'For what purpose will the trademark be used?',
1516 'tradetrack-purpose-label-commercial' => 'Commercial',
1617 'tradetrack-purpose-expanse-commercial' => '(for-profit)',
@@ -18,8 +19,11 @@
1920 'tradetrack-purpose-label-media' => 'Media',
2021 'tradetrack-purpose-expanse-media' => '(incidental use in TV, film, or other media)',
2122 'tradetrack-usage-label' => 'Please describe how you will use the trademark',
22 - 'tradetrack-usage-expanse' => "Will it be used online? As part of a product or service incorporating Wikimedia content? To promote another product? For journalism or commentary?",
23 - 'tradetrack-logo-which' => "Which word mark or trademarked logo do you want to use?",
 23+ 'tradetrack-usage-expanse' => 'Will it be used online?
 24+As part of a product or service incorporating Wikimedia content?
 25+To promote another product?
 26+For journalism or commentary?',
 27+ 'tradetrack-logo-which' => 'Which word mark or trademarked logo do you want to use?',
2428 'tradetrack-which-wmf' => 'Wikimedia Foundation',
2529 'tradetrack-which-wikipedia' => 'Wikipedia',
2630 'tradetrack-which-wiktionary' => 'Wiktionary',
@@ -34,42 +38,49 @@
3539 'tradetrack-which-wikinews' => 'Wikinews',
3640 'tradetrack-which-other' => 'Other',
3741 'tradetrack-about-label-mailingaddress' => 'Mailing address',
38 - 'tradetrack-about-expanse-mailingaddress' => "Please provide contact information where we can follow up with your request. Remember to include your country!",
 42+ 'tradetrack-about-expanse-mailingaddress' => 'Please provide contact information where we can follow up with your request.
 43+Remember to include your country!',
3944 'tradetrack-about-label-yourname' => 'Your name',
4045 'tradetrack-about-label-orgname' => "Your organization's name",
4146 'tradetrack-about-expanse-orgname' => 'The name of the entity that will use the Wikimedia trademark.',
42 - 'tradetrack-about-label-email' => 'Email address',
43 - 'tradetrack-about-expanse-email' => 'Your primary email address',
44 - 'tradetrack-about-label-confirmemail' => 'Email address confirmation',
45 - 'tradetrack-about-expanse-confirmemail' => 'Type your primary email address again',
 47+ 'tradetrack-about-label-e-mail' => 'E-mail address',
 48+ 'tradetrack-about-expanse-e-mail' => 'Your primary e-mail address',
 49+ 'tradetrack-about-label-confirme-mail' => 'E-mail address confirmation',
 50+ 'tradetrack-about-expanse-confirme-mail' => 'Type your primary e-mail address again',
4651 'tradetrack-about-label-phone' => 'Phone number',
4752 'tradetrack-statement-label' => 'Statement of Good Faith',
48 - 'tradetrack-statement-expanse' => "By checking the box below, I hereby swear or affirm under penalty of perjury that I am the authorized representative of the organization or person named above, and that I completed this form accurately, in good faith, and to the best of my ability.",
 53+ 'tradetrack-statement-expanse' => 'By checking the box below, I hereby swear or affirm under penalty of perjury that I am the authorized representative of the organization or person named above, and that I completed this form accurately, in good faith, and to the best of my ability.',
4954 'tradetrack-statement-checkboxlabel' => 'I swear or affirm',
50 - 'tradetrack-characters-remaining-notice' => 'Characters Remaining',
 55+ 'tradetrack-characters-remaining-notice' => 'Characters remaining',
5156 'tradetrack-button-continue' => 'Continue',
5257 'tradetrack-button-back' => 'Back',
5358 'tradetrack-button-submit' => 'Submit',
5459 'tradetrack-nonprofit-preexisting-agreement-question' => 'If you are operating a non-profit organization, do you have a preexisting agreement or contract with the Wikimedia Foundation?',
5560 'tradetrack-nonprofit-preexisting-agreement-yes' => 'Yes, I am a non-profit organization with a preexisting relationship with Wikimedia.',
5661 'tradetrack-nonprofit-preexisting-agreement-no-unaffilliated' => 'No, I am a non-profit organization unaffiliated with Wikimedia.',
57 - 'tradetrack-nonprofit-preexisting-agreement-no-mistake' => 'No. And I made a mistake; I am NOT a non-profit organization.',
 62+ 'tradetrack-nonprofit-preexisting-agreement-no-mistake' => 'No, I made a mistake; I am NOT a non-profit organization.',
5863 'tradetrack-thanks-header' => 'Thank You',
59 - 'tradetrack-thanks-text' => 'Thank you for your interest. Your request has been submitted and will be routed to the correct person for review.',
60 - 'tradetrack-errors-have-happened' => 'One or more errors have occurred. Please correct them below.',
61 - 'tradetrack-errors-pacman-death' => 'An unknown error has occurred. Please start again.',
 64+ 'tradetrack-thanks-text' => 'Thank you for your interest.
 65+Your request has been submitted and will be routed to the correct person for review.',
 66+ 'tradetrack-errors-have-happened' => 'One or more errors have occurred.
 67+Please correct them below.',
 68+ 'tradetrack-errors-pacman-death' => 'An unknown error has occurred.
 69+Please start again.',
6270 'tradetrack-errors-no-route' => 'You must select which type of request you are making.',
6371 'tradetrack-errors-invalid-route' => 'The type of request supplied is invalid.',
6472 'tradetrack-errors-noncom-no-selection' => 'You must select one of the available agreement types.',
6573 'tradetrack-errors-noncom-invalid-selection' => 'The agreement type provided is invalid.',
6674 'tradetrack-errors-zero-marks' => "You haven't selected any logos or trademarks.",
67 - 'tradetrack-errors-other-set-but-not-checked' => 'You have entered a value for "other" but did not select it.',
 75+ 'tradetrack-errors-other-set-but-not-checked' => 'You have entered a value for "other" but did not select it.',
6876 'tradetrack-errors-missing-other-value' => 'You selected "other" but did not provide a value for it.',
69 - 'tradetrack-errors-other-too-long' => 'The value supplied for "other" is too long. The maximum length for this field is $1 characters.',
 77+ 'tradetrack-errors-other-too-long' => 'The value supplied for "other" is too long.
 78+The maximum length for this field is $1 characters.',
7079 'tradetrack-errors-generic-empty' => 'This field is required.',
71 - 'tradetrack-errors-generic-too-long' => 'The value supplied for this field is too long. The maximum length allowed is $1 characters.',
72 - 'tradetrack-errors-emails-do-not-match' => 'The email addresses supplied do not match.',
73 - 'tradetrack-errors-email-fails-regex' => 'The email address supplied is invalid. Please provide a valid email address.',
 80+ 'tradetrack-errors-generic-too-long' => 'The value supplied for this field is too long.
 81+The maximum length allowed is $1 characters.',
 82+ 'tradetrack-errors-e-mails-do-not-match' => 'The e-mail addresses supplied do not match.',
 83+ 'tradetrack-errors-e-mail-fails-regex' => 'The e-mail address supplied is invalid.
 84+Please provide a valid e-mail address.',
7485 'tradetrack-errors-no-accept-statement' => 'You must agree to the Statement of Good Faith.',
7586 );
7687
@@ -77,7 +88,7 @@
7889 * @author Brandon Harris
7990 */
8091 $messages['qqq'] = array(
81 - 'tradetrack-desc' => 'Trade Track, a tool for tracking Wikimedia trademark requests',
 92+ 'tradetrack-desc' => '{{desc}}',
8293 'tradetrack-header' => 'Header for (most) pages',
8394 'tradetrack-all-fields-required' => 'Indicates that all form elements are required.',
8495 'tradetrack-overview' => 'Describes the purpose of the special page to the user.',
@@ -91,35 +102,22 @@
92103 'tradetrack-usage-label' => 'Asks how the user will use the trademark',
93104 'tradetrack-usage-expanse' => "Gives further clarification as to what the tradetrack-usage-label question means",
94105 'tradetrack-logo-which' => "Asks which logo or logos the user wishes to use.",
95 - // These are all trademark terms owned by the foundation.
96 - 'tradetrack-which-wmf' => 'Wikimedia Foundation',
97 - 'tradetrack-which-wikipedia' => 'Wikipedia',
98 - 'tradetrack-which-wiktionary' => 'Wiktionary',
99 - 'tradetrack-which-wikiquote' => 'Wikiquote',
100 - 'tradetrack-which-wikibooks' => 'Wikibooks',
101 - 'tradetrack-which-wikiversity' => 'Wikiversity',
102 - 'tradetrack-which-wikispecies' => 'Wikispecies',
103 - 'tradetrack-which-wikisource' => 'Wikisource',
104 - 'tradetrack-which-mediawiki' => 'Mediawiki',
105 - 'tradetrack-which-wikimediacommons' => 'Wikimedia Commons',
106 - 'tradetrack-which-wikimediaincubator' => 'Wikimedia Incubator',
107 - 'tradetrack-which-wikinews' => 'Wikinews',
108 - // End terms
 106+ // End terms
109107 'tradetrack-which-other' => 'This is a label in case the user wishes to utilize a mark not listed',
110108 'tradetrack-about-label-mailingaddress' => 'Label for the mailing address field',
111109 'tradetrack-about-expanse-mailingaddress' => "More information about the mailing address field.",
112110 'tradetrack-about-label-yourname' => "Label for the user's name field",
113111 'tradetrack-about-label-orgname' => "Label for the user's organization's field",
114112 'tradetrack-about-expanse-orgname' => 'More information about the organization name field.',
115 - 'tradetrack-about-label-email' => "Label for the user's email address field",
116 - 'tradetrack-about-expanse-email' => 'More information about the email address field',
117 - 'tradetrack-about-label-confirmemail' => "Label for confirming the user's email field",
118 - 'tradetrack-about-expanse-confirmemail' => 'Describes a bit why we want a confirmation email.',
 113+ 'tradetrack-about-label-e-mail' => "Label for the user's e-mail address field",
 114+ 'tradetrack-about-expanse-e-mail' => 'More information about the e-mail address field',
 115+ 'tradetrack-about-label-confirme-mail' => "Label for confirming the user's e-mail field",
 116+ 'tradetrack-about-expanse-confirme-mail' => 'Describes a bit why we want a confirmation e-mail.',
119117 'tradetrack-about-label-phone' => "Label for the user's phone number field",
120118 'tradetrack-statement-label' => 'Label for the statement of good faith section.',
121119 'tradetrack-statement-expanse' => "This is a legal statement. If translated, there should be a pointer to the English version.",
122120 'tradetrack-statement-checkboxlabel' => 'Indicates that the user agrees with the statement',
123 - 'tradetrack-characters-remaining-notice' => "This is part of a user interface element that counts remaining characters in a specific field. The number of characters is handled through code, and it appears as 'XX Characters Remaining'",
 121+ 'tradetrack-characters-remaining-notice' => "This is part of a user interface element that counts remaining characters in a specific field. The number of characters is handled through code, and it appears as 'XX Characters Remaining'",
124122 'tradetrack-button-continue' => 'This button indicates moving forward to the next step',
125123 'tradetrack-button-back' => 'This button indicates heading backwards.',
126124 'tradetrack-button-submit' => 'This button indicates submitting.',
@@ -136,12 +134,13 @@
137135 'tradetrack-errors-noncom-no-selection' => 'Error indicating that the user must select whether or not they have a non-commercial agreement.',
138136 'tradetrack-errors-noncom-invalid-selection' => 'Error indicating that the non-commercial agreement type is invalid.',
139137 'tradetrack-errors-zero-marks' => "Error indicating that the user hasn't selected any trademarks for use.",
140 - 'tradetrack-errors-other-set-but-not-checked' => 'Error indicating that the user entered a value for "other" but did not check the box.',
 138+ 'tradetrack-errors-other-set-but-not-checked' => 'Error indicating that the user entered a value for "other" but did not check the box.',
141139 'tradetrack-errors-missing-other-value' => 'Error indicating that the user selected the "other" value but did not provide any data for it.',
142140 'tradetrack-errors-other-too-long' => 'Error indicating that the field in question has gone over maximum length. This message is specifically keyed to the "other" value in the marks list.',
143141 'tradetrack-errors-generic-empty' => 'Error indicating that a field is required.',
144142 'tradetrack-errors-generic-too-long' => 'Error indicating that the field in question has gone over maximum length.',
145 - 'tradetrack-errors-emails-do-not-match' => 'Error indicatingt that the email addresses supplied do not match.',
146 - 'tradetrack-errors-email-fails-regex' => 'Error indicating that the email address supplied is invalid.',
 143+ 'tradetrack-errors-e-mails-do-not-match' => 'Error indicatingt that the e-mail addresses supplied do not match.',
 144+ 'tradetrack-errors-e-mail-fails-regex' => 'Error indicating that the e-mail address supplied is invalid.',
147145 'tradetrack-errors-no-accept-statement' => 'Error informing the user that they must agree to the statement of good faith',
148146 );
 147+

Follow-up revisions

RevisionCommit summaryAuthorDate
r75109Fix bug introduced by r74414 where keys were changed in the i18n file but cha...bharris21:05, 20 October 2010

Status & tagging log