r79287 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79286‎ | r79287 | r79288 >
Date:19:30, 30 December 2010
Author:awjrichards
Status:deferred
Tags:
Comment:
Merging from r79285 thru r79286 of trunk to pick up reverted i18n file
Modified paths:
  • /branches/fundraising/deployment/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
@@ -50,10 +50,7 @@
5151 'payflowpro_gateway-error-msg-js' => 'Please enter your',
5252 'payflowpro_gateway-error-msg-invalid-amount' => '**Please enter a valid amount**',
5353 'payflowpro_gateway-error-msg-email' => '**Please enter a valid e-mail address**',
54 - 'payflowpro_gateway-error-msg-amex' => '**Please enter a correct card number for American Express.**',
55 - 'payflowpro_gateway-error-msg-mc' => '**Please enter a correct card number for MasterCard.**',
56 - 'payflowpro_gateway-error-msg-visa' => '**Please enter a correct card number for Visa.**',
57 - 'payflowpro_gateway-error-msg-discover' => '**Please enter a correct card number for Discover.**',
 54+ 'payflowpro_gateway-error-msg-card-num' => '**Please enter a valid credit card number for one of the accepted credit card types**',
5855 'payflowpro_gateway-error-msg-amount' => 'donation amount',
5956 'payflowpro_gateway-error-msg-emailAdd' => 'e-mail address',
6057 'payflowpro_gateway-error-msg-fname' => 'first name',
@@ -2688,9 +2685,22 @@
26892686 'payflowpro_gateway-monthly-donation' => 'Monatlich spenden',
26902687 'payflowpro_gateway-via-paypal' => '(per PayPal)',
26912688 'payflowpro_gateway-shirt-size' => 'T-Shirt-Größe:',
 2689+ 'payflowpro_gateway-shirt-size-2' => 'T-Shirt-Größe: $1',
26922690 'payflowpro_gateway-language' => 'Sprache:',
26932691 'payflowpro_gateway-front' => 'Vorderseite',
26942692 'payflowpro_gateway-back' => 'Rückseite',
 2693+ 'payflowpro_gateway-front-of-shirt' => 'Vorderseite',
 2694+ 'payflowpro_gateway-back-of-shirt' => 'Rückseite',
 2695+ 'payflowpro_gateway-select-a-size' => 'Bitte wähle eine Größe.',
 2696+ 'payflowpro_gateway-select' => 'Größe:',
 2697+ 'payflowpro_gateway-shipping-address' => 'Lieferadresse',
 2698+ 'payflowpro_gateway-shipping-address-different' => 'Meine Lieferadresse unterscheidet sich von der Rechnungsadresse.',
 2699+ 'payflowpro_gateway-shipping-address-same' => 'Lieferadresse entspricht der Rechnungsadresse.',
 2700+ 'payflowpro_gateway-only-billing-address' => 'Shirts können nur an deine Rechnungsadresse versandt werden.',
 2701+ 'payflowpro_gateway-donation-must-equal' => 'Die Spende muss $1 oder mehr betragen.',
 2702+ 'payflowpro_gateway-thank-you' => 'Vielen Dank! Deine Spende ist eingegangen.',
 2703+ 'payflowpro_gateway-wikipedia-translation' => 'Hinweis: „Wikipedia“ auf dem Ärmel ist das „Wikipedia 10“-Logo, das nicht übersetzt ist.',
 2704+ 'payflowpro_gateway-on-the-back' => 'Auf der Rückseite:',
26952705 'payflowpro_gateway-state-dropdown-YY' => 'Wähle ein Land',
26962706 'payflowpro_gateway-state-dropdown-XX' => 'Außerhalb der Vereinigten Staaten',
26972707 );
@@ -11514,10 +11524,23 @@
1151511525 'payflowpro_gateway-email-receipt' => 'Gửi thư điện tử biên lai tới',
1151611526 'payflowpro_gateway-monthly-donation' => 'Quyên góp hàng tháng',
1151711527 'payflowpro_gateway-via-paypal' => '(qua PayPal)',
11518 - 'payflowpro_gateway-shirt-size' => 'Cỡ áo phông:',
 11528+ 'payflowpro_gateway-shirt-size' => 'Cỡ áo thun:',
 11529+ 'payflowpro_gateway-shirt-size-2' => 'Cỡ áo thun: $1',
1151911530 'payflowpro_gateway-language' => 'Ngôn ngữ:',
1152011531 'payflowpro_gateway-front' => 'Mặt trước',
1152111532 'payflowpro_gateway-back' => 'Mặt sau',
 11533+ 'payflowpro_gateway-front-of-shirt' => 'Mặt trước',
 11534+ 'payflowpro_gateway-back-of-shirt' => 'Mặt sau',
 11535+ 'payflowpro_gateway-select-a-size' => 'Xin hãy chọn cỡ áo.',
 11536+ 'payflowpro_gateway-select' => 'Cỡ áo:',
 11537+ 'payflowpro_gateway-shipping-address' => 'Địa chỉ gửi hàng',
 11538+ 'payflowpro_gateway-shipping-address-different' => 'Địa chỉ gửi hàng của tôi khác với địa chỉ thanh toán.',
 11539+ 'payflowpro_gateway-shipping-address-same' => 'Địa chỉ gửi hàng giống địa chỉ thanh toán.',
 11540+ 'payflowpro_gateway-only-billing-address' => 'Chỉ có thể gửi áo tới địa chỉ thanh toán.',
 11541+ 'payflowpro_gateway-donation-must-equal' => 'Chỉ được quyên góp 1 USD trở lên.',
 11542+ 'payflowpro_gateway-thank-you' => 'Cám ơn! Chúng tôi đã nhận quyên góp của bạn.',
 11543+ 'payflowpro_gateway-wikipedia-translation' => 'Tay áo sẽ có hình “Wikipedia 10”.',
 11544+ 'payflowpro_gateway-on-the-back' => 'Mặt sau có:',
1152211545 'payflowpro_gateway-state-dropdown-YY' => 'Chọn tiểu bang',
1152311546 'payflowpro_gateway-state-dropdown-XX' => 'Bên ngoài Hoa Kỳ',
1152411547 );
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
___________________________________________________________________
Added: svn:mergeinfo
1152511548 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php:r75657-77440,77442-79286
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
1152611549 Merged /trunk/extensions/DonationInterface:r79282-79286

Follow-up revisions

RevisionCommit summaryAuthorDate
r79297Merge up to head of trunk from r79287. Picking up more premuims changes.tomasz22:29, 30 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r79285Follow up r77654...platonides19:18, 30 December 2010
r79286Reverting r79281 for payflowpro_gateway.i18n.php due to botched merge conflic...awjrichards19:29, 30 December 2010

Status & tagging log