diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot index 04ff23bcb28..9f7560f90f4 100644 --- a/locale/_template/limesurvey.pot +++ b/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-09-24 22:05:49+00:00\n" +"POT-Creation-Date: 2012-09-25 22:05:52+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -102,7 +102,7 @@ msgstr "" #: application/controllers/AdminController.php:86 #: application/controllers/admin/surveyadmin.php:463 -#: application/controllers/admin/tokens.php:2193 +#: application/controllers/admin/tokens.php:2197 #: application/helpers/admin/import_helper.php:2612 #: application/views/admin/authentication/forgotpassword.php:15 #: application/views/admin/dataentry/active_html_view.php:95 @@ -128,7 +128,7 @@ msgstr "" msgid "Version" msgstr "" -#: application/controllers/AdminController.php:408 +#: application/controllers/AdminController.php:407 #: application/controllers/admin/authentication.php:331 msgid "Warning: You are still using the default password ('password'). Please change your password and re-login again." msgstr "" @@ -242,7 +242,7 @@ msgid "Please continue with populating the database." msgstr "" #: application/controllers/InstallerController.php:554 -#: application/controllers/InstallerController.php:1171 +#: application/controllers/InstallerController.php:1178 msgid "Try again! Connection with database failed. Reason: " msgstr "" @@ -843,7 +843,7 @@ msgstr "" #: application/controllers/admin/printablesurvey.php:1188 #: application/controllers/admin/quotas.php:526 #: application/controllers/admin/surveyadmin.php:651 -#: application/controllers/admin/tokens.php:2110 +#: application/controllers/admin/tokens.php:2114 #: application/core/Survey_Common_Action.php:816 #: application/helpers/admin/statistics_helper.php:1455 #: application/helpers/admin/statistics_helper.php:1588 @@ -947,7 +947,7 @@ msgid "Yes" msgstr "" #: application/controllers/admin/conditionsaction.php:150 -#: application/controllers/admin/tokens.php:2173 +#: application/controllers/admin/tokens.php:2177 #: application/views/admin/assessments_view.php:122 #: application/views/admin/conditions/includes/conditions_scenario.php:13 #: application/views/admin/labels/labelview_view.php:161 @@ -981,7 +981,7 @@ msgid "Continue?" msgstr "" #: application/controllers/admin/conditionsaction.php:160 -#: application/controllers/admin/tokens.php:1467 +#: application/controllers/admin/tokens.php:1471 #: application/controllers/admin/useraction.php:157 #: application/helpers/admin/import_helper.php:4492 #: application/helpers/admin/import_helper.php:4510 @@ -1059,7 +1059,7 @@ msgstr "" #: application/controllers/admin/printablesurvey.php:1188 #: application/controllers/admin/quotas.php:527 #: application/controllers/admin/surveyadmin.php:655 -#: application/controllers/admin/tokens.php:2112 +#: application/controllers/admin/tokens.php:2116 #: application/core/Survey_Common_Action.php:812 #: application/helpers/admin/statistics_helper.php:1456 #: application/helpers/admin/statistics_helper.php:1589 @@ -1750,8 +1750,8 @@ msgid "Save" msgstr "" #: application/controllers/admin/dataentry.php:1587 -#: application/controllers/admin/tokens.php:874 -#: application/controllers/admin/tokens.php:1045 +#: application/controllers/admin/tokens.php:878 +#: application/controllers/admin/tokens.php:1049 #: application/controllers/admin/useraction.php:149 #: application/views/admin/dataentry/insert.php:73 #: application/views/admin/dataentry/iteratesurvey.php:5 @@ -1895,223 +1895,223 @@ msgid "The answer(s) must meet these array_filter criteria:" msgstr "" #: application/controllers/admin/dataentry.php:2495 -#: application/controllers/admin/tokens.php:1802 +#: application/controllers/admin/tokens.php:1806 #: application/views/admin/participants/importCSV_view.php:17 msgid "ARMSCII-8 Armenian" msgstr "" #: application/controllers/admin/dataentry.php:2496 -#: application/controllers/admin/tokens.php:1803 +#: application/controllers/admin/tokens.php:1807 #: application/views/admin/participants/importCSV_view.php:18 msgid "US ASCII" msgstr "" #: application/controllers/admin/dataentry.php:2497 -#: application/controllers/admin/tokens.php:1804 +#: application/controllers/admin/tokens.php:1808 #: application/views/admin/participants/importCSV_view.php:19 msgid "Automatic" msgstr "" #: application/controllers/admin/dataentry.php:2498 -#: application/controllers/admin/tokens.php:1805 +#: application/controllers/admin/tokens.php:1809 #: application/views/admin/participants/importCSV_view.php:20 msgid "Big5 Traditional Chinese" msgstr "" #: application/controllers/admin/dataentry.php:2499 -#: application/controllers/admin/tokens.php:1806 +#: application/controllers/admin/tokens.php:1810 #: application/views/admin/participants/importCSV_view.php:21 msgid "Binary pseudo charset" msgstr "" #: application/controllers/admin/dataentry.php:2500 -#: application/controllers/admin/tokens.php:1807 +#: application/controllers/admin/tokens.php:1811 #: application/views/admin/participants/importCSV_view.php:22 msgid "Windows Central European" msgstr "" #: application/controllers/admin/dataentry.php:2501 -#: application/controllers/admin/tokens.php:1808 +#: application/controllers/admin/tokens.php:1812 #: application/views/admin/participants/importCSV_view.php:23 msgid "Windows Cyrillic" msgstr "" #: application/controllers/admin/dataentry.php:2502 -#: application/controllers/admin/tokens.php:1809 +#: application/controllers/admin/tokens.php:1813 #: application/views/admin/participants/importCSV_view.php:24 msgid "Windows Arabic" msgstr "" #: application/controllers/admin/dataentry.php:2503 -#: application/controllers/admin/tokens.php:1810 +#: application/controllers/admin/tokens.php:1814 #: application/views/admin/participants/importCSV_view.php:25 msgid "Windows Baltic" msgstr "" #: application/controllers/admin/dataentry.php:2504 -#: application/controllers/admin/tokens.php:1811 +#: application/controllers/admin/tokens.php:1815 #: application/views/admin/participants/importCSV_view.php:26 msgid "DOS West European" msgstr "" #: application/controllers/admin/dataentry.php:2505 -#: application/controllers/admin/tokens.php:1812 +#: application/controllers/admin/tokens.php:1816 #: application/views/admin/participants/importCSV_view.php:27 msgid "DOS Central European" msgstr "" #: application/controllers/admin/dataentry.php:2506 -#: application/controllers/admin/tokens.php:1813 +#: application/controllers/admin/tokens.php:1817 #: application/views/admin/participants/importCSV_view.php:28 msgid "DOS Russian" msgstr "" #: application/controllers/admin/dataentry.php:2507 -#: application/controllers/admin/tokens.php:1814 +#: application/controllers/admin/tokens.php:1818 #: application/views/admin/participants/importCSV_view.php:29 msgid "SJIS for Windows Japanese" msgstr "" #: application/controllers/admin/dataentry.php:2508 -#: application/controllers/admin/tokens.php:1815 +#: application/controllers/admin/tokens.php:1819 #: application/views/admin/participants/importCSV_view.php:30 msgid "DEC West European" msgstr "" #: application/controllers/admin/dataentry.php:2509 -#: application/controllers/admin/tokens.php:1816 +#: application/controllers/admin/tokens.php:1820 #: application/views/admin/participants/importCSV_view.php:31 msgid "UJIS for Windows Japanese" msgstr "" #: application/controllers/admin/dataentry.php:2510 -#: application/controllers/admin/tokens.php:1817 +#: application/controllers/admin/tokens.php:1821 #: application/views/admin/participants/importCSV_view.php:32 msgid "EUC-KR Korean" msgstr "" #: application/controllers/admin/dataentry.php:2511 -#: application/controllers/admin/tokens.php:1818 +#: application/controllers/admin/tokens.php:1822 #: application/views/admin/participants/importCSV_view.php:33 msgid "GB2312 Simplified Chinese" msgstr "" #: application/controllers/admin/dataentry.php:2512 -#: application/controllers/admin/tokens.php:1819 +#: application/controllers/admin/tokens.php:1823 #: application/views/admin/participants/importCSV_view.php:34 msgid "GBK Simplified Chinese" msgstr "" #: application/controllers/admin/dataentry.php:2513 -#: application/controllers/admin/tokens.php:1820 +#: application/controllers/admin/tokens.php:1824 #: application/views/admin/participants/importCSV_view.php:35 msgid "GEOSTD8 Georgian" msgstr "" #: application/controllers/admin/dataentry.php:2514 -#: application/controllers/admin/tokens.php:1821 +#: application/controllers/admin/tokens.php:1825 #: application/views/admin/participants/importCSV_view.php:36 msgid "ISO 8859-7 Greek" msgstr "" #: application/controllers/admin/dataentry.php:2515 -#: application/controllers/admin/tokens.php:1822 +#: application/controllers/admin/tokens.php:1826 #: application/views/admin/participants/importCSV_view.php:37 msgid "ISO 8859-8 Hebrew" msgstr "" #: application/controllers/admin/dataentry.php:2516 -#: application/controllers/admin/tokens.php:1823 +#: application/controllers/admin/tokens.php:1827 #: application/views/admin/participants/importCSV_view.php:38 msgid "HP West European" msgstr "" #: application/controllers/admin/dataentry.php:2517 -#: application/controllers/admin/tokens.php:1824 +#: application/controllers/admin/tokens.php:1828 #: application/views/admin/participants/importCSV_view.php:39 msgid "DOS Kamenicky Czech-Slovak" msgstr "" #: application/controllers/admin/dataentry.php:2518 -#: application/controllers/admin/tokens.php:1825 +#: application/controllers/admin/tokens.php:1829 #: application/views/admin/participants/importCSV_view.php:40 msgid "KOI8-R Relcom Russian" msgstr "" #: application/controllers/admin/dataentry.php:2519 -#: application/controllers/admin/tokens.php:1826 +#: application/controllers/admin/tokens.php:1830 #: application/views/admin/participants/importCSV_view.php:41 msgid "KOI8-U Ukrainian" msgstr "" #: application/controllers/admin/dataentry.php:2520 -#: application/controllers/admin/tokens.php:1827 +#: application/controllers/admin/tokens.php:1831 #: application/views/admin/participants/importCSV_view.php:42 msgid "cp1252 West European" msgstr "" #: application/controllers/admin/dataentry.php:2521 -#: application/controllers/admin/tokens.php:1828 +#: application/controllers/admin/tokens.php:1832 #: application/views/admin/participants/importCSV_view.php:43 msgid "ISO 8859-2 Central European" msgstr "" #: application/controllers/admin/dataentry.php:2522 -#: application/controllers/admin/tokens.php:1829 +#: application/controllers/admin/tokens.php:1833 #: application/views/admin/participants/importCSV_view.php:44 msgid "ISO 8859-9 Turkish" msgstr "" #: application/controllers/admin/dataentry.php:2523 -#: application/controllers/admin/tokens.php:1830 +#: application/controllers/admin/tokens.php:1834 #: application/views/admin/participants/importCSV_view.php:45 msgid "ISO 8859-13 Baltic" msgstr "" #: application/controllers/admin/dataentry.php:2524 -#: application/controllers/admin/tokens.php:1831 +#: application/controllers/admin/tokens.php:1835 #: application/views/admin/participants/importCSV_view.php:46 msgid "Mac Central European" msgstr "" #: application/controllers/admin/dataentry.php:2525 -#: application/controllers/admin/tokens.php:1832 +#: application/controllers/admin/tokens.php:1836 #: application/views/admin/participants/importCSV_view.php:47 msgid "Mac West European" msgstr "" #: application/controllers/admin/dataentry.php:2526 -#: application/controllers/admin/tokens.php:1833 +#: application/controllers/admin/tokens.php:1837 #: application/views/admin/participants/importCSV_view.php:48 msgid "Shift-JIS Japanese" msgstr "" #: application/controllers/admin/dataentry.php:2527 -#: application/controllers/admin/tokens.php:1834 +#: application/controllers/admin/tokens.php:1838 #: application/views/admin/participants/importCSV_view.php:49 msgid "7bit Swedish" msgstr "" #: application/controllers/admin/dataentry.php:2528 -#: application/controllers/admin/tokens.php:1835 +#: application/controllers/admin/tokens.php:1839 #: application/views/admin/participants/importCSV_view.php:50 msgid "TIS620 Thai" msgstr "" #: application/controllers/admin/dataentry.php:2529 -#: application/controllers/admin/tokens.php:1836 +#: application/controllers/admin/tokens.php:1840 #: application/views/admin/participants/importCSV_view.php:51 msgid "UCS-2 Unicode" msgstr "" #: application/controllers/admin/dataentry.php:2530 -#: application/controllers/admin/tokens.php:1837 +#: application/controllers/admin/tokens.php:1841 #: application/views/admin/participants/importCSV_view.php:52 msgid "EUC-JP Japanese" msgstr "" #: application/controllers/admin/dataentry.php:2531 -#: application/controllers/admin/tokens.php:1838 +#: application/controllers/admin/tokens.php:1842 #: application/views/admin/participants/importCSV_view.php:53 msgid "UTF-8 Unicode" msgstr "" @@ -2150,7 +2150,7 @@ msgstr "" msgid "This archive contains a PDF file of the survey, the queXML file of the survey and a queXF banding XML file which can be used with queXF: http://quexf.sourceforge.net/ for processing scanned surveys." msgstr "" -#: application/controllers/admin/globalsettings.php:173 +#: application/controllers/admin/globalsettings.php:175 msgid "Global settings were saved." msgstr "" @@ -2973,8 +2973,8 @@ msgid "Delete" msgstr "" #: application/controllers/admin/surveypermission.php:109 -#: application/controllers/admin/tokens.php:424 -#: application/controllers/admin/tokens.php:501 +#: application/controllers/admin/tokens.php:428 +#: application/controllers/admin/tokens.php:505 #: application/views/admin/assessments_view.php:32 #: application/views/admin/responses/browseidheader_view.php:14 #: application/views/admin/saved/savedlist_view.php:29 @@ -3035,8 +3035,8 @@ msgstr "" #: application/controllers/admin/surveypermission.php:329 #: application/controllers/admin/surveypermission.php:502 #: application/controllers/admin/surveypermission.php:595 -#: application/controllers/admin/tokens.php:2324 -#: application/controllers/admin/tokens.php:2359 +#: application/controllers/admin/tokens.php:2329 +#: application/controllers/admin/tokens.php:2364 #: application/controllers/admin/useraction.php:720 #: application/helpers/common_helper.php:6354 #: application/helpers/common_helper.php:6359 @@ -3401,236 +3401,236 @@ msgstr "" msgid "Bounce processing is deactivated either application-wide or for this survey in particular." msgstr "" -#: application/controllers/admin/tokens.php:411 -#: application/controllers/admin/tokens.php:492 +#: application/controllers/admin/tokens.php:415 +#: application/controllers/admin/tokens.php:496 msgid "Do survey" msgstr "" -#: application/controllers/admin/tokens.php:417 -#: application/controllers/admin/tokens.php:496 +#: application/controllers/admin/tokens.php:421 +#: application/controllers/admin/tokens.php:500 #: application/views/admin/responses/browseallrow_view.php:4 #: application/views/admin/responses/browsetimerow_view.php:4 msgid "View response details" msgstr "" -#: application/controllers/admin/tokens.php:424 -#: application/controllers/admin/tokens.php:501 +#: application/controllers/admin/tokens.php:428 +#: application/controllers/admin/tokens.php:505 msgid "Delete token entry" msgstr "" -#: application/controllers/admin/tokens.php:430 -#: application/controllers/admin/tokens.php:507 +#: application/controllers/admin/tokens.php:434 +#: application/controllers/admin/tokens.php:511 msgid "Send invitation email to this person (if they have not yet been sent an invitation email)" msgstr "" -#: application/controllers/admin/tokens.php:432 -#: application/controllers/admin/tokens.php:509 +#: application/controllers/admin/tokens.php:436 +#: application/controllers/admin/tokens.php:513 msgid "Send reminder email to this person (if they have already received the invitation email)" msgstr "" -#: application/controllers/admin/tokens.php:439 -#: application/controllers/admin/tokens.php:514 +#: application/controllers/admin/tokens.php:443 +#: application/controllers/admin/tokens.php:518 #: application/views/admin/token/tokenform.php:5 msgid "Edit token entry" msgstr "" -#: application/controllers/admin/tokens.php:441 -#: application/controllers/admin/tokens.php:516 +#: application/controllers/admin/tokens.php:445 +#: application/controllers/admin/tokens.php:520 msgid "View this person in the central participants database" msgstr "" -#: application/controllers/admin/tokens.php:619 -#: application/controllers/admin/tokens.php:650 -#: application/controllers/admin/tokens.php:759 -#: application/controllers/admin/tokens.php:864 -#: application/controllers/admin/tokens.php:992 +#: application/controllers/admin/tokens.php:623 +#: application/controllers/admin/tokens.php:654 +#: application/controllers/admin/tokens.php:763 +#: application/controllers/admin/tokens.php:868 +#: application/controllers/admin/tokens.php:996 msgid "%s cannot be empty" msgstr "" -#: application/controllers/admin/tokens.php:875 +#: application/controllers/admin/tokens.php:879 msgid "The token entry was successfully updated." msgstr "" -#: application/controllers/admin/tokens.php:876 -#: application/controllers/admin/tokens.php:1047 -#: application/controllers/admin/tokens.php:1058 +#: application/controllers/admin/tokens.php:880 +#: application/controllers/admin/tokens.php:1051 +#: application/controllers/admin/tokens.php:1062 #: application/views/admin/token/addtokenpost.php:7 #: application/views/admin/token/addtokenpost.php:14 #: application/views/admin/token/tokenbar.php:12 msgid "Display tokens" msgstr "" -#: application/controllers/admin/tokens.php:882 -#: application/controllers/admin/tokens.php:1054 +#: application/controllers/admin/tokens.php:886 +#: application/controllers/admin/tokens.php:1058 #: application/views/admin/token/addtokenpost.php:12 #: application/views/admin/token/ldappost.php:5 msgid "Failed" msgstr "" -#: application/controllers/admin/tokens.php:883 +#: application/controllers/admin/tokens.php:887 #: application/views/admin/token/addtokenpost.php:13 msgid "There is already an entry with that exact token in the table. The same token cannot be used in multiple entries." msgstr "" -#: application/controllers/admin/tokens.php:884 +#: application/controllers/admin/tokens.php:888 msgid "Show this token entry" msgstr "" -#: application/controllers/admin/tokens.php:1046 +#: application/controllers/admin/tokens.php:1050 msgid "New dummy tokens were added." msgstr "" -#: application/controllers/admin/tokens.php:1055 +#: application/controllers/admin/tokens.php:1059 msgid "Only %s new dummy tokens were added after %s trials." msgstr "" -#: application/controllers/admin/tokens.php:1056 +#: application/controllers/admin/tokens.php:1060 msgid "Try with a bigger token length." msgstr "" -#: application/controllers/admin/tokens.php:1159 +#: application/controllers/admin/tokens.php:1163 msgid "%s field(s) were successfully added." msgstr "" -#: application/controllers/admin/tokens.php:1208 +#: application/controllers/admin/tokens.php:1212 msgid "Token attribute descriptions were successfully updated." msgstr "" -#: application/controllers/admin/tokens.php:1209 +#: application/controllers/admin/tokens.php:1213 msgid "Back to attribute field management." msgstr "" -#: application/controllers/admin/tokens.php:1399 +#: application/controllers/admin/tokens.php:1403 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) delayed: Token is not yet valid." msgstr "" -#: application/controllers/admin/tokens.php:1403 +#: application/controllers/admin/tokens.php:1407 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) skipped: Token is not valid anymore." msgstr "" -#: application/controllers/admin/tokens.php:1413 +#: application/controllers/admin/tokens.php:1417 msgid "Invitation sent to:" msgstr "" -#: application/controllers/admin/tokens.php:1418 +#: application/controllers/admin/tokens.php:1422 msgid "Reminder sent to:" msgstr "" -#: application/controllers/admin/tokens.php:1436 +#: application/controllers/admin/tokens.php:1440 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) failed. Error Message:" msgstr "" -#: application/controllers/admin/tokens.php:1468 +#: application/controllers/admin/tokens.php:1472 msgid "There were no eligible emails to send. This will be because none satisfied the criteria of:" msgstr "" -#: application/controllers/admin/tokens.php:1469 +#: application/controllers/admin/tokens.php:1473 msgid "having a valid email address" msgstr "" -#: application/controllers/admin/tokens.php:1470 +#: application/controllers/admin/tokens.php:1474 msgid "not having been sent an invitation already" msgstr "" -#: application/controllers/admin/tokens.php:1471 +#: application/controllers/admin/tokens.php:1475 msgid "having already completed the survey" msgstr "" -#: application/controllers/admin/tokens.php:1472 +#: application/controllers/admin/tokens.php:1476 msgid "having a token" msgstr "" -#: application/controllers/admin/tokens.php:1554 +#: application/controllers/admin/tokens.php:1558 msgid "Uploading LDAP Query" msgstr "" -#: application/controllers/admin/tokens.php:1767 +#: application/controllers/admin/tokens.php:1771 msgid "Can't bind to the LDAP directory" msgstr "" -#: application/controllers/admin/tokens.php:1774 +#: application/controllers/admin/tokens.php:1778 msgid "Can't connect to the LDAP directory" msgstr "" -#: application/controllers/admin/tokens.php:2107 -#: application/controllers/admin/tokens.php:2134 +#: application/controllers/admin/tokens.php:2111 +#: application/controllers/admin/tokens.php:2138 msgid "Create tokens" msgstr "" -#: application/controllers/admin/tokens.php:2108 +#: application/controllers/admin/tokens.php:2112 msgid "Clicking 'Yes' will generate tokens for all those in this token list that have not been issued one. Continue?" msgstr "" -#: application/controllers/admin/tokens.php:2125 +#: application/controllers/admin/tokens.php:2129 msgid "Only %s token has been created." msgid_plural "Only %s tokens have been created." msgstr[0] "" msgstr[1] "" -#: application/controllers/admin/tokens.php:2126 +#: application/controllers/admin/tokens.php:2130 msgid "Need %s token." msgid_plural "Need %s tokens." msgstr[0] "" msgstr[1] "" -#: application/controllers/admin/tokens.php:2131 +#: application/controllers/admin/tokens.php:2135 msgid "%s token has been created." msgid_plural "%s tokens have been created." msgstr[0] "" msgstr[1] "" -#: application/controllers/admin/tokens.php:2167 -#: application/controllers/admin/tokens.php:2189 +#: application/controllers/admin/tokens.php:2171 +#: application/controllers/admin/tokens.php:2193 msgid "Delete Tokens Table" msgstr "" -#: application/controllers/admin/tokens.php:2168 +#: application/controllers/admin/tokens.php:2172 msgid "If you delete this table tokens will no longer be required to access this survey." msgstr "" -#: application/controllers/admin/tokens.php:2168 +#: application/controllers/admin/tokens.php:2172 msgid "A backup of this table will be made if you proceed. Your system administrator will be able to access this table." msgstr "" -#: application/controllers/admin/tokens.php:2171 +#: application/controllers/admin/tokens.php:2175 msgid "Delete Tokens" msgstr "" -#: application/controllers/admin/tokens.php:2190 +#: application/controllers/admin/tokens.php:2194 msgid "The tokens table has now been removed and tokens are no longer required to access this survey." msgstr "" -#: application/controllers/admin/tokens.php:2190 +#: application/controllers/admin/tokens.php:2194 msgid "A backup of this table has been made and can be accessed by your system administrator." msgstr "" -#: application/controllers/admin/tokens.php:2235 +#: application/controllers/admin/tokens.php:2239 #: application/views/admin/globalSettings_view.php:10 #: application/views/admin/token/bounce.php:1 #: application/views/admin/token/tokenbar.php:78 msgid "Bounce settings" msgstr "" -#: application/controllers/admin/tokens.php:2236 +#: application/controllers/admin/tokens.php:2240 msgid "Bounce settings have been saved." msgstr "" -#: application/controllers/admin/tokens.php:2321 +#: application/controllers/admin/tokens.php:2326 #: application/views/admin/export/exportresults_view.php:115 #: application/views/admin/token/tokenbar.php:3 #: application/views/admin/token/tokenwarning.php:3 msgid "Token control" msgstr "" -#: application/controllers/admin/tokens.php:2322 +#: application/controllers/admin/tokens.php:2327 msgid "A token table has been created for this survey." msgstr "" -#: application/controllers/admin/tokens.php:2356 +#: application/controllers/admin/tokens.php:2361 msgid "Import old tokens" msgstr "" -#: application/controllers/admin/tokens.php:2357 +#: application/controllers/admin/tokens.php:2362 msgid "A token table has been created for this survey and the old tokens were imported." msgstr "" @@ -3771,7 +3771,7 @@ msgstr "" msgid "Question code / ID" msgstr "" -#: application/controllers/admin/update.php:364 +#: application/controllers/admin/update.php:374 msgid "File deleted: %s" msgstr "" @@ -4229,7 +4229,7 @@ msgid "One or more uploaded files are not in proper format/size. You cannot proc msgstr "" #: application/helpers/SurveyRuntimeHelper.php:1048 -#: application/helpers/frontend_helper.php:2760 +#: application/helpers/frontend_helper.php:2761 msgid "This survey is currently not active. You will not be able to save your responses." msgstr "" @@ -4401,7 +4401,7 @@ msgstr "" #: application/helpers/admin/import_helper.php:4574 #: application/helpers/admin/import_helper.php:4596 #: application/helpers/admin/import_helper.php:4614 -msgid "Excel row number " +msgid "Text file row number " msgstr "" #: application/helpers/admin/import_helper.php:4451 @@ -7101,7 +7101,7 @@ msgid "This survey does not yet have any questions and cannot be tested or compl msgstr "" #: application/helpers/frontend_helper.php:2203 -#: application/helpers/frontend_helper.php:2635 +#: application/helpers/frontend_helper.php:2636 #: application/views/admin/templates/templateeditor_navigator_view.php:5 #: application/views/installer/dbconfig_view.php:87 #: application/views/installer/dbsettings_view.php:29 @@ -12765,7 +12765,7 @@ msgid "queXML format (*.xml)" msgstr "" #: application/views/admin/survey/surveybar_view.php:163 -msgid "Excel format (*.txt)" +msgid "Tab-separated-values format (*.txt)" msgstr "" #: application/views/admin/survey/surveybar_view.php:171 @@ -13591,22 +13591,22 @@ msgid "Auto Translate" msgstr "" #: application/views/admin/update/step2.php:3 -#: application/views/admin/update/step3.php:3 +#: application/views/admin/update/step3.php:1 #: application/views/admin/update/step4.php:3 msgid "ComfortUpdate step %s" msgstr "" #: application/views/admin/update/step2.php:10 #: application/views/admin/update/step2.php:18 -#: application/views/admin/update/step3.php:8 -#: application/views/admin/update/step3.php:15 +#: application/views/admin/update/step3.php:6 +#: application/views/admin/update/step3.php:13 #: application/views/admin/update/step4.php:7 #: application/views/admin/update/step4.php:13 msgid "On requesting the update information from limesurvey.org there has been an error:" msgstr "" #: application/views/admin/update/step2.php:15 -#: application/views/admin/update/step3.php:12 +#: application/views/admin/update/step3.php:10 #: application/views/admin/update/step4.php:10 msgid "Your update key is invalid and was removed. " msgstr "" @@ -13653,40 +13653,40 @@ msgid "Please check any problems above and then proceed to the next step." msgstr "" #: application/views/admin/update/step2.php:79 -#: application/views/admin/update/step3.php:35 +#: application/views/admin/update/step3.php:33 #: application/views/admin/update/update.php:49 msgid "Proceed to step %s" msgstr "" -#: application/views/admin/update/step3.php:4 +#: application/views/admin/update/step3.php:2 msgid "Creating DB & file backup" msgstr "" -#: application/views/admin/update/step3.php:19 +#: application/views/admin/update/step3.php:17 msgid "Creating file backup... " msgstr "" -#: application/views/admin/update/step3.php:21 +#: application/views/admin/update/step3.php:19 msgid "File backup created:" msgstr "" -#: application/views/admin/update/step3.php:25 +#: application/views/admin/update/step3.php:23 msgid "Creating database backup... " msgstr "" -#: application/views/admin/update/step3.php:26 +#: application/views/admin/update/step3.php:24 msgid "DB backup created:" msgstr "" -#: application/views/admin/update/step3.php:30 +#: application/views/admin/update/step3.php:28 msgid "No DB backup created:" msgstr "" -#: application/views/admin/update/step3.php:30 +#: application/views/admin/update/step3.php:28 msgid "Database backup functionality is currently not available for your database type. Before proceeding please backup your database using a backup tool!" msgstr "" -#: application/views/admin/update/step3.php:33 +#: application/views/admin/update/step3.php:31 msgid "Please check any problems above and then proceed to the final step." msgstr "" @@ -13739,7 +13739,7 @@ msgid "Checking basic requirements..." msgstr "" #: application/views/admin/update/update.php:11 -msgid "You need an update key to run the comfort update. During the beta test of this update feature the key \"LIMESURVEYUPDATE\" can be used." +msgid "You need an update key to run the ComfortUpdate. During the beta test of this update feature the key \"LIMESURVEYUPDATE\" can be used." msgstr "" #: application/views/admin/update/update.php:12 diff --git a/locale/et/LC_MESSAGES/et.mo b/locale/et/LC_MESSAGES/et.mo index 319a970ed0f..0db85b62f12 100644 Binary files a/locale/et/LC_MESSAGES/et.mo and b/locale/et/LC_MESSAGES/et.mo differ diff --git a/locale/it-informal/LC_MESSAGES/it-informal.mo b/locale/it-informal/LC_MESSAGES/it-informal.mo index bf216bcf67b..54e07e2004c 100644 Binary files a/locale/it-informal/LC_MESSAGES/it-informal.mo and b/locale/it-informal/LC_MESSAGES/it-informal.mo differ diff --git a/locale/sr/LC_MESSAGES/sr.mo b/locale/sr/LC_MESSAGES/sr.mo index 6cd256943e4..3c35e8a9bdc 100644 Binary files a/locale/sr/LC_MESSAGES/sr.mo and b/locale/sr/LC_MESSAGES/sr.mo differ