Permalink
Browse files

Update to latest 4.2 branch (preparing for 4.3 and diffs).

  • Loading branch information...
1 parent 7d9932a commit 47320e5106e2c8cf58c9db43310ffdf024a242ee @mlutfy mlutfy committed Apr 30, 2013
Showing with 18 additions and 8 deletions.
  1. +10 −1 po/pot/common-base.pot
  2. +1 −6 po/pot/common-components.pot
  3. +7 −1 po/pot/contribute.pot
View
11 po/pot/common-base.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: CiviCRM\n"
-"POT-Creation-Date: 2013-01-24 14:47-0500\n"
+"POT-Creation-Date: 2013-04-30 13:40-0400\n"
"Language-Team: CiviCRM Translators <civicrm-translators@lists.civicrm.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20325,6 +20325,15 @@ msgstr ""
#: CRM/Upgrade/Incremental/php/FourTwo.php
msgid ""
+"We found unexpected data values from an older version of CiviCRM in your "
+"database. The upgrade can not be run until this condition is corrected.<br /"
+"><br />Details: One or more rows are present in the civicrm_option_group "
+"with name like 'civicrm_price_field.amount.%'. <a href='%1'>Check here for "
+"information on diagnosing and correcting this problem.</a>"
+msgstr ""
+
+#: CRM/Upgrade/Incremental/php/FourTwo.php
+msgid ""
"Default versions of the following System Workflow Message Templates have "
"been modified to handle new functionality: <ul><li>Events - Registration "
"Confirmation and Receipt (on-line)</li><li>Pledges - Acknowledgement</"
View
7 po/pot/common-components.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: CiviCRM\n"
-"POT-Creation-Date: 2013-01-24 14:47-0500\n"
+"POT-Creation-Date: 2013-04-30 13:40-0400\n"
"Language-Team: CiviCRM Translators <civicrm-translators@lists.civicrm.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -992,11 +992,6 @@ msgstr ""
#: CRM/Admin/Form/ScheduleReminders.php
#: CRM/Event/Form/ManageEvent/ScheduleReminders.php
-msgid "0"
-msgstr ""
-
-#: CRM/Admin/Form/ScheduleReminders.php
-#: CRM/Event/Form/ManageEvent/ScheduleReminders.php
msgid "before"
msgstr ""
View
8 po/pot/contribute.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: CiviCRM\n"
-"POT-Creation-Date: 2013-01-24 14:47-0500\n"
+"POT-Creation-Date: 2013-04-30 13:40-0400\n"
"Language-Team: CiviCRM Translators <civicrm-translators@lists.civicrm.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -4773,6 +4773,12 @@ msgid ""
msgstr ""
#: templates/CRM/Contribute/Form/Contribution/Main.tpl
+msgid ""
+"This page requires Javascript. Please enable Javascript in your web browser "
+"preferences and refresh the page."
+msgstr ""
+
+#: templates/CRM/Contribute/Form/Contribution/Main.tpl
msgid "Payment Options"
msgstr ""

0 comments on commit 47320e5

Please sign in to comment.