diff --git a/application/tests/staticCalls.php b/application/tests/staticCalls.php
new file mode 100644
index 00000000000..c3dd1a9b302
--- /dev/null
+++ b/application/tests/staticCalls.php
@@ -0,0 +1,152 @@
+<?php
+
+$dir = realpath(dirname(__FILE__) . "/..");
+
+
+$dir = new RecursiveDirectoryIterator($dir);
+
+
+iterateList($dir);
+
+function ignore($entry)
+{
+  // Check if directory is ignored.
+  if (substr($entry, -9, 9) == 'libraries') return true;
+}
+
+function iterateList(Iterator $i)
+{
+    foreach ($i as $entry)
+    {
+
+        if ($i->hasChildren() && !ignore($entry))
+        {
+            iterateList($i->getChildren());
+        }
+        else
+        {
+            if (substr($entry, -4, 4) == '.php')
+            {
+                checkFile($entry);
+            }
+        }
+    }
+}
+
+// Get all static calls in file.
+function checkFile($filename)
+{
+    if ($filename == __FILE__)
+    {
+        return;
+    }
+    $file = file($filename, FILE_IGNORE_NEW_LINES);
+    $file = array_filter($file, "checkStatic");
+    
+    if (!empty($file))
+    {
+        pr($filename);
+        print_r($file);
+    } 
+}  
+
+function checkStatic($line)
+{
+    $validStatics = array(
+        'Yii::',
+        'parent::',
+        'LimeExpressionManager::',
+'Answers::',
+'Questions::',
+'Survey::',
+'Groups::',
+'self::',
+'PDO::',
+'Participants::',
+'Survey_links::',
+'Participant_attribute::',
+'Tokens::',
+'User_groups::',
+'Tokens_dynamic::',
+'Conditions::',
+'Survey_Common_Action::',
+'Quota::',
+'Survey_url_parameters::',
+'Survey_languagesettings::',
+'Survey_permissions::',
+'Saved_control::',
+'Quota_members::',
+'Quota_languagesettings::',
+'ParticipantAttributeNames::',
+'User::',
+'Surveys_languagesettings::',
+'Question_attributes::',
+'Assessment::',
+'CDbConnection::',
+'ParticipantShares::',
+'\'{INSERTANS::',
+'Defaultvalues::',
+'CHtml::',
+'ExpressionManager::',
+'\'::\'',
+'Labelsets::',
+'Survey_dynamic::',
+'PEAR::',
+'Settings_global::',
+'Zend_Http_Client::',
+'Zend_XmlRpc_Value::',
+'Templates_rights_model::',
+'Zend_XmlRpc_Server_Fault::',
+'Zend_XmlRpc_Value::',
+'Zend_Server_Cache::',
+'Zend_XmlRpc_Server_Cache::',
+'Label::',
+'Assessments::',
+'XMLReader::',
+'LEM::',
+'Question::',
+'DateTime::',
+'Installer::',
+'Sessions::',
+'dataentry::',
+'Assessments::',
+'Zend_Server_Reflection::',
+'Participants::',
+'jsonRPCServer::',
+'Failed_login_attempts::',
+'survey::',
+'tokens::',
+'questiongroup::',
+'printanswers::',
+'imagick::',
+':: ',
+'Assessments::',
+'InstallerConfigForm::',
+'Database::',
+'User_in_groups::',
+'Usergroups::',
+'Survey_timings::',
+'::regClass',
+'surveypermission::',
+'Template::',
+'templates::',
+'Templates_rights::',
+'register::',
+'::first',
+'::before',
+'::after',
+'::reg',
+'text::',
+'httpCache::'
+    );
+    $replacements = array_pad(array(), count($validStatics), '');
+    $line = str_replace($validStatics, $replacements, $line);
+   
+    return strpos($line, '::') !== false;
+    
+}
+function pr($msg)
+{
+    echo $msg . "\n";
+}
+?>
diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
index 226c9ddd77d..9a16a86435d 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-07-29 22:05:45+00:00\n"
+"POT-Creation-Date: 2012-07-30 22:05:44+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 
 #: application/controllers/AdminController.php:86
 #: application/controllers/admin/surveyadmin.php:420
-#: application/controllers/admin/tokens.php:2164
+#: application/controllers/admin/tokens.php:2184
 #: application/helpers/admin/import_helper.php:2612
 #: application/views/admin/authentication/forgotpassword.php:15
 #: application/views/admin/dataentry/active_html_view.php:95
@@ -844,7 +844,7 @@ msgstr ""
 #: application/controllers/admin/printablesurvey.php:1188
 #: application/controllers/admin/quotas.php:517
 #: application/controllers/admin/surveyadmin.php:608
-#: application/controllers/admin/tokens.php:2081
+#: application/controllers/admin/tokens.php:2101
 #: application/core/Survey_Common_Action.php:827
 #: application/helpers/admin/statistics_helper.php:1456
 #: application/helpers/admin/statistics_helper.php:1589
@@ -948,7 +948,7 @@ msgid "Yes"
 msgstr ""
 
 #: application/controllers/admin/conditionsaction.php:181
-#: application/controllers/admin/tokens.php:2144
+#: application/controllers/admin/tokens.php:2164
 #: application/views/admin/assessments_view.php:122
 #: application/views/admin/conditions/includes/conditions_scenario.php:13
 #: application/views/admin/labels/labelview_view.php:161
@@ -978,7 +978,7 @@ msgid "We recommend that before you proceed, you export the entire survey from t
 msgstr ""
 
 #: application/controllers/admin/conditionsaction.php:190
-#: application/controllers/admin/tokens.php:1437
+#: application/controllers/admin/tokens.php:1458
 #: application/controllers/admin/useraction.php:157
 #: application/views/admin/dataentry/import.php:31
 #: application/views/admin/survey/Question/questionbar_view.php:193
@@ -1006,8 +1006,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:2283
-#: application/controllers/admin/tokens.php:2318
+#: application/controllers/admin/tokens.php:2303
+#: application/controllers/admin/tokens.php:2338
 #: application/controllers/admin/useraction.php:720
 #: application/helpers/common_helper.php:6229
 #: application/helpers/common_helper.php:6234
@@ -1096,7 +1096,7 @@ msgstr ""
 #: application/controllers/admin/printablesurvey.php:1188
 #: application/controllers/admin/quotas.php:518
 #: application/controllers/admin/surveyadmin.php:612
-#: application/controllers/admin/tokens.php:2083
+#: application/controllers/admin/tokens.php:2103
 #: application/core/Survey_Common_Action.php:823
 #: application/helpers/admin/statistics_helper.php:1457
 #: application/helpers/admin/statistics_helper.php:1590
@@ -1683,7 +1683,7 @@ msgstr ""
 #: application/controllers/admin/dataentry.php:306
 #: application/controllers/admin/labels.php:100
 #: application/controllers/admin/labels.php:133
-#: application/controllers/admin/participantsaction.php:1369
+#: application/controllers/admin/participantsaction.php:1386
 #: application/controllers/admin/question.php:55
 #: application/controllers/admin/questiongroup.php:55
 #: application/controllers/admin/surveyadmin.php:204
@@ -1787,8 +1787,8 @@ msgid "Save"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:1587
-#: application/controllers/admin/tokens.php:848
-#: application/controllers/admin/tokens.php:1014
+#: application/controllers/admin/tokens.php:854
+#: application/controllers/admin/tokens.php:1025
 #: application/controllers/admin/useraction.php:149
 #: application/views/admin/dataentry/insert.php:73
 #: application/views/admin/dataentry/iteratesurvey.php:5
@@ -1932,223 +1932,223 @@ msgid "The answer(s) must meet these array_filter criteria:"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2495
-#: application/controllers/admin/tokens.php:1772
+#: application/controllers/admin/tokens.php:1793
 #: application/views/admin/participants/importCSV_view.php:17
 msgid "ARMSCII-8 Armenian"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2496
-#: application/controllers/admin/tokens.php:1773
+#: application/controllers/admin/tokens.php:1794
 #: application/views/admin/participants/importCSV_view.php:18
 msgid "US ASCII"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2497
-#: application/controllers/admin/tokens.php:1774
+#: application/controllers/admin/tokens.php:1795
 #: application/views/admin/participants/importCSV_view.php:19
 msgid "Automatic"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2498
-#: application/controllers/admin/tokens.php:1775
+#: application/controllers/admin/tokens.php:1796
 #: application/views/admin/participants/importCSV_view.php:20
 msgid "Big5 Traditional Chinese"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2499
-#: application/controllers/admin/tokens.php:1776
+#: application/controllers/admin/tokens.php:1797
 #: application/views/admin/participants/importCSV_view.php:21
 msgid "Binary pseudo charset"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2500
-#: application/controllers/admin/tokens.php:1777
+#: application/controllers/admin/tokens.php:1798
 #: application/views/admin/participants/importCSV_view.php:22
 msgid "Windows Central European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2501
-#: application/controllers/admin/tokens.php:1778
+#: application/controllers/admin/tokens.php:1799
 #: application/views/admin/participants/importCSV_view.php:23
 msgid "Windows Cyrillic"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2502
-#: application/controllers/admin/tokens.php:1779
+#: application/controllers/admin/tokens.php:1800
 #: application/views/admin/participants/importCSV_view.php:24
 msgid "Windows Arabic"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2503
-#: application/controllers/admin/tokens.php:1780
+#: application/controllers/admin/tokens.php:1801
 #: application/views/admin/participants/importCSV_view.php:25
 msgid "Windows Baltic"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2504
-#: application/controllers/admin/tokens.php:1781
+#: application/controllers/admin/tokens.php:1802
 #: application/views/admin/participants/importCSV_view.php:26
 msgid "DOS West European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2505
-#: application/controllers/admin/tokens.php:1782
+#: application/controllers/admin/tokens.php:1803
 #: application/views/admin/participants/importCSV_view.php:27
 msgid "DOS Central European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2506
-#: application/controllers/admin/tokens.php:1783
+#: application/controllers/admin/tokens.php:1804
 #: application/views/admin/participants/importCSV_view.php:28
 msgid "DOS Russian"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2507
-#: application/controllers/admin/tokens.php:1784
+#: application/controllers/admin/tokens.php:1805
 #: 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:1785
+#: application/controllers/admin/tokens.php:1806
 #: application/views/admin/participants/importCSV_view.php:30
 msgid "DEC West European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2509
-#: application/controllers/admin/tokens.php:1786
+#: application/controllers/admin/tokens.php:1807
 #: 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:1787
+#: application/controllers/admin/tokens.php:1808
 #: application/views/admin/participants/importCSV_view.php:32
 msgid "EUC-KR Korean"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2511
-#: application/controllers/admin/tokens.php:1788
+#: application/controllers/admin/tokens.php:1809
 #: application/views/admin/participants/importCSV_view.php:33
 msgid "GB2312 Simplified Chinese"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2512
-#: application/controllers/admin/tokens.php:1789
+#: application/controllers/admin/tokens.php:1810
 #: application/views/admin/participants/importCSV_view.php:34
 msgid "GBK Simplified Chinese"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2513
-#: application/controllers/admin/tokens.php:1790
+#: application/controllers/admin/tokens.php:1811
 #: application/views/admin/participants/importCSV_view.php:35
 msgid "GEOSTD8 Georgian"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2514
-#: application/controllers/admin/tokens.php:1791
+#: application/controllers/admin/tokens.php:1812
 #: 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:1792
+#: application/controllers/admin/tokens.php:1813
 #: 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:1793
+#: application/controllers/admin/tokens.php:1814
 #: application/views/admin/participants/importCSV_view.php:38
 msgid "HP West European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2517
-#: application/controllers/admin/tokens.php:1794
+#: application/controllers/admin/tokens.php:1815
 #: 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:1795
+#: application/controllers/admin/tokens.php:1816
 #: 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:1796
+#: application/controllers/admin/tokens.php:1817
 #: application/views/admin/participants/importCSV_view.php:41
 msgid "KOI8-U Ukrainian"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2520
-#: application/controllers/admin/tokens.php:1797
+#: application/controllers/admin/tokens.php:1818
 #: application/views/admin/participants/importCSV_view.php:42
 msgid "cp1252 West European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2521
-#: application/controllers/admin/tokens.php:1798
+#: application/controllers/admin/tokens.php:1819
 #: 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:1799
+#: application/controllers/admin/tokens.php:1820
 #: 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:1800
+#: application/controllers/admin/tokens.php:1821
 #: 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:1801
+#: application/controllers/admin/tokens.php:1822
 #: application/views/admin/participants/importCSV_view.php:46
 msgid "Mac Central European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2525
-#: application/controllers/admin/tokens.php:1802
+#: application/controllers/admin/tokens.php:1823
 #: application/views/admin/participants/importCSV_view.php:47
 msgid "Mac West European"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2526
-#: application/controllers/admin/tokens.php:1803
+#: application/controllers/admin/tokens.php:1824
 #: application/views/admin/participants/importCSV_view.php:48
 msgid "Shift-JIS Japanese"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2527
-#: application/controllers/admin/tokens.php:1804
+#: application/controllers/admin/tokens.php:1825
 #: application/views/admin/participants/importCSV_view.php:49
 msgid "7bit Swedish"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2528
-#: application/controllers/admin/tokens.php:1805
+#: application/controllers/admin/tokens.php:1826
 #: application/views/admin/participants/importCSV_view.php:50
 msgid "TIS620 Thai"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2529
-#: application/controllers/admin/tokens.php:1806
+#: application/controllers/admin/tokens.php:1827
 #: application/views/admin/participants/importCSV_view.php:51
 msgid "UCS-2 Unicode"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2530
-#: application/controllers/admin/tokens.php:1807
+#: application/controllers/admin/tokens.php:1828
 #: application/views/admin/participants/importCSV_view.php:52
 msgid "EUC-JP Japanese"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:2531
-#: application/controllers/admin/tokens.php:1808
+#: application/controllers/admin/tokens.php:1829
 #: application/views/admin/participants/importCSV_view.php:53
 msgid "UTF-8 Unicode"
 msgstr ""
@@ -2397,41 +2397,41 @@ msgstr ""
 msgid "Attribute display setting updated"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:531
-#: application/controllers/admin/participantsaction.php:551
+#: application/controllers/admin/participantsaction.php:540
+#: application/controllers/admin/participantsaction.php:560
 msgid "Export %s participant(s) to CSV"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:652
-#: application/controllers/admin/participantsaction.php:666
+#: application/controllers/admin/participantsaction.php:661
+#: application/controllers/admin/participantsaction.php:675
 msgid "%s participant(s) are to be copied "
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1732
+#: application/controllers/admin/participantsaction.php:1752
 msgid "%s participants have been shared"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1752
+#: application/controllers/admin/participantsaction.php:1772
 msgid "%s participants have been copied to the central participants table"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1755
-#: application/controllers/admin/participantsaction.php:1779
-#: application/controllers/admin/participantsaction.php:1809
+#: application/controllers/admin/participantsaction.php:1775
+#: application/controllers/admin/participantsaction.php:1799
+#: application/controllers/admin/participantsaction.php:1829
 msgid "%s entries were not copied because they already existed"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1759
+#: application/controllers/admin/participantsaction.php:1779
 msgid "Attribute values for existing participants have been updated from the token records"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1776
-#: application/controllers/admin/participantsaction.php:1806
+#: application/controllers/admin/participantsaction.php:1796
+#: application/controllers/admin/participantsaction.php:1826
 msgid "%s participants have been copied to the survey token table"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1783
-#: application/controllers/admin/participantsaction.php:1813
+#: application/controllers/admin/participantsaction.php:1803
+#: application/controllers/admin/participantsaction.php:1833
 msgid "Attribute values for existing participants have been updated from the participants records"
 msgstr ""
 
@@ -3006,8 +3006,8 @@ msgid "Delete"
 msgstr ""
 
 #: application/controllers/admin/surveypermission.php:109
-#: application/controllers/admin/tokens.php:402
-#: application/controllers/admin/tokens.php:479
+#: application/controllers/admin/tokens.php:408
+#: application/controllers/admin/tokens.php:485
 #: application/views/admin/assessments_view.php:32
 #: application/views/admin/responses/browseidheader_view.php:14
 #: application/views/admin/saved/savedlist_view.php:29
@@ -3379,237 +3379,237 @@ msgstr ""
 msgid "We are sorry but you don't have permissions to do this."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:394
-#: application/controllers/admin/tokens.php:470
+#: application/controllers/admin/tokens.php:400
+#: application/controllers/admin/tokens.php:476
 msgid "Do survey"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:398
-#: application/controllers/admin/tokens.php:474
+#: application/controllers/admin/tokens.php:404
+#: application/controllers/admin/tokens.php:480
 #: 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:402
-#: application/controllers/admin/tokens.php:479
+#: application/controllers/admin/tokens.php:408
+#: application/controllers/admin/tokens.php:485
 msgid "Delete token entry"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:408
-#: application/controllers/admin/tokens.php:485
+#: application/controllers/admin/tokens.php:414
+#: application/controllers/admin/tokens.php:491
 msgid "Send invitation email to this person (if they have not yet been sent an invitation email)"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:410
-#: application/controllers/admin/tokens.php:487
+#: application/controllers/admin/tokens.php:416
+#: application/controllers/admin/tokens.php:493
 msgid "Send reminder email to this person (if they have already received the invitation email)"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:417
-#: application/controllers/admin/tokens.php:492
+#: application/controllers/admin/tokens.php:423
+#: application/controllers/admin/tokens.php:498
 #: application/views/admin/token/tokenform.php:5
 msgid "Edit token entry"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:419
-#: application/controllers/admin/tokens.php:494
+#: application/controllers/admin/tokens.php:425
+#: application/controllers/admin/tokens.php:500
 msgid "View this person in the central participants database"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:596
-#: application/controllers/admin/tokens.php:627
-#: application/controllers/admin/tokens.php:733
-#: application/controllers/admin/tokens.php:838
-#: application/controllers/admin/tokens.php:961
+#: application/controllers/admin/tokens.php:602
+#: application/controllers/admin/tokens.php:633
+#: application/controllers/admin/tokens.php:739
+#: application/controllers/admin/tokens.php:844
+#: application/controllers/admin/tokens.php:972
 msgid "%s cannot be empty"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:849
+#: application/controllers/admin/tokens.php:855
 msgid "The token entry was successfully updated."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:850
-#: application/controllers/admin/tokens.php:1016
+#: application/controllers/admin/tokens.php:856
 #: application/controllers/admin/tokens.php:1027
+#: application/controllers/admin/tokens.php:1038
 #: 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:856
-#: application/controllers/admin/tokens.php:1023
+#: application/controllers/admin/tokens.php:862
+#: application/controllers/admin/tokens.php:1034
 #: application/views/admin/token/addtokenpost.php:12
 #: application/views/admin/token/ldappost.php:5
 msgid "Failed"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:857
+#: application/controllers/admin/tokens.php:863
 #: 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:858
+#: application/controllers/admin/tokens.php:864
 msgid "Show this token entry"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1015
+#: application/controllers/admin/tokens.php:1026
 msgid "New dummy tokens were added."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1024
+#: application/controllers/admin/tokens.php:1035
 msgid "Only %s new dummy tokens were added after %s trials."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1025
+#: application/controllers/admin/tokens.php:1036
 msgid "Try with a bigger token length."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1125
+#: application/controllers/admin/tokens.php:1141
 msgid "%s field(s) were successfully added."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1126
-#: application/controllers/admin/tokens.php:1177
+#: application/controllers/admin/tokens.php:1142
+#: application/controllers/admin/tokens.php:1193
 msgid "Back to attribute field management."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1176
+#: application/controllers/admin/tokens.php:1192
 msgid "Token attribute descriptions were successfully updated."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1369
+#: application/controllers/admin/tokens.php:1390
 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) delayed: Token is not yet valid."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1373
+#: application/controllers/admin/tokens.php:1394
 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) skipped: Token is not valid anymore."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1383
+#: application/controllers/admin/tokens.php:1404
 msgid "Invitation sent to:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1388
+#: application/controllers/admin/tokens.php:1409
 msgid "Reminder sent to:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1406
+#: application/controllers/admin/tokens.php:1427
 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) failed. Error Message:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1438
+#: application/controllers/admin/tokens.php:1459
 msgid "There were no eligible emails to send. This will be because none satisfied the criteria of:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1439
+#: application/controllers/admin/tokens.php:1460
 msgid "having a valid email address"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1440
+#: application/controllers/admin/tokens.php:1461
 msgid "not having been sent an invitation already"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1441
+#: application/controllers/admin/tokens.php:1462
 msgid "having already completed the survey"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1442
+#: application/controllers/admin/tokens.php:1463
 msgid "having a token"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1524
+#: application/controllers/admin/tokens.php:1545
 msgid "Uploading LDAP Query"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1737
+#: application/controllers/admin/tokens.php:1758
 msgid "Can't bind to the LDAP directory"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1744
+#: application/controllers/admin/tokens.php:1765
 msgid "Can't connect to the LDAP directory"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2078
-#: application/controllers/admin/tokens.php:2105
+#: application/controllers/admin/tokens.php:2098
+#: application/controllers/admin/tokens.php:2125
 msgid "Create tokens"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2079
+#: application/controllers/admin/tokens.php:2099
 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:2096
+#: application/controllers/admin/tokens.php:2116
 msgid "Only %s token has been created."
 msgid_plural "Only %s tokens have been created."
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/controllers/admin/tokens.php:2097
+#: application/controllers/admin/tokens.php:2117
 msgid "Need %s token."
 msgid_plural "Need %s tokens."
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/controllers/admin/tokens.php:2102
+#: application/controllers/admin/tokens.php:2122
 msgid "%s token has been created."
 msgid_plural "%s tokens have been created."
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/controllers/admin/tokens.php:2138
-#: application/controllers/admin/tokens.php:2160
+#: application/controllers/admin/tokens.php:2158
+#: application/controllers/admin/tokens.php:2180
 msgid "Delete Tokens Table"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2139
+#: application/controllers/admin/tokens.php:2159
 msgid "If you delete this table tokens will no longer be required to access this survey."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2139
+#: application/controllers/admin/tokens.php:2159
 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:2142
+#: application/controllers/admin/tokens.php:2162
 msgid "Delete Tokens"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2161
+#: application/controllers/admin/tokens.php:2181
 msgid "The tokens table has now been removed and tokens are no longer required to access this survey."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2161
+#: application/controllers/admin/tokens.php:2181
 msgid "A backup of this table has been made and can be accessed by your system administrator."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2206
+#: application/controllers/admin/tokens.php:2226
 #: 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:2207
+#: application/controllers/admin/tokens.php:2227
 msgid "Bounce settings have been saved."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2280
+#: application/controllers/admin/tokens.php:2300
 #: 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:2281
+#: application/controllers/admin/tokens.php:2301
 msgid "A token table has been created for this survey."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2315
+#: application/controllers/admin/tokens.php:2335
 msgid "Import old tokens"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2316
+#: application/controllers/admin/tokens.php:2336
 msgid "A token table has been created for this survey and the old tokens were imported."
 msgstr ""
 
diff --git a/locale/cs/LC_MESSAGES/cs.mo b/locale/cs/LC_MESSAGES/cs.mo
index 44ef55c60b7..d4d0a022b50 100644
Binary files a/locale/cs/LC_MESSAGES/cs.mo and b/locale/cs/LC_MESSAGES/cs.mo differ
diff --git a/locale/tr/LC_MESSAGES/tr.mo b/locale/tr/LC_MESSAGES/tr.mo
index f70d5c71819..8182835942c 100644
Binary files a/locale/tr/LC_MESSAGES/tr.mo and b/locale/tr/LC_MESSAGES/tr.mo differ
diff --git a/scripts/admin/admin_core.js b/scripts/admin/admin_core.js
index e51e76582e5..168a9bc8a30 100644
--- a/scripts/admin/admin_core.js
+++ b/scripts/admin/admin_core.js
@@ -244,6 +244,9 @@ function qTypeDropdownInit()
                 corner:{
                     target: 'leftMiddle',
                     tooltip:'rightMiddle'
+                },
+                adjust:{
+                    screen: true
                 }
             },
             show: 'mouseover'