Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

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: 2015-08-13 12:34:07+00:00\n"
+"POT-Creation-Date: 2015-08-13 13:48:43+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -77,11 +77,6 @@ msgstr ""
 #: application/views/admin/token/browse.php:217
 #: application/views/admin/token/browse.php:222
 #: application/views/admin/token/ldapform.php:2
-#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:17
-#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:23
-#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:35
-#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:41
-#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:47
 msgid "Error"
 msgstr ""
 
@@ -15394,6 +15389,14 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:17
+#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:23
+#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:35
+#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:41
+#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:47
+msgid "Error!"
+msgstr ""
+
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:18
 msgid "PHP_CURL library not loaded"
 msgstr ""
@@ -15407,7 +15410,7 @@ msgid "No server answer"
 msgstr ""
 
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:25
-msgid "it seems that the Comfort Updater is not responding for now. Please try again in few minutes or contact the LimeSurvey team."
+msgid "it seems that the ComfortUpdate is not responding for now. Please try again in few minutes or contact the LimeSurvey team."
 msgstr ""
 
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:29
@@ -15439,15 +15442,24 @@ msgid "It seems you're using a version coming from the LimeSurvey GitHub reposit
 msgstr ""
 
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:48
-msgid "Unknown Error!"
+msgid "Unknown error!"
 msgstr ""
 
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:49
-msgid "An unknown error occured. Please, contact the LimeSurvey team."
+msgid "An unknown error occured."
+msgstr ""
+
+#: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:49
+#: application/views/admin/update/updater/_error.php:70
+#: application/views/admin/update/updater/_error.php:88
+#: application/views/admin/update/updater/_error.php:94
+#: application/views/admin/update/updater/_error.php:100
+#: application/views/admin/update/updater/_error.php:134
+msgid "Please contact the LimeSurvey team."
 msgstr ""
 
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:50
-msgid "error code : "
+msgid "Error Code:"
 msgstr ""
 
 #: application/views/admin/update/updater/_error.php:15
@@ -15474,14 +15486,6 @@ msgstr ""
 msgid "Download error!"
 msgstr ""
 
-#: application/views/admin/update/updater/_error.php:70
-#: application/views/admin/update/updater/_error.php:88
-#: application/views/admin/update/updater/_error.php:94
-#: application/views/admin/update/updater/_error.php:100
-#: application/views/admin/update/updater/_error.php:134
-msgid "Please contact the LimeSurvey team."
-msgstr ""
-
 #: application/views/admin/update/updater/_error.php:81
 msgid "Update server busy"
 msgstr ""