r76904 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r76903‎ \| r76904 \| r76905 >
Date:	20:58, 17 November 2010
Author:	awjrichards
Status:	deferred
Tags:
Comment:	Merging from r76840 thru r76903 of trunk
Modified paths:	/branches/fundraising/deployment/DonationInterface (modified) (history) /branches/fundraising/deployment/DonationInterface/donate_interface/donate_interface.i18n.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/Form.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumn.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetterCA.php (added) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/provinceAbbreviations.inc (added) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetterCA.php
—	—	@@ -0,0 +1,189 @@
	2	+<?php
	3	+
	4	+class PayflowProGateway_Form_TwoStepTwoColumnLetterCA extends PayflowProGateway_Form_TwoStepTwoColumn {
	5	+ public function __construct( &$form_data, &$form_errors ) {
	6	+ global $wgScriptPath;
	7	+
	8	+ // set the path to css, before the parent constructor is called, checking to make sure some child class hasn't already set this
	9	+ if ( !strlen( $this->getStylePath() ) ) {
	10	+ $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter.css' );
	11	+ }
	12	+
	13	+ parent::__construct( $form_data, $form_errors );
	14	+ }
	15	+
	16	+ public function generateFormStart() {
	17	+ global $wgOut, $wgRequest;
	18	+
	19	+ $form = parent::generateBannerHeader();
	20	+
	21	+ $form .= Xml::openElement( 'table', array( 'width' => '100%', 'cellspacing' => 0, 'cellpadding' => 0, 'border' => 0 ) );
	22	+ $form .= Xml::openElement( 'tr' );
	23	+ $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
	24	+
	25	+ $text_template = $wgRequest->getText( 'text_template', '2010/JimmyAppealLong' );
	26	+ // if the user has uselang set, honor that, otherwise default to the language set for the form defined by 'language' in the query string
	27	+ if ( $wgRequest->getText( 'language' ) ) $text_template .= '/' . $this->form_data[ 'language' ];
	28	+
	29	+ $template = ( strlen( $text_template ) ) ? $wgOut->parse( '{{' . $text_template . '}}' ) : '';
	30	+ // if the template doesn't exist, prevent the display of the red link
	31	+ if ( preg_match( '/redlink\=1/', $template ) ) $template = NULL;
	32	+ $form .= $template;
	33	+
	34	+ $form .= Xml::closeElement( 'td' );
	35	+
	36	+ $form .= Xml::openElement( 'td', array( 'id' => 'donate', 'valign' => 'top' ) );
	37	+
	38	+ // add noscript tags for javascript disabled browsers
	39	+ $form .= $this->getNoScript();
	40	+
	41	+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ) );
	42	+
	43	+ // provide a place at the top of the form for displaying general messages
	44	+ if ( $this->form_errors['general'] ) {
	45	+ $form .= Xml::openElement( 'div', array( 'id' => 'mw-payflow-general-error' ) );
	46	+ if ( is_array( $this->form_errors['general'] ) ) {
	47	+ foreach ( $this->form_errors['general'] as $this->form_errors_msg ) {
	48	+ $form .= Xml::tags( 'p', array( 'class' => 'creditcard-error-msg' ), $this->form_errors_msg );
	49	+ }
	50	+ } else {
	51	+ $form .= Xml::tags( 'p', array( 'class' => 'creditcard-error-msg' ), $this->form_errors_msg );
	52	+ }
	53	+ $form .= Xml::closeElement( 'div' ); // close div#mw-payflow-general-error
	54	+ }
	55	+
	56	+ // Xml::element seems to convert html to htmlentities
	57	+ $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>";
	58	+ $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) );
	59	+
	60	+ $form .= $this->generateBillingContainer();
	61	+ return $form;
	62	+ }
	63	+
	64	+ public function generateFormEnd() {
	65	+ $form = '';
	66	+ $form .= $this->generateFormClose();
	67	+ return $form;
	68	+ }
	69	+
	70	+ protected function generateBillingContainer() {
	71	+ $form = '';
	72	+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) );
	73	+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
	74	+ $form .= $this->generateBillingFields();
	75	+ $form .= Xml::closeElement( 'table' ); // close table#payflow-table-donor
	76	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-personal-info
	77	+
	78	+ return $form;
	79	+ }
	80	+
	81	+ protected function generateBillingFields() {
	82	+ global $wgScriptPath;
	83	+
	84	+ $form = '';
	85	+
	86	+ // name
	87	+ $form .= $this->getNameField();
	88	+
	89	+ // email
	90	+ $form .= $this->getEmailField();
	91	+
	92	+ // amount
	93	+ $form .= '<tr>';
	94	+ $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
	95	+ $form .= '</tr>';
	96	+ $form .= '<tr>';
	97	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
	98	+ $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
	99	+ ' ' . $this->generateCurrencyDropdown() . '</td>';
	100	+ $form .= '</tr>';
	101	+
	102	+ // card logos
	103	+ $form .= '<tr>';
	104	+ $form .= '<td />';
	105	+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
	106	+ $form .= '</tr>';
	107	+
	108	+ // card number
	109	+ $form .= $this->getCardNumberField();
	110	+
	111	+ // cvv
	112	+ $form .= $this->getCvvField();
	113	+
	114	+ // expiry
	115	+ $form .= $this->getExpiryField();
	116	+
	117	+ // street
	118	+ $form .= $this->getStreetField();
	119	+
	120	+ // city
	121	+ $form .= $this->getCityField();
	122	+
	123	+ // state
	124	+ $form .= '<tr>';
	125	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['state'] . '</span></td>';
	126	+ $form .= '</tr>';
	127	+ $form .= '<tr>';
	128	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-state-province' ), 'state' ) . '</td>';
	129	+ $form .= '<td>' . $this->generateStateDropdown() . '</td>';
	130	+ $form .= '</tr>';
	131	+
	132	+ // zip
	133	+ $form .= $this->getZipField();
	134	+
	135	+ // country
	136	+ $form .= '<tr>';
	137	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['country'] . '</span></td>';
	138	+ $form .= '</tr>';
	139	+ $form .= '<tr>';
	140	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-country' ), 'country' ) . '</td>';
	141	+ $form .= '<td>' . $this->generateCountryDropdown( 124 ) . '</td>'; // Canada default
	142	+ $form .= '</tr>';
	143	+
	144	+ return $form;
	145	+ }
	146	+
	147	+ /**
	148	+ * Generate form closing elements
	149	+ */
	150	+ public function generateFormClose() {
	151	+ $form = '';
	152	+ // add hidden fields
	153	+ $hidden_fields = $this->getHiddenFields();
	154	+ foreach ( $hidden_fields as $field => $value ) {
	155	+ $form .= Html::hidden( $field, $value );
	156	+ }
	157	+
	158	+ $form .= Xml::closeElement( 'form' ); // close form 'payment'
	159	+ $form .= $this->generateDonationFooter();
	160	+ $form .= Xml::closeElement( 'td' );
	161	+ $form .= Xml::closeElement( 'tr' );
	162	+ $form .= Xml::closeElement( 'table' );
	163	+ return $form;
	164	+ }
	165	+
	166	+ public function generateStateDropdown() {
	167	+ require_once( dirname( __FILE__ ) . '/../includes/provinceAbbreviations.inc' );
	168	+
	169	+ $states = statesMenuXML();
	170	+
	171	+ $state_opts = '';
	172	+
	173	+ // generate dropdown of state opts
	174	+ foreach ( $states as $value => $state_name ) {
	175	+ $selected = ( $this->form_data[ 'state' ] == $value ) ? true : false;
	176	+ $state_opts .= Xml::option( $state_name, $value, $selected );
	177	+ }
	178	+
	179	+ $state_menu = Xml::openElement(
	180	+ 'select',
	181	+ array(
	182	+ 'name' => 'state',
	183	+ 'id' => 'state'
	184	+ ) );
	185	+ $state_menu .= $state_opts;
	186	+ $state_menu .= Xml::closeElement( 'select' );
	187	+
	188	+ return $state_menu;
	189	+ }
	190	+}
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/Form.php
—	—	@@ -137,7 +137,7 @@
138	138	* (see http://us.php.net/asort)
139	139	* @return string
140	140	*/
141		~~- public function generateCountryDropdown() {~~
	141	+ public function generateCountryDropdown( $defaultCountry = 840 ) {
142	142	$country_options = '';
143	143
144	144	// create a new array of countries with potentially translated country names for alphabetizing later
—	—	@@ -153,7 +153,7 @@
154	154	if ( $this->form_data[ 'country' ] ) {
155	155	$selected = ( $iso_value == $this->form_data[ 'country' ] ) ? true : false;
156	156	} else {
157		~~- $selected = ( $iso_value == 840 ) ? true : false; // Default to United States~~
	157	+ $selected = ( $iso_value == $defaultCountry ) ? true : false; // Default to United States
158	158	}
159	159	$country_options .= Xml::option( $full_name, $iso_value, $selected );
160	160	}
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumn.php
—	—	@@ -34,6 +34,43 @@
35	35	}
36	36	}
37	37	addEvent( window, 'load', loadPlaceholders );
	38	+
	39	+function formCheck( ccform ) {
	40	+ var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'State', 'Zip', 'CardNum', 'Cvv' ];
	41	+
	42	+ var fields = ["emailAdd","fname","lname","street","city","state","zip","card_num","cvv" ],
	43	+ numFields = fields.length,
	44	+ i,
	45	+ output = '',
	46	+ currField = '';
	47	+
	48	+ for( i = 0; i < numFields; i++ ) {
	49	+ if( document.getElementById( fields[i] ).value == '' ) {
	50	+ currField = window['payflowproGatewayErrorMsg'+ msg[i]];
	51	+ output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\\r\\n';
	52	+ }
	53	+ }
	54	+
	55	+ if (document.getElementById('fname').value == '$first') {
	56	+ output += payflowproGatewayErrorMsgJs + ' first name.\\r\\n';
	57	+ }
	58	+ if (document.getElementById('lname').value == '$last') {
	59	+ output += payflowproGatewayErrorMsgJs + ' last name.\\r\\n';
	60	+ }
	61	+
	62	+ // validate email address
	63	+ var apos = document.payment.emailAdd.value.indexOf("@");
	64	+ var dotpos = document.payment.emailAdd.value.lastIndexOf(".");
	65	+
	66	+ if( apos < 1 \|\| dotpos-apos < 2 ) {
	67	+ output += payflowproGatewayErrorMsgEmail;
	68	+ }
	69	+
	70	+ if( output ) {
	71	+ alert( output );
	72	+ return false;
	73	+ }
	74	+}
38	75	</script>
39	76	EOT;
40	77	$wgOut->addHeadItem( 'placeholders', $js );
—	—	@@ -79,7 +116,7 @@
80	117
81	118	// Xml::element seems to convert html to htmlentities
82	119	$form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>";
83		~~- $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) );~~
	120	+ $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) );
84	121
85	122	$form .= Xml::openElement( 'div', array( 'id' => 'left-column', 'class' => 'payflow-cc-form-section' ) );
86	123	$form .= $this->generatePersonalContainer();
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php
—	—	@@ -16,6 +16,11 @@
17	17
18	18	$this->loadApiJs(); // API/Ajax JS
19	19
	20	+ $this->loadPlaceholders();
	21	+ }
	22	+
	23	+ public function loadPlaceholders() {
	24	+ global $wgOut;
20	25	// form placeholder values
21	26	$first = wfMsg( 'payflowpro_gateway-first' );
22	27	$last = wfMsg( 'payflowpro_gateway-last' );
—	—	@@ -41,6 +46,43 @@
42	47	}
43	48	}
44	49	addEvent( window, 'load', loadPlaceholders );
	50	+
	51	+function formCheck( ccform ) {
	52	+ var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'State', 'Zip', 'CardNum', 'Cvv' ];
	53	+
	54	+ var fields = ["emailAdd","fname","lname","street","city","state","zip","card_num","cvv" ],
	55	+ numFields = fields.length,
	56	+ i,
	57	+ output = '',
	58	+ currField = '';
	59	+
	60	+ for( i = 0; i < numFields; i++ ) {
	61	+ if( document.getElementById( fields[i] ).value == '' ) {
	62	+ currField = window['payflowproGatewayErrorMsg'+ msg[i]];
	63	+ output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\\r\\n';
	64	+ }
	65	+ }
	66	+
	67	+ if (document.getElementById('fname').value == '$first') {
	68	+ output += payflowproGatewayErrorMsgJs + ' first name.\\r\\n';
	69	+ }
	70	+ if (document.getElementById('lname').value == '$last') {
	71	+ output += payflowproGatewayErrorMsgJs + ' last name.\\r\\n';
	72	+ }
	73	+
	74	+ // validate email address
	75	+ var apos = document.payment.emailAdd.value.indexOf("@");
	76	+ var dotpos = document.payment.emailAdd.value.lastIndexOf(".");
	77	+
	78	+ if( apos < 1 \|\| dotpos-apos < 2 ) {
	79	+ output += payflowproGatewayErrorMsgEmail;
	80	+ }
	81	+
	82	+ if( output ) {
	83	+ alert( output );
	84	+ return false;
	85	+ }
	86	+}
45	87	</script>
46	88	EOT;
47	89	$wgOut->addHeadItem( 'placeholders', $js );
—	—	@@ -90,7 +132,7 @@
91	133
92	134	// Xml::element seems to convert html to htmlentities
93	135	$form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>";
94		~~- $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) );~~
	136	+ $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) );
95	137
96	138	$form .= Xml::openElement( 'div', array( 'id' => 'left-column', 'class' => 'payflow-cc-form-section' ) );
97	139	$form .= $this->generatePersonalContainer();
—	—	@@ -112,7 +154,7 @@
113	155	$form .= Html::hidden( 'PaypalRedirect', false );
114	156	$form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';document.payment.submit();', 'type' => 'submit' ) );
115	157	} else {
116		~~- $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-cc-button' ), 'onclick' => 'submit_form( this )', 'type' => 'submit' ) );~~
	158	+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-cc-button' ), 'type' => 'submit' ) );
117	159	$form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
118	160	$form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
119	161	wfMsg( 'payflowpro_gateway-donate-click' );
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/provinceAbbreviations.inc
—	—	@@ -0,0 +1,26 @@
	2	+<?php
	3	+
	4	+/**
	5	+ * Supplies the drop down menu options of Canadian Provinces
	6	+ */
	7	+function statesMenuXML() {
	8	+ $states = array(
	9	+ 'YY' => 'Select a Province',
	10	+ 'XX' => 'Outside Canada',
	11	+ 'AB' => 'Alberta',
	12	+ 'BC' => 'British Columbia',
	13	+ 'MB' => 'Manitoba',
	14	+ 'NB' => 'New Brunswick',
	15	+ 'NL' => 'Newfoundland and Labrador',
	16	+ 'NT' => 'Northwest Territories',
	17	+ 'NS' => 'Nova Scotia',
	18	+ 'NU' => 'Nunavut',
	19	+ 'ON' => 'Ontario',
	20	+ 'PE' => 'Prince Edward Island',
	21	+ 'QC' => 'Quebec',
	22	+ 'SK' => 'Saskatchewan',
	23	+ 'YT' => 'Yukon',
	24	+ );
	25	+
	26	+ return $states;
	27	+}
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
—	—	@@ -98,7 +98,7 @@
99	99	'payflowpro_gateway-question-comment' => 'Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
100	100	'payflowpro_gateway-donate-click' => 'Your credit card will be securely processed.',
101	101	'payflowpro_gateway-otherways' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give, including PayPal, check, or mail</a>.',
102		~~- 'payflowpro_gateway-otherways-alt' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including check.',~~
	102	+ 'payflowpro_gateway-otherways-alt' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.',
103	103	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a>',
104	104	'payflowpro_gateway-paypal' => 'Have a PayPal account? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donate with PayPal</a>.',
105	105	'payflowpro_gateway-credit-storage-processing' => 'We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.',
—	—	@@ -2334,7 +2334,7 @@
2335	2335	'payflowpro_gateway-response-24' => 'Deine Kreditkartennummer oder das Ablaufdatum ist falsch.',
2336	2336	'payflowpro_gateway-response-112' => 'Deine Anschrift oder der Sicherheitscode (CVV) ist falsch.',
2337	2337	'payflowpro_gateway-response-125' => 'Deine Transaktion wurde durch den Betrugs-Vorbeuge-Service abgelehnt.',
2338		- 'payflowpro_gateway-response-125-2' => 'Deine Kreditkarte kann nicht geprüft werden. Bitte bestätige, dass alle Informationen mit deinem Kreditkartenprofil übereinstimmen oder versuche es mit einer anderen Karte. Du kannst auch unsere <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">anderen Spendemöglichkeiten (englisch)</a> ausprobieren oder kontaktiere uns unter <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>. Vielen Dank.',
	2338	+ 'payflowpro_gateway-response-125-2' => 'Deine Kreditkarte kann nicht geprüft werden. Bitte bestätige, dass alle Informationen mit deinem Kreditkartenprofil übereinstimmen oder versuche es mit einer anderen Karte. Du kannst auch unsere <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/de">anderen Spendemöglichkeiten</a> ausprobieren oder kontaktiere uns unter <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>. Vielen Dank.',
2339	2339	'payflowpro_gateway-response-default' => 'Es ist ein Verarbeitungsfehler aufgetreten.
2340	2340	Bitte versuche es später noch einmal.',
2341	2341	'php-response-declined' => 'Deine Transaktion konnte nicht akzeptiert werden.',
—	—	@@ -2351,8 +2351,9 @@
2352	2352	</p><br />',
2353	2353	'payflowpro_gateway-question-comment' => 'Fragen oder Kommentare? Kontaktiere uns unter <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
2354	2354	'payflowpro_gateway-donate-click' => 'Deine Kreditkarteninformationen werden gesichert verarbeitet.',
2355		~~- 'payflowpro_gateway-otherways' => 'Es gibt auch <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/de">andere Spendemöglichkeiten, inklusive PayPal oder Überweisung</a>.',~~
2356		~~- 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Andere Spendemöglichkeiten (englisch)</a>',~~
	2355	+ 'payflowpro_gateway-otherways' => 'Es gibt auch <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/de">andere Spendemöglichkeiten, einschließlich PayPal oder Überweisung</a>.',
	2356	+ 'payflowpro_gateway-otherways-alt' => 'Es gibt auch <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/de">andere Spendemöglichkeiten, einschließlich per Überweisung</a>.',
	2357	+ 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Spenden</a>',
2357	2358	'payflowpro_gateway-paypal' => 'Verfügst du über ein PayPal-Konto? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Spende per PayPal</a>.',
2358	2359	'payflowpro_gateway-credit-storage-processing' => 'Wir speichern deine Kreditkarteninformationen nicht. Zudem unterliegen deine persönlichen Daten unseren <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">Datenschutzbestimmungen (englisch)</a>.',
2359	2360	'payflowpro_gateway-token-mismatch' => 'Deine Sitzung ist inzwischen abgelaufen. Bitte fülle das Formular erneut aus und sende es nochmals ab.',
—	—	@@ -2451,6 +2452,7 @@
2452	2453	'payflowpro_gateway-please-complete' => 'Bitte mache unten die Angaben zu deiner Spende …',
2453	2454	'payflowpro_gateway-description' => 'Beschreibung',
2454	2455	'payflowpro_gateway-donation' => 'Spende',
	2456	+ 'payflowpro_gateway-email-receipt' => 'E-Mail-Benachrichtigung an',
2455	2457	'payflowpro_gateway-state-dropdown-YY' => 'Wähle ein Land',
2456	2458	'payflowpro_gateway-state-dropdown-XX' => 'Außerhalb der Vereinigten Staaten',
2457	2459	);
—	—	@@ -2670,6 +2672,7 @@
2671	2673	'payflowpro_gateway-question-comment' => 'Pšašanja abo komentary? Stajśo se ze nami do zwiska: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
2672	2674	'payflowpro_gateway-donate-click' => 'Waša krediotwa kórta buźo se wěsće pśeźěłaś.',
2673	2675	'payflowpro_gateway-otherways' => 'Su <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">druge pósćiwańske móžnosći, na pś. PayPal, šek abo post</a>.',
	2676	+ 'payflowpro_gateway-otherways-alt' => 'Su <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">druge pósćiwańske móžnosći</a>, inkluziwnje šek.',
2674	2677	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Druge móžnosći pósćiwanja</a>',
2675	2678	'payflowpro_gateway-paypal' => 'Maśo konto PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Pósććo pśez PayPal</a>.',
2676	2679	'payflowpro_gateway-credit-storage-processing' => 'Njeskładujomy informacije twójeje kreditneje kórty, a twóje wósobinske daty pódlaže našym <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">pšawidłam priwatnosći</a>..',
—	—	@@ -2683,6 +2686,7 @@
2684	2687	'payflowpro_gateway-middle' => 'Srědne',
2685	2688	'payflowpro_gateway-last' => 'Slědne',
2686	2689	'payflowpro_gateway-other' => 'Druge',
	2690	+ 'payflowpro_gateway-noscript-msg' => 'Zda se, až JavaScript njejo zmóžnjony abo twój wobglědowak njepódpěra jen. Aby se wěste a zwjaselece źěło zawěsćiło, naš pósćiwański formular pomina se JavaScript.',
2687	2691	'payflowpro_gateway-noscript-redirect-msg' => 'Jolic njamóžoš abo njocoš JavaScript zmóžniś, móžoš hyšći pśinosowaś, z tym až se woglědujoš:',
2688	2692	'payflowpro_gateway-anon-message' => 'Pšosym pomjeńśo mójo mě na zjawnej lisćinje pósćiwarjow',
2689	2693	'payflowpro_gateway-donate-wikipedia' => 'Na Wikipediji pósćiś',
—	—	@@ -2766,6 +2770,7 @@
2767	2771	'payflowpro_gateway-please-complete' => 'Pšosym wudopołni swój dar dołojce',
2768	2772	'payflowpro_gateway-description' => 'Wopisanje',
2769	2773	'payflowpro_gateway-donation' => 'Dar',
	2774	+ 'payflowpro_gateway-email-receipt' => 'E-mailowe wobkšuśenje na',
2770	2775	'payflowpro_gateway-state-dropdown-YY' => 'Wubjeŕśo kraj',
2771	2776	'payflowpro_gateway-state-dropdown-XX' => 'Zwenka Zjadnośonych statow',
2772	2777	);
—	—	@@ -3229,6 +3234,7 @@
3230	3235	* @author Huji
3231	3236	* @author Sahim
3232	3237	* @author Wayiran
	3238	+ * @author ZxxZxxZ
3233	3239	*/
3234	3240	$messages['fa'] = array(
3235	3241	'payflowprogateway' => 'حمایت از ویکی‌مدیا',
—	—	@@ -3312,6 +3318,7 @@
3313	3319	'payflowpro_gateway-question-comment' => 'پرسش یا نظری دارید؟ تماس بگیرید: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
3314	3320	'payflowpro_gateway-donate-click' => 'کارت اعتباری شما به طور ایمن پردازش خواهد شد.',
3315	3321	'payflowpro_gateway-otherways' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">راه‌های دیگری برای کمک مالی نظیر پی پال، چک و پست وجود دارد</a>.',
	3322	+ 'payflowpro_gateway-otherways-alt' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">راه‌های دیگری</a> هم برای پرداخت وجود دارد، ازجمله چک.',
3316	3323	'payflowpro_gateway-paypal' => 'آیا حساب پی پال دارید؟ <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">از طریق پی پال بپردازید</a>.',
3317	3324	'payflowpro_gateway-credit-storage-processing' => 'ما اطلاعات کارت اعتباری شما را ذخیره نمی‌کنیم، و اطلاعات خصوصی شما موضوع <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">سیاست حفظ اسرار</a> ماست.',
3318	3325	'payflowpro_gateway-token-mismatch' => 'نشست شما منقضی شده است. لطفا با پر کردن و ارسال فرم، دوباره سعی کنید.',
—	—	@@ -3320,6 +3327,17 @@
3321	3328	'payflowpro_gateway-make-your-donation' => 'همینک کمک کنید',
3322	3329	'payflowpro_gateway-state-in-us' => 'اگر در داخل ایالات متحده هستید',
3323	3330	'payflowpro_gateway-comment' => 'توضیح',
	3331	+ 'payflowpro_gateway-first' => 'نخستین',
	3332	+ 'payflowpro_gateway-last' => 'واپسین',
	3333	+ 'payflowpro_gateway-other' => 'دیگر',
	3334	+ 'payflowpro_gateway-or' => 'یا',
	3335	+ 'payflowpro_gateway-your-information' => 'اطلاعات شما',
	3336	+ 'payflowpro_gateway-title' => 'عنوان',
	3337	+ 'payflowpro_gateway-address-1' => 'نشانی ۱',
	3338	+ 'payflowpro_gateway-address-2' => 'نشانی ۲',
	3339	+ 'payflowpro_gateway-street-address' => 'نشانی خیابان',
	3340	+ 'payflowpro_gateway-street-1' => 'خیابان ۱',
	3341	+ 'payflowpro_gateway-street-2' => 'خیابان ۲',
3324	3342	);
3325	3343
3326	3344	/** Finnish (Suomi)
—	—	@@ -4423,6 +4441,7 @@
4424	4442	'payflowpro_gateway-question-comment' => 'Prašenja abo komentary? Staj so z nami do zwiska: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
4425	4443	'payflowpro_gateway-donate-click' => 'Informacije wašeje kreditneje karty budu so wěsće předźěłować.',
4426	4444	'payflowpro_gateway-otherways' => 'Su tež <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">druhe móžnosće, zo byšće darił, na přikład PayPal, šek abo póst</a>.',
	4445	+ 'payflowpro_gateway-otherways-alt' => 'Su tež <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">druhe móžnosće, zo byšće darił</a>, inkluziwnje šek.',
4427	4446	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Druhe móžnosće darjenja (jendźelsce)</a>',
4428	4447	'payflowpro_gateway-paypal' => 'Maće konto PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Darće přez PayPal</a>.',
4429	4448	'payflowpro_gateway-credit-storage-processing' => 'Njeskładujemy informacije twojeje kreditneje karty a twoje wosobinske daty podleža našim <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">prawidłam priwatnośce</a>.',
—	—	@@ -4521,6 +4540,7 @@
4522	4541	'payflowpro_gateway-please-complete' => 'Prošu wudospołń swój dar deleka',
4523	4542	'payflowpro_gateway-description' => 'Wopisanje',
4524	4543	'payflowpro_gateway-donation' => 'Dar',
	4544	+ 'payflowpro_gateway-email-receipt' => 'E-mejlowe wobkrućenje na',
4525	4545	'payflowpro_gateway-state-dropdown-YY' => 'Wubjer kraj',
4526	4546	'payflowpro_gateway-state-dropdown-XX' => 'Zwonka Zjednoćenych statow',
4527	4547	);
—	—	@@ -4716,6 +4736,7 @@
4717	4737	'payflowpro_gateway-question-comment' => 'Questiones o commentos? Contacta: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
4718	4738	'payflowpro_gateway-donate-click' => 'Le informationes de tu carta de credito essera tractate de modo secur.',
4719	4739	'payflowpro_gateway-otherways' => 'Il ha <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/ia">altere modos de donar, como PayPal, cheque o posta</a>.',
	4740	+ 'payflowpro_gateway-otherways-alt' => 'Il ha <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">altere modos de donar</a>, como per cheque.',
4720	4741	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Altere modos de donation</a>',
4721	4742	'payflowpro_gateway-paypal' => 'Ha un conto de PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donar con PayPal</a>.',
4722	4743	'payflowpro_gateway-credit-storage-processing' => 'Nos non retene le informationes de tu carta de credito, e tu datos personal es subjecte a nostre <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">politica de confidentialitate</a>.',
—	—	@@ -4814,6 +4835,7 @@
4815	4836	'payflowpro_gateway-please-complete' => 'Per favor completa vostre donation hic infra ...',
4816	4837	'payflowpro_gateway-description' => 'Description',
4817	4838	'payflowpro_gateway-donation' => 'Donation',
	4839	+ 'payflowpro_gateway-email-receipt' => 'Inviar quitantia in e-mail a',
4818	4840	'payflowpro_gateway-state-dropdown-YY' => 'Selige un stato',
4819	4841	'payflowpro_gateway-state-dropdown-XX' => 'Extra le Statos Unite',
4820	4842	);
—	—	@@ -4821,12 +4843,15 @@
4822	4844	/** Indonesian (Bahasa Indonesia)
4823	4845	* @author Farras
4824	4846	* @author IvanLanin
	4847	+ * @author Kenrick95
4825	4848	*/
4826	4849	$messages['id'] = array(
4827	4850	'payflowprogateway' => 'Dukung Wikimedia',
4828	4851	'payflowpro_gateway-desc' => 'Pemrosesan kartu credit PayPal Payflow Pro',
4829	4852	'payflowpro_gateway-accessible' => 'Halaman ini hanya dapat diakses dari halaman donasi.',
4830	4853	'payflowpro_gateway-form-message' => 'Berkontribusi dengan kartu kredit Anda.',
	4854	+ 'payflowpro_gateway-paypal-button' => 'Sumbangkan melalui PayPal',
	4855	+ 'payflowpro_gateway-cc-button' => 'Sumbangkan melalui kartu kredit',
4831	4856	'payflowpro_gateway-form-message-2' => 'Untuk mengganti nilai atau mata uang, kembali ke <a href="https://www.mediawiki.org/index.php?title=Donate">halaman donasi</a>',
4832	4857	'payflowpro_gateway-donor-legend' => 'Informasi donor',
4833	4858	'payflowpro_gateway-card-legend' => 'Informasi kartu kredit',
—	—	@@ -4904,6 +4929,13 @@
4905	4930	'payflowpro_gateway-donate-click' => 'Setelah mengeklik "Donate", informasi kartu kredit Anda akan diproses.',
4906	4931	'payflowpro_gateway-credit-storage-processing' => 'Kami tidak menyimpan informasi kartu kredit dan data pribadi Anda sesuai dengan <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">kebijakan privasi</a> kami.',
4907	4932	'payflowpro_gateway-token-mismatch' => 'Sesi Anda telah berakhir. Silakan coba mengisi formulir dan mengirimkannya lagi.',
	4933	+ 'payflowpro_gateway-or' => 'atau',
	4934	+ 'payflowpro_gateway-address-1' => 'Alamat 1',
	4935	+ 'payflowpro_gateway-address-2' => 'Alamat 2',
	4936	+ 'payflowpro_gateway-address-lines' => 'Jalur alamat',
	4937	+ 'payflowpro_gateway-address-line-2' => 'Alamat (jalur 2)',
	4938	+ 'payflowpro_gateway-street-address' => 'Jalan alamat',
	4939	+ 'payflowpro_gateway-street-address-line-2' => 'Jalan alamat (jalur 2)',
4908	4940	);
4909	4941
4910	4942	/** Ido (Ido)
—	—	@@ -4942,7 +4974,7 @@
4943	4975	'payflowpro_gateway-donor-legend' => 'Informazioni sul donatore',
4944	4976	'payflowpro_gateway-card-legend' => 'Informazioni sulla carta di credito',
4945	4977	'payflowpro_gateway-amount-legend' => 'Importo donazione:',
4946		~~- 'payflowpro_gateway-cvv-link' => 'Esempio',~~
	4978	+ 'payflowpro_gateway-cvv-link' => 'Dove lo trovo?',
4947	4979	'payflowpro_gateway-donor-amount' => 'Somma',
4948	4980	'payflowpro_gateway-donor-currency-label' => 'Valuta:',
4949	4981	'payflowpro_gateway-donor-email' => 'Indirizzo e-mail:',
—	—	@@ -5015,14 +5047,58 @@
5016	5048	'payflowpro_gateway-question-comment' => 'Domande o commenti? Contatta <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
5017	5049	'payflowpro_gateway-donate-click' => 'La tua carta di credito verrà elaborata in modo sicuro.',
5018	5050	'payflowpro_gateway-otherways' => 'Sono possibili <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">altri modi per donare, tra cui PayPal, assegno o posta</a>.',
	5051	+ 'payflowpro_gateway-otherways-alt' => 'Sono possibili <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">altri modi per donare</a>, anche con assegno.',
5019	5052	'payflowpro_gateway-paypal' => 'Hai un conto PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Dona con PayPal</a>.',
5020	5053	'payflowpro_gateway-token-mismatch' => 'La sessione è scaduta. Prova compilando e inviando nuovamente il modulo.',
5021	5054	'payflowpro_gateway-cc-form-header-personal' => 'Dati di fatturazione',
5022	5055	'payflowpro_gateway-cc-form-header-payment' => 'Informazioni sul pagamento',
5023	5056	'payflowpro_gateway-make-your-donation' => 'Fai la tua donazione ora',
5024	5057	'payflowpro_gateway-comment' => 'Commento',
	5058	+ 'payflowpro_gateway-first' => 'Nome',
	5059	+ 'payflowpro_gateway-last' => 'Cognome',
5025	5060	'payflowpro_gateway-other' => 'Altro',
5026	5061	'payflowpro_gateway-noscript-redirect-msg' => 'Se non si può o non si vuole abilitare JavaScript, è ancora possibile contribuire visitando:',
	5062	+ 'payflowpro_gateway-or' => 'o',
	5063	+ 'payflowpro_gateway-title' => 'Titolo',
	5064	+ 'payflowpro_gateway-address-1' => 'Indirizzo 1',
	5065	+ 'payflowpro_gateway-address-2' => 'Indirizzo 2',
	5066	+ 'payflowpro_gateway-street-1' => 'Via 1',
	5067	+ 'payflowpro_gateway-street-2' => 'Via 2',
	5068	+ 'payflowpro_gateway-zip' => 'CAP',
	5069	+ 'payflowpro_gateway-zip-code' => 'Codice postale',
	5070	+ 'payflowpro_gateway-zip-postal' => 'Codice postale',
	5071	+ 'payflowpro_gateway-zip-postal-code' => 'Codice postale',
	5072	+ 'payflowpro_gateway-country' => 'Nazione',
	5073	+ 'payflowpro_gateway-select-country' => 'Seleziona la nazione',
	5074	+ 'payflowpro_gateway-confirm-email' => 'Conferma e-mail',
	5075	+ 'payflowpro_gateway-confirmation-email' => 'Conferma e-mail',
	5076	+ 'payflowpro_gateway-telephone' => 'Telefono',
	5077	+ 'payflowpro_gateway-telephone-home' => 'Telefono (abitazione)',
	5078	+ 'payflowpro_gateway-type-of-card' => 'Tipo di carta',
	5079	+ 'payflowpro_gateway-cards-accepted' => 'Carte di credito accettate',
	5080	+ 'payflowpro_gateway-card-type' => 'Tipo di carta',
	5081	+ 'payflowpro_gateway-credit-card-type' => 'Tipo di carta di credito',
	5082	+ 'payflowpro_gateway-credit-card-number' => 'Numero della carta di credito',
	5083	+ 'payflowpro_gateway-credit-card-expiration' => 'Scadenza della carta di credito',
	5084	+ 'payflowpro_gateway-card-expiration' => 'Scadenza della carta',
	5085	+ 'payflowpro_gateway-select-month-of-expiration' => 'Seleziona il mese di scadenza',
	5086	+ 'payflowpro_gateway-select-year-of-expiration' => "Seleziona l'anno di scadenza",
	5087	+ 'payflowpro_gateway-expires-question' => 'Scadenza?',
	5088	+ 'payflowpro_gateway-expires' => 'Scadenza',
	5089	+ 'payflowpro_gateway-card-security-code' => 'Codice di sicurezza della carta',
	5090	+ 'payflowpro_gateway-what-is-this' => "Cos'è questo?",
	5091	+ 'payflowpro_gateway-donate-now' => 'Dona ora',
	5092	+ 'payflowpro_gateway-select-amount' => 'Seleziona importo',
	5093	+ 'payflowpro_gateway-amount' => 'Importo',
	5094	+ 'payflowpro_gateway-make-a-donation' => 'Fai una donazione',
	5095	+ 'payflowpro_gateway-select-dollar-amount' => "Seleziona l'importo in dollari",
	5096	+ 'payflowpro_gateway-continue' => 'Continua',
	5097	+ 'payflowpro_gateway-cancel' => 'Annulla',
	5098	+ 'payflowpro_gateway-payment' => 'Pagamento',
	5099	+ 'payflowpro_gateway-payment-type' => 'Tipo di pagamento',
	5100	+ 'payflowpro_gateway-description' => 'Descrizione',
	5101	+ 'payflowpro_gateway-donation' => 'Donazione',
	5102	+ 'payflowpro_gateway-state-dropdown-YY' => 'Seleziona uno Stato',
5027	5103	);
5028	5104
5029	5105	/** Japanese (日本語)
—	—	@@ -7336,7 +7412,7 @@
7337	7413	'payflowpro_gateway-please-complete' => 'Proszę poniżej zatwierdzić darowiznę...',
7338	7414	'payflowpro_gateway-description' => 'Opis',
7339	7415	'payflowpro_gateway-donation' => 'Darowizna',
7340		~~- 'payflowpro_gateway-email-receipt' => 'Wyślij potwierdzenie na adres e-mail',~~
	7416	+ 'payflowpro_gateway-email-receipt' => 'Wyślij potwierdzenie na adres e‐mail',
7341	7417	'payflowpro_gateway-state-dropdown-YY' => 'Wybierz stan',
7342	7418	'payflowpro_gateway-state-dropdown-XX' => 'Poza USA',
7343	7419	);
—	—	@@ -7663,6 +7739,7 @@
7664	7740	'payflowpro_gateway-question-comment' => 'Tem perguntas ou comentários? Contacte: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
7665	7741	'payflowpro_gateway-donate-click' => 'O seu cartão de crédito será processado de forma segura.',
7666	7742	'payflowpro_gateway-otherways' => 'Pode <a href="http://wikimediafoundation.org/wiki/Coleta_de_fundos">fazer um donativo por outras vias, incluindo por PayPal, cheque, ou correio</a>.',
	7743	+ 'payflowpro_gateway-otherways-alt' => 'Há <a href="http://wikimediafoundation.org/wiki/Coleta_de_fundos">outras formas de contribuir</a>, incluindo por cheque.',
7667	7744	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Outras formas de contribuir</a>',
7668	7745	'payflowpro_gateway-paypal' => 'Tem uma conta PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donativos através do PayPal</a>.',
7669	7746	'payflowpro_gateway-credit-storage-processing' => 'Não armazenamos informação do seu cartão de crédito e os seus dados particulares estão sujeitos à nossa <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">política de privacidade</a>.',
—	—	@@ -7761,6 +7838,7 @@
7762	7839	'payflowpro_gateway-please-complete' => 'Faça o seu donativo abaixo, por favor...',
7763	7840	'payflowpro_gateway-description' => 'Descrição',
7764	7841	'payflowpro_gateway-donation' => 'Donativo',
	7842	+ 'payflowpro_gateway-email-receipt' => 'Enviar o recibo para o endereço electrónico',
7765	7843	'payflowpro_gateway-state-dropdown-YY' => 'Seleccione um Estado.',
7766	7844	'payflowpro_gateway-state-dropdown-XX' => 'Fora dos EUA.',
7767	7845	);
—	—	@@ -8860,6 +8938,7 @@
8861	8939	'payflowpro_gateway-question-comment' => 'Vprašanja ali pripombe? Stik z nami: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
8862	8940	'payflowpro_gateway-donate-click' => 'Vaša kreditna kartica bo varno obdelana.',
8863	8941	'payflowpro_gateway-otherways' => 'Obstajajo tudi <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">drugi načini darovanja, vključno s PayPal, čekom ali pošto</a>.',
	8942	+ 'payflowpro_gateway-otherways-alt' => 'Obstajajo tudi <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">drugi načini darovanja</a>, vključno s čekom.',
8864	8943	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Drugi načini darovanja</a>',
8865	8944	'payflowpro_gateway-paypal' => 'Imate račun PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Prispevajte s PayPal</a>.',
8866	8945	'payflowpro_gateway-credit-storage-processing' => 'Vaših podatkov o kreditni kartici ne hranimo, vaše osebne podatke pa urejamo v skladu s <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">pravilnikom o zasebnosti</a>.',
—	—	@@ -8959,6 +9038,7 @@
8960	9039	'payflowpro_gateway-please-complete' => 'Prosimo, spodaj dokončajte svojo donacijo ...',
8961	9040	'payflowpro_gateway-description' => 'Opis',
8962	9041	'payflowpro_gateway-donation' => 'Donacija',
	9042	+ 'payflowpro_gateway-email-receipt' => 'Pošljite račun na e-naslov',
8963	9043	'payflowpro_gateway-state-dropdown-YY' => 'Izberite državo',
8964	9044	'payflowpro_gateway-state-dropdown-XX' => 'Izven ZDA',
8965	9045	);
—	—	@@ -9268,6 +9348,7 @@
9269	9349	'payflowpro_gateway-question-comment' => 'సందేహాలూ లేదా సూచనలు ఉన్నాయా? సంప్రదించండి: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
9270	9350	'payflowpro_gateway-donate-click' => 'మీ క్రెడిట్ కార్డుని భద్రంగా వ్యవహరిస్తాం.',
9271	9351	'payflowpro_gateway-otherways' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">చెల్లించడానికి పేపాల్, చెక్కు, లేదా తపాలా లాంటి ఇతర మార్గాలు</a> ఉన్నాయి.',
	9352	+ 'payflowpro_gateway-otherways-alt' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">చెల్లించడానికి ఇతర మార్గాలు</a>, చెక్కుతో సహా, కూడా ఉన్నాయి.',
9272	9353	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">ఇవ్వడానికి ఇతర పద్ధతులు</a>',
9273	9354	'payflowpro_gateway-paypal' => 'మీకు పేపాల్ ఖాతా ఉందా? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">పేపాల్ ద్వారా విరాళమివ్వండి</a>.',
9274	9355	'payflowpro_gateway-credit-storage-processing' => 'మీ క్రెడిట్ కార్డు సమాచారాన్ని మేము నిల్వచేయము, మరియు మీ వ్యక్తిగత సమాచారం మా <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">గోప్యతా విధానాని</a>కి లోబడి ఉంటుంది.',
—	—	@@ -9343,6 +9424,9 @@
9344	9425	'payflowpro_gateway-cancel' => 'రద్దుచేయి',
9345	9426	'payflowpro_gateway-payment' => 'చెల్లింపు',
9346	9427	'payflowpro_gateway-payment-type' => 'చెల్లింపు రకం',
	9428	+ 'payflowpro_gateway-please-complete' => 'దయచేసి మీ విరాళాన్ని ఈ క్రింద పూర్తిచేయండి ...',
	9429	+ 'payflowpro_gateway-description' => 'వివరణ',
	9430	+ 'payflowpro_gateway-donation' => 'విరాళం',
9347	9431	'payflowpro_gateway-state-dropdown-YY' => 'రాష్ట్రాన్ని ఎంచుకోండి',
9348	9432	'payflowpro_gateway-state-dropdown-XX' => 'అమెరికా బయట',
9349	9433	);
—	—	@@ -9603,6 +9687,7 @@
9604	9688	'payflowpro_gateway-question-comment' => 'May katanungan o komento? Makipag-ugnayan sa: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
9605	9689	'payflowpro_gateway-donate-click' => 'Ligtas na ipoproseso ang iyong tarhetang pang-utang.',
9606	9690	'payflowpro_gateway-otherways' => 'May <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">ibang mga paraan upang makapagbigay, kasama ang PayPal, tseke, o liham</a>.',
	9691	+ 'payflowpro_gateway-otherways-alt' => 'Mayroong <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">iba pang paraan ng pagbibigay</a>, kasama ang paggamit ng tseke.',
9607	9692	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/tl">Ibang mga paraan ng pagbibigay</a>',
9608	9693	'payflowpro_gateway-paypal' => 'Mayroon ka bang akawnt ng PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Mag-abuloy sa pamamagitan ng PayPal</a>.',
9609	9694	'payflowpro_gateway-credit-storage-processing' => 'Hindi namin itinatabi ang iyong kabatiran na pangtarhetang pang-utang, at ang iyong datong pansarili ay nasa ilalim ng <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">patakaran ng pagkapribado</a>.',
—	—	@@ -9674,6 +9759,7 @@
9675	9760	'payflowpro_gateway-cancel' => 'Kanselahin',
9676	9761	'payflowpro_gateway-payment' => 'Pagbabayad',
9677	9762	'payflowpro_gateway-payment-type' => 'Uri ng pagbabayad',
	9763	+ 'payflowpro_gateway-email-receipt' => 'Ipadala sa pamamagitan ng e-liham ang resibo sa',
9678	9764	'payflowpro_gateway-state-dropdown-YY' => 'Pumili ng Estado',
9679	9765	'payflowpro_gateway-state-dropdown-XX' => 'Nasa labas ng Estados Unidos',
9680	9766	);
—	—	@@ -9931,6 +10017,7 @@
9932	10018	'payflowpro_gateway-anon-message' => "Будь ласка, включіть моє ім'я у відкритий список донорів",
9933	10019	'payflowpro_gateway-donate-wikipedia' => 'Пожертвувати на Вікіпедію',
9934	10020	'payflowpro_gateway-or' => 'або',
	10021	+ 'payflowpro_gateway-address-1' => 'Адреса 1',
9935	10022	'payflowpro_gateway-country' => 'Країна',
9936	10023	'payflowpro_gateway-select-country' => 'Виберіть країну',
9937	10024	'payflowpro_gateway-telephone-home' => 'Тел. (домашній)',
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
—	—	@@ -32,6 +32,7 @@
33	33	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoColumnLetter5' ] = $dir . 'forms/TwoColumnLetter5.php';
34	34	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoColumnLetter6' ] = $dir . 'forms/TwoColumnLetter6.php';
35	35	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter' ] = $dir . 'forms/TwoStepTwoColumnLetter.php';
	36	+$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetterCA' ] = $dir . 'forms/TwoStepTwoColumnLetterCA.php';
36	37	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter2' ] = $dir . 'forms/TwoStepTwoColumnLetter2.php';
37	38	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter3' ] = $dir . 'forms/TwoStepTwoColumnLetter3.php';
38	39	$wgAutoloadClasses[ 'PayflowProGateway_Form_SingleColumn' ] = $dir . 'forms/SingleColumn.php';
Index: branches/fundraising/deployment/DonationInterface/donate_interface/donate_interface.i18n.php
—	—	@@ -1232,6 +1232,7 @@
1233	1233	/** Indonesian (Bahasa Indonesia)
1234	1234	* @author Farras
1235	1235	* @author IvanLanin
	1236	+ * @author Kenrick95
1236	1237	*/
1237	1238	$messages['id'] = array(
1238	1239	'donate_interface' => 'Dukung Wikimedia',
—	—	@@ -1245,7 +1246,7 @@
1246	1247	'donate_interface-comment-message' => 'Ada suatu pikiran untuk dibagi dengan dunia? Masukkan maksimum 200 karakter di sini:',
1247	1248	'donate_interface-comment-label' => 'Komentar:',
1248	1249	'donate_interface-anon-message' => 'Daftarkan nama saya (di sebelah komentar saya) pada daftar donor publik.',
1249		~~- 'donate_interface-email-agreement' => 'Saya setuju untuk menerima nawala atau surel Yayasan Wikimedia di masa mendatang.',~~
	1250	+ 'donate_interface-email-agreement' => 'Saya setuju untuk menerima nawala Yayasan Wikimedia di masa mendatang.',
1250	1251	'donate_interface-comment-title' => 'Komentar publik',
1251	1252	'donate_interface-amount-error' => 'Harap masukkan nilai yang valid',
1252	1253	'donate_interface-processing-error' => 'Terjadi kesalahan dalam pemrosesan permintaan Anda. Tidak ada pemroses yang tersedia.',
—	—	@@ -2047,7 +2048,7 @@
2048	2049	'donate_interface-comment-message' => 'Quer partilhar um pensamento com o mundo? Coloque até 200 caracteres aqui:',
2049	2050	'donate_interface-comment-label' => 'Comentário:',
2050	2051	'donate_interface-anon-message' => 'Por favor, listem o meu nome (junto ao meu comentário) na lista pública de contribuidores.',
2051		~~- 'donate_interface-email-agreement' => 'Concordo em receber mansagens ocasionais da Wikimedia Foundation.',~~
	2052	+ 'donate_interface-email-agreement' => 'Concordo em receber mensagens ocasionais da Wikimedia Foundation.',
2052	2053	'donate_interface-comment-title' => 'Comentário público',
2053	2054	'donate_interface-amount-error' => 'Por favor, insira um montante válido',
2054	2055	'donate_interface-processing-error' => 'Ocorreu um erro no processamento do seu pedido.
—	—	@@ -2087,7 +2088,7 @@
2088	2089	'donate_interface-comment-message' => 'Quer compartilhar um pensamento com o mundo? Coloque até 200 caracteres aqui:',
2089	2090	'donate_interface-comment-label' => 'Comentário:',
2090	2091	'donate_interface-anon-message' => 'Por favor, listem o meu nome (junto ao meu comentário) na lista pública de contribuidores.',
2091		~~- 'donate_interface-email-agreement' => "Concordo em receber futuras ''newsletters'' e e-mails da Wikimedia Foundation.",~~
	2092	+ 'donate_interface-email-agreement' => 'Concordo em receber mensagens ocasionais da Wikimedia Foundation.',
2092	2093	'donate_interface-comment-title' => 'Comentário público',
2093	2094	'donate_interface-amount-error' => 'Por favor, insira um montante válido',
2094	2095	'donate_interface-processing-error' => 'Ocorreu um erro no processamento do seu pedido.
—	—	@@ -2576,7 +2577,7 @@
2577	2578	'donate_interface-comment-message' => 'Mayroon ka bang kaisipang nais ipamahagi sa mundo? Maglagay ng hanggang sa 200 mga panitik dito:',
2578	2579	'donate_interface-comment-label' => 'Komento',
2579	2580	'donate_interface-anon-message' => 'Pakitala ang pangalan ko (katabi ng aking komento) sa pampublikong tala ng mga tagapagkaloob.',
2580		~~- 'donate_interface-email-agreement' => 'Sumasang-ayon ako na paminsan-minsang makatanggap ng mga nagbabagang balita mula sa Pundasyong Wikimedia.',~~
	2581	+ 'donate_interface-email-agreement' => 'Sumasang-ayon akong paminsan-minsan na makatanggap ng mga balita mula sa Pundasyong Wikimedia.',
2581	2582	'donate_interface-comment-title' => 'Pampublikong komento',
2582	2583	'donate_interface-amount-error' => 'Mangyaring magpasok ng isang tanggap na halaga',
2583	2584	'donate_interface-processing-error' => 'Nagkaroon ng isang kamalian sa pagsasagawa ng iyong kahilingan.
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
2584	2585	Merged /trunk/extensions/DonationInterface:r76840-76903

Follow-up revisions

Revision	Commit summary	Author	Date
r76909	Merging from r76904 thru r76908 of trunk	awjrichards	22:24, 17 November 2010

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r76840	Merging from r76829 thru r76839 of trunk	awjrichards	21:45, 16 November 2010
r76903	canada default	kaldari	20:53, 17 November 2010

Status & tagging log

19:47, 21 November 2010 Reedy (talk | contribs) changed the status of r76904 [removed: new added: deferred]