Commit 47320e51 authored by bgm's avatar bgm

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

parent 7d9932ae
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CiviCRM\n" "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" "Language-Team: CiviCRM Translators <civicrm-translators@lists.civicrm.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -20323,6 +20323,15 @@ msgid "" ...@@ -20323,6 +20323,15 @@ msgid ""
"a>." "a>."
msgstr "" 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 #: CRM/Upgrade/Incremental/php/FourTwo.php
msgid "" msgid ""
"Default versions of the following System Workflow Message Templates have " "Default versions of the following System Workflow Message Templates have "
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CiviCRM\n" "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" "Language-Team: CiviCRM Translators <civicrm-translators@lists.civicrm.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -990,11 +990,6 @@ msgstr "" ...@@ -990,11 +990,6 @@ msgstr ""
msgid "Due Date" msgid "Due Date"
msgstr "" msgstr ""
#: CRM/Admin/Form/ScheduleReminders.php
#: CRM/Event/Form/ManageEvent/ScheduleReminders.php
msgid "0"
msgstr ""
#: CRM/Admin/Form/ScheduleReminders.php #: CRM/Admin/Form/ScheduleReminders.php
#: CRM/Event/Form/ManageEvent/ScheduleReminders.php #: CRM/Event/Form/ManageEvent/ScheduleReminders.php
msgid "before" msgid "before"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CiviCRM\n" "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" "Language-Team: CiviCRM Translators <civicrm-translators@lists.civicrm.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -4772,6 +4772,12 @@ msgid "" ...@@ -4772,6 +4772,12 @@ msgid ""
"visiting the web page link that will be included in your receipt." "visiting the web page link that will be included in your receipt."
msgstr "" 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 #: templates/CRM/Contribute/Form/Contribution/Main.tpl
msgid "Payment Options" msgid "Payment Options"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment