Updated translation: German by debianese, c_schmitz

Updated translation: French (France) by ulysse68, c_schmitz
Updated translation: Japanese by nomoto
Updated translation: German (Informal) by c_schmitz

locale/_template/limesurvey.pot

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2012-08-09 22:05:43+00:00\n"
+"POT-Creation-Date: 2012-08-10 22:05:45+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2613,23 +2613,23 @@ msgstr ""
 msgid "Checked"
 msgstr ""
 
-#: application/controllers/admin/question.php:320
+#: application/controllers/admin/question.php:321
 msgid "Some example answer option"
 msgstr ""
 
-#: application/controllers/admin/question.php:483
+#: application/controllers/admin/question.php:487
 msgid "Some example subquestion"
 msgstr ""
 
-#: application/controllers/admin/question.php:868
+#: application/controllers/admin/question.php:872
 msgid "Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed"
 msgstr ""
 
-#: application/controllers/admin/question.php:895
+#: application/controllers/admin/question.php:899
 msgid "Question was successfully deleted."
 msgstr ""
 
-#: application/controllers/admin/question.php:901
+#: application/controllers/admin/question.php:905
 msgid "You are not authorized to delete questions."
 msgstr ""
 
@@ -4238,26 +4238,26 @@ msgid "This group does not contain any question(s)."
 msgstr ""
 
 #: application/helpers/admin/activate_helper.php:127
-msgid "This question is a subquestion type question but has no configured subquestions."
+msgid "This question has no subquestions."
 msgstr ""
 
 #: application/helpers/admin/activate_helper.php:137
-msgid "This question is a multiple answer type question but has no answers."
+msgid "This question has no answers."
 msgstr ""
 
-#: application/helpers/admin/activate_helper.php:148
+#: application/helpers/admin/activate_helper.php:147
 msgid "This question does not have a question 'type' set."
 msgstr ""
 
-#: application/helpers/admin/activate_helper.php:159
+#: application/helpers/admin/activate_helper.php:157
 msgid "This question requires answers, but none are set."
 msgstr ""
 
-#: application/helpers/admin/activate_helper.php:167
+#: application/helpers/admin/activate_helper.php:164
 msgid "This question requires a second answer set but none is set."
 msgstr ""
 
-#: application/helpers/admin/activate_helper.php:225
+#: application/helpers/admin/activate_helper.php:208
 msgid "This question has a condition set, however the condition is based on a question that appears after it."
 msgstr ""
 
@@ -8274,7 +8274,7 @@ msgid "Edit this condition"
 msgstr ""
 
 #: application/views/admin/conditions/includes/conditions_scenario.php:5
-msgid "New scenario number"
+msgid "New scenario number:"
 msgstr ""
 
 #: application/views/admin/conditions/includes/conditions_scenario.php:12