merge recent changes into HEAD

1 files changed, 14 insertions, 0 deletions

diff --git a/admin/admin_languages_inc.php b/admin/admin_languages_inc.php
index aa7886e..3ce8ab2 100644
--- a/admin/admin_languages_inc.php
+++ b/admin/admin_languages_inc.php
@@ -4,6 +4,20 @@ $formLanguageToggles = array(
 		'label' => 'Browser Language Recognition',
 		'note' => 'This will automatically recognise what the browsers default language is set to and display that language.<br />Please make sure you import appropriate languages first and disable / remove languages you don\'t want to support since loading a language for the first time will induce a lot of database traffic and might cause your system to slow down temporarily.',
 	),
+	'interactive_translation' => array(
+		'label' => 'Interactive Translations',
+		'note' => 'This will help you translate your site very effitiently by giving you direct access to the correct translation page.<br />Once you are done translating, make sure you turn this feature off and clear the language cache.<br />This feature only works when you set <em>$smarty_force_compile</em> to TRUE in your <em>kernel/config_inc.php</em> file',
+		'page' => 'TranslationTutorial',
+		'link' => array(
+			'title' => 'Language cache',
+			'package' => 'languages',
+			'file' => 'edit_languages.php'
+		),
+	),
+	'interactive_bittranslation' => array(
+		'label' => 'Interactive bitTranslations',
+		'note' => 'If you have a <a href="http://doc.bitweaver.org/forums/viewtopic.php?t=948">translators account</a> on bitweaver.org, the translation links will redirect you there that you can modify the tranlations there. Due to the different setup on bitweaver.org, there might be strings that are not available for translation on that server.',
+	),
 	'record_untranslated' => array(
 		'label' => 'Record untranslated',
 		'note' => 'This will record any untranslated language strings.',