Updated translation: Catalan by qualitatuvic

Updated translation: German by Thomas218, actxcellence, c_schmitz
Updated translation: Spanish (Mexican) by fernandoessv
Updated translation: French (France) by arnaud21
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Dutch by Han
Updated translation: Norwegian (Nynorsk) by pmonstad
Updated translation: Portuguese (Portugal) by samarta
Updated translation: Slovenian by lado, dusan
Updated translation: Swedish by maxzomborszki
Updated translation: Thai by c_schmitz, adzpire, tomzt
Updated translation: German (Informal) by actxcellence
Updated translation: Dutch (Informal) by Han

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: 2017-06-22 12:17:14+00:00\n"
+"POT-Creation-Date: 2017-07-20 10:04:48+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,11 +53,11 @@ msgstr ""
 #: application/helpers/admin/import_helper.php:1536
 #: application/helpers/admin/import_helper.php:1710
 #: application/helpers/admin/import_helper.php:2059
-#: application/helpers/admin/import_helper.php:2250
-#: application/helpers/admin/import_helper.php:2307
-#: application/helpers/admin/import_helper.php:2355
-#: application/helpers/admin/import_helper.php:2489
-#: application/helpers/admin/import_helper.php:2529
+#: application/helpers/admin/import_helper.php:2243
+#: application/helpers/admin/import_helper.php:2300
+#: application/helpers/admin/import_helper.php:2348
+#: application/helpers/admin/import_helper.php:2482
+#: application/helpers/admin/import_helper.php:2522
 #: application/views/admin/dataentry/active_html_view.php:116
 #: application/views/admin/dataentry/vvimport_result.php:16
 #: application/views/admin/error_view.php:3
@@ -1362,10 +1362,10 @@ msgstr ""
 #: application/controllers/admin/conditionsaction.php:711
 #: application/controllers/admin/tokens.php:1572
 #: application/controllers/admin/useraction.php:166
-#: application/helpers/admin/import_helper.php:2405
-#: application/helpers/admin/import_helper.php:2423
-#: application/helpers/admin/import_helper.php:2450
-#: application/helpers/admin/import_helper.php:2511
+#: application/helpers/admin/import_helper.php:2398
+#: application/helpers/admin/import_helper.php:2416
+#: application/helpers/admin/import_helper.php:2443
+#: application/helpers/admin/import_helper.php:2504
 #: application/views/admin/dataentry/import.php:27
 #: application/views/admin/dataentry/vvimport_result.php:22
 #: application/views/admin/survey/Question/question_view.php:103
@@ -1514,8 +1514,8 @@ msgstr ""
 #: application/models/ParticipantShare.php:141
 #: application/models/ParticipantShare.php:148
 #: application/models/ParticipantShare.php:256
-#: application/models/Survey.php:518 application/models/Survey.php:817
-#: application/models/Survey.php:823
+#: application/models/Survey.php:516 application/models/Survey.php:815
+#: application/models/Survey.php:821
 #: application/views/admin/conditions/deleteAllConditions.php:15
 #: application/views/admin/dataentry/content_view.php:628
 #: application/views/admin/dataentry/content_view.php:696
@@ -1661,8 +1661,8 @@ msgstr ""
 #: application/models/ParticipantShare.php:141
 #: application/models/ParticipantShare.php:148
 #: application/models/ParticipantShare.php:256
-#: application/models/Survey.php:522 application/models/Survey.php:817
-#: application/models/Survey.php:823
+#: application/models/Survey.php:520 application/models/Survey.php:815
+#: application/models/Survey.php:821
 #: application/views/admin/dataentry/content_view.php:629
 #: application/views/admin/dataentry/content_view.php:698
 #: application/views/admin/dataentry/vvimport.php:40
@@ -1991,15 +1991,15 @@ msgstr ""
 msgid "Survey text elements successfully saved."
 msgstr ""
 
-#: application/controllers/admin/database.php:1248
+#: application/controllers/admin/database.php:1244
 msgid "Survey settings were successfully saved."
 msgstr ""
 
-#: application/controllers/admin/database.php:1252
+#: application/controllers/admin/database.php:1248
 msgid "Survey could not be updated."
 msgstr ""
 
-#: application/controllers/admin/database.php:1282
+#: application/controllers/admin/database.php:1278
 msgid "Survey language could not be created."
 msgstr ""
 
@@ -2021,6 +2021,7 @@ msgid "This survey is not active. You must activate the survey before attempting
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:159
+#: application/views/admin/dataentry/vvimport.php:3
 #: application/views/admin/dataentry/vvimport.php:131
 msgid "Import a VV response data file"
 msgstr ""
@@ -3072,7 +3073,7 @@ msgstr ""
 #: application/controllers/admin/surveyadmin.php:981
 #: application/core/Survey_Common_Action.php:671
 #: application/core/Survey_Common_Action.php:976
-#: application/models/Survey.php:763
+#: application/models/Survey.php:761
 msgid "Invalid survey ID"
 msgstr ""
 
@@ -4233,7 +4234,7 @@ msgid "having a token"
 msgstr ""
 
 #: application/controllers/admin/tokens.php:1627
-#: application/views/admin/token/exportdialog.php:109
+#: application/views/admin/token/exportdialog.php:112
 msgid "Export tokens"
 msgstr ""
 
@@ -5210,7 +5211,7 @@ msgid "Not Selected"
 msgstr ""
 
 #: application/core/plugins/QuickMenu/QuickMenu.php:146
-#: application/helpers/update/updatedb_helper.php:1617
+#: application/helpers/update/updatedb_helper.php:1616
 msgid "An non-recoverable error happened during the update. Error details:"
 msgstr ""
 
@@ -5241,7 +5242,7 @@ msgid "List question groups"
 msgstr ""
 
 #: application/core/plugins/QuickMenu/QuickMenu.php:262
-#: application/models/Survey.php:1055
+#: application/models/Survey.php:1053
 #: application/views/admin/survey/surveybar_view.php:166
 msgid "General settings & texts"
 msgstr ""
@@ -5281,7 +5282,7 @@ msgstr ""
 #: application/helpers/questionHelper.php:387
 #: application/helpers/questionHelper.php:744
 #: application/helpers/userstatistics_helper.php:2925
-#: application/models/Permission.php:84 application/models/Survey.php:1060
+#: application/models/Permission.php:84 application/models/Survey.php:1058
 #: application/views/admin/export/statistics_subviews/_statistics_header.php:3
 #: application/views/admin/export/statistics_user_view.php:17
 #: application/views/admin/export/statistics_view.php:14
@@ -5452,7 +5453,7 @@ msgstr ""
 #: application/views/admin/token/csvupload.php:74
 #: application/views/admin/token/csvupload.php:89
 #: application/views/admin/token/csvupload.php:104
-#: application/views/admin/token/exportdialog.php:100
+#: application/views/admin/token/exportdialog.php:102
 #: application/views/admin/token/invite.php:116
 #: application/views/admin/token/invite.php:130
 #: application/views/admin/token/managetokenattributes.php:65
@@ -5553,7 +5554,7 @@ msgstr ""
 #: application/views/admin/token/csvupload.php:75
 #: application/views/admin/token/csvupload.php:90
 #: application/views/admin/token/csvupload.php:105
-#: application/views/admin/token/exportdialog.php:101
+#: application/views/admin/token/exportdialog.php:103
 #: application/views/admin/token/invite.php:117
 #: application/views/admin/token/invite.php:131
 #: application/views/admin/token/managetokenattributes.php:66
@@ -5973,7 +5974,7 @@ msgstr ""
 
 #: application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php:40
 #: application/helpers/common_helper.php:284 application/models/Quota.php:114
-#: application/models/Survey.php:929
+#: application/models/Survey.php:927
 msgid "Active"
 msgstr ""
 
@@ -5982,7 +5983,7 @@ msgid "Active and running"
 msgstr ""
 
 #: application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php:42
-#: application/helpers/common_helper.php:294 application/models/Survey.php:889
+#: application/helpers/common_helper.php:294 application/models/Survey.php:887
 msgid "Inactive"
 msgstr ""
 
@@ -6293,44 +6294,44 @@ msgstr ""
 msgid "This is not a valid timings data XML file."
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2250
+#: application/helpers/admin/import_helper.php:2243
 msgid "Failed to insert survey language"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2307
+#: application/helpers/admin/import_helper.php:2300
 msgid "Failed to insert group"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2307
-#: application/helpers/admin/import_helper.php:2355
-#: application/helpers/admin/import_helper.php:2405
-#: application/helpers/admin/import_helper.php:2423
-#: application/helpers/admin/import_helper.php:2450
-#: application/helpers/admin/import_helper.php:2489
-#: application/helpers/admin/import_helper.php:2511
-#: application/helpers/admin/import_helper.php:2529
+#: application/helpers/admin/import_helper.php:2300
+#: application/helpers/admin/import_helper.php:2348
+#: application/helpers/admin/import_helper.php:2398
+#: application/helpers/admin/import_helper.php:2416
+#: application/helpers/admin/import_helper.php:2443
+#: application/helpers/admin/import_helper.php:2482
+#: application/helpers/admin/import_helper.php:2504
+#: application/helpers/admin/import_helper.php:2522
 msgid "Text file row number "
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2355
+#: application/helpers/admin/import_helper.php:2348
 msgid "Could not insert question"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2405
+#: application/helpers/admin/import_helper.php:2398
 msgid "Failed to insert question attribute"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2423
-#: application/helpers/admin/import_helper.php:2450
-#: application/helpers/admin/import_helper.php:2511
+#: application/helpers/admin/import_helper.php:2416
+#: application/helpers/admin/import_helper.php:2443
+#: application/helpers/admin/import_helper.php:2504
 msgid "Failed to insert default value"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2489
+#: application/helpers/admin/import_helper.php:2482
 msgid "Could not insert subquestion"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:2529
+#: application/helpers/admin/import_helper.php:2522
 msgid "Could not insert answer"
 msgstr ""
 
@@ -10298,23 +10299,23 @@ msgstr ""
 msgid "Moving user templates to new location at %s..."
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:1631
+#: application/helpers/update/updatedb_helper.php:1630
 msgid "Database update"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:1632
+#: application/helpers/update/updatedb_helper.php:1631
 msgid "The database has been updated from version %s to version %s."
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:2961
+#: application/helpers/update/updatedb_helper.php:2960
 msgid "Some user templates can not be updated, please add the placeholder {TEMPLATEJS} in your startpage.pstpl manually."
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:2963
+#: application/helpers/update/updatedb_helper.php:2962
 msgid "Template(s) to be verified :"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:2969
+#: application/helpers/update/updatedb_helper.php:2968
 msgid "All %s user templates updated."
 msgstr ""
 
@@ -11004,23 +11005,23 @@ msgstr ""
 msgid "URL Description:"
 msgstr ""
 
-#: application/models/Survey.php:128
+#: application/models/Survey.php:126
 msgid "running"
 msgstr ""
 
-#: application/models/Survey.php:911
+#: application/models/Survey.php:909
 msgid "End: %s"
 msgstr ""
 
-#: application/models/Survey.php:912
+#: application/models/Survey.php:910
 msgid "Expired: %s"
 msgstr ""
 
-#: application/models/Survey.php:913
+#: application/models/Survey.php:911
 msgid "Start: %s"
 msgstr ""
 
-#: application/models/Survey.php:1070
+#: application/models/Survey.php:1068
 #: application/views/admin/survey/surveySummary_view.php:124
 #: application/views/admin/survey/surveySummary_view.php:170
 #: application/views/admin/survey/surveySummary_view.php:192
@@ -11030,7 +11031,7 @@ msgstr ""
 msgid "Add new question"
 msgstr ""
 
-#: application/models/Survey.php:1074
+#: application/models/Survey.php:1072
 #: application/views/admin/survey/surveySummary_view.php:103
 #: application/views/admin/survey/surveySummary_view.php:148
 #: application/views/admin/survey/surveybar_view.php:25
@@ -11915,11 +11916,6 @@ msgstr ""
 msgid "Reset answers and token completed state"
 msgstr ""
 
-#: application/views/admin/dataentry/vvimport.php:3
-#: application/views/admin/responses/browsemenubar_view.php:121
-msgid "Import a VV survey file"
-msgstr ""
-
 #: application/views/admin/dataentry/vvimport.php:17
 #: application/views/admin/export/exportresults_view.php:105
 #: application/views/admin/globalSettings_view.php:13
@@ -11929,9 +11925,7 @@ msgid "General"
 msgstr ""
 
 #: application/views/admin/dataentry/vvimport.php:24
-#: application/views/admin/templates/importuploaded_view.php:60
-#: application/views/admin/templates/importuploaded_view.php:77
-msgid "File:"
+msgid "Response data file (*.csv,*.vv,*.txt) (maximum size: %d MB):"
 msgstr ""
 
 #: application/views/admin/dataentry/vvimport.php:33
@@ -14442,6 +14436,10 @@ msgstr ""
 msgid "Export results to a SPSS/PASW command file"
 msgstr ""
 
+#: application/views/admin/responses/browsemenubar_view.php:121
+msgid "Import a VV survey file"
+msgstr ""
+
 #: application/views/admin/responses/browsemenubar_view.php:133
 msgid "View Saved but not submitted Responses"
 msgstr ""
@@ -16748,6 +16746,11 @@ msgstr ""
 msgid "Folder:"
 msgstr ""
 
+#: application/views/admin/templates/importuploaded_view.php:60
+#: application/views/admin/templates/importuploaded_view.php:77
+msgid "File:"
+msgstr ""
+
 #: application/views/admin/templates/importuploaded_view.php:71
 msgid "Skipped files:"
 msgstr ""
@@ -17241,11 +17244,11 @@ msgstr ""
 msgid "Only export entries which contain this string in email address."
 msgstr ""
 
-#: application/views/admin/token/exportdialog.php:93
+#: application/views/admin/token/exportdialog.php:95
 msgid "Delete exported participants:"
 msgstr ""
 
-#: application/views/admin/token/exportdialog.php:105
+#: application/views/admin/token/exportdialog.php:107
 msgid "Warning: Deleted participants entries cannot be recovered."
 msgstr ""