3.2.9.4 pre-release

qtranslate · Mar 28, 2015 · dd0a2ff · dd0a2ff
1 parent 092d8b6
commit dd0a2ff
Show file tree

Hide file tree

Showing 33 changed files with 750 additions and 849 deletions.
diff --git a/admin/qtx_activation_hook.php b/admin/qtx_activation_hook.php
@@ -147,7 +147,7 @@ function qtranxf_admin_notices_version()
 		$ver_prv = 32920;
 	}
 	if($ver_prv >= 32920 && $ver_cur <= 33000){
-		qtranxf_admin_notices_new_options(array('Highlight Style','LSB Style'),QTX_VERSION);
+		qtranxf_admin_notices_new_options(array('Highlight Style','LSB Style'),'3.3');
 	}
 }
 add_action('admin_notices', 'qtranxf_admin_notices_version');

diff --git a/admin/qtx_configuration.php b/admin/qtx_configuration.php
@@ -1363,7 +1363,9 @@ function qtranxf_conf() {
 					</fieldset><br />
 					<textarea id="highlight_mode_custom_css" name="highlight_mode_custom_css" style="width:100%"><?php echo esc_attr($highlight_mode_custom_css); ?></textarea>
 					<br />
-					<small><?php echo __('To reset to default, clear the text.', 'qtranslate').' '; printf(__('The color in use is taken from your profile option %s, the third color.', 'qtranslate'), '"<a href="'.admin_url('/profile.php').'">'.__('Admin Color Scheme').'</a>"') ?></small>
+					<small><?php echo __('To reset to default, clear the text.', 'qtranslate').' '; printf(__('The color in use is taken from your profile option %s, the third color.', 'qtranslate'), '"<a href="'.admin_url('/profile.php').'">'
+					/* TRANSLATORS: String obtained from WordPress core */
+					.__('Admin Color Scheme').'</a>"') ?></small>
 				</td>
 			</tr>
 <?php /*

diff --git a/admin/qtx_languages.php b/admin/qtx_languages.php
@@ -87,10 +87,13 @@ function qtranxf_enableLanguage($lang) {
  */
 function qtranxf_deleteLanguage($lang) {
 	global $q_config;
-	if( !qtranxf_language_predefined($lang) && $q_config['default_language'] == $lang ){
-		//if($q_config['default_language']==$lang) $error = ;
-		//if(!isset($q_config['language_name'][$lang])||strtolower($lang)=='code') $error = __('No such language!', 'qtranslate');
-		return __('Cannot delete Default Language!', 'qtranslate');
+	if( !qtranxf_language_predefined($lang) ){
+		if( $q_config['default_language'] == $lang ){
+			//if($q_config['default_language']==$lang) $error = ;
+			//if(!isset($q_config['language_name'][$lang])||strtolower($lang)=='code') $error = __('No such language!', 'qtranslate');
+			return __('Cannot delete Default Language!', 'qtranslate');
+		}
+		qtranxf_disableLanguage($lang);
 	}
 	$langs=array(); qtranxf_load_languages($langs);
 	qtranxf_unsetLanguage($langs,$lang);

diff --git a/lang/qtranslate-ar.po b/lang/qtranslate-ar.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: qTranslate-X 3.2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-27 15:27-0600\n"
+"POT-Creation-Date: 2015-03-27 21:19-0600\n"
 "PO-Revision-Date: 2015-03-22 07:40+0200\n"
 "Last-Translator: nedal <nedal@arabhosters.com>\n"
 "Language-Team: qTranslate Team Translators <nedal.elghamry@gmail.com>\n"
@@ -126,8 +126,8 @@ msgstr "الاسم"
 msgid "Action"
 msgstr "الحالة"
 
-#: admin/qtx_admin_utils.php:409 admin/qtx_configuration.php:1412
-#: admin/qtx_configuration.php:1437
+#: admin/qtx_admin_utils.php:409 admin/qtx_configuration.php:1414
+#: admin/qtx_configuration.php:1439
 msgid "Edit"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgid "Stored"
 msgstr ""
 
 #: admin/qtx_admin_utils.php:421 admin/qtx_configuration.php:539
-#: admin/qtx_configuration.php:1395
+#: admin/qtx_configuration.php:1397
 msgid "Languages"
 msgstr "اللغات"
 
@@ -707,102 +707,98 @@ msgstr ""
 msgid "Draw a border around translatable fields."
 msgstr ""
 
-#: admin/qtx_configuration.php:1366
-msgid "Admin Color Scheme"
-msgstr ""
-
 #: admin/qtx_configuration.php:1366
 #, php-format
 msgid "The color in use is taken from your profile option %s, the third color."
 msgstr ""
 
-#: admin/qtx_configuration.php:1404
+#: admin/qtx_configuration.php:1406
 #, fuzzy
 msgid "List of Configured Languages"
 msgstr "لغة مصدر"
 
-#: admin/qtx_configuration.php:1409
+#: admin/qtx_configuration.php:1411
 #, php-format
 msgid "Only enabled languages are loaded at front-end, while all %d configured languages are listed here."
 msgstr ""
 
-#: admin/qtx_configuration.php:1410
+#: admin/qtx_configuration.php:1412
 msgid "The table below contains both pre-defined and manually added or modified languages."
 msgstr ""
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1438
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1440
 msgid "Delete"
 msgstr ""
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1436
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1438
 msgid "Disable"
 msgstr ""
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1436
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1438
 msgid "Enable"
 msgstr ""
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1438
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1440
 msgid "Reset"
 msgstr ""
 
-#: admin/qtx_configuration.php:1411
+#: admin/qtx_configuration.php:1413
 #, php-format
 msgid "You may %s or %s a language, or %s manually added language, or %s previous modifications of a pre-defined language."
 msgstr ""
 
-#: admin/qtx_configuration.php:1412
+#: admin/qtx_configuration.php:1414
 #, php-format
 msgid "Click %s to modify language properties."
 msgstr ""
 
-#: admin/qtx_configuration.php:1434
+#: admin/qtx_configuration.php:1436
 #, php-format
 msgid "%s Flag"
 msgstr ""
 
-#: admin/qtx_configuration.php:1436
+#: admin/qtx_configuration.php:1438
 msgid "Default"
 msgstr ""
 
-#: admin/qtx_configuration.php:1438
+#: admin/qtx_configuration.php:1440
 msgid "Pre-Defined"
 msgstr ""
 
-#: admin/qtx_configuration.php:1447
+#: admin/qtx_configuration.php:1449
 msgid "Enabling a language will cause qTranslate to update the Gettext-Database for the language, which can take a while depending on your server's connection speed."
 msgstr "تفعيل لغة ستسبب qTranslate بتحديث قاعدة البيانات Gettext الخاصة باللغة, سوف تستغرق العملية بعض الوقت حسب سرعة اتصال الخادم بالانترنت."
 
-#: admin/qtx_configuration.php:1454
+#: admin/qtx_configuration.php:1456
 msgid "Add Language"
 msgstr "اضافة لغة"
 
-#: admin/qtx_configuration.php:1457
+#: admin/qtx_configuration.php:1459
 msgid "Add Language &raquo;"
 msgstr "اضافة لغة"
 
-#: admin/qtx_configuration.php:1479
+#: admin/qtx_configuration.php:1481
 msgid "Language Menu"
 msgstr "قائمة اللغة"
 
-#: admin/qtx_configuration.php:1528
+#: admin/qtx_configuration.php:1530
 msgid "Help"
 msgstr "مساعدة"
 
-#: admin/qtx_configuration.php:1530
+#: admin/qtx_configuration.php:1532
 #, php-format
 msgid "Menu item added is replaced with a sub-menu of available languages when menu is rendered. Depending on how your theme renders menu you may need to override and customize css entries %s and %s, originally defined in %s. The field \"URL\" of inserted menu item allows additional configuration described in %sFAQ%s."
 msgstr ""
 
-#: admin/qtx_configuration.php:1535
+#: admin/qtx_configuration.php:1537
 msgid "Add to Menu"
 msgstr ""
 
-#: admin/qtx_configuration.php:1545
+#: admin/qtx_configuration.php:1547
 msgid "Language Switcher"
 msgstr ""
 
-#: admin/qtx_configuration.php:1590
+#: admin/qtx_configuration.php:1592
 msgid "Settings"
 msgstr "الإعدادات"
 
@@ -886,7 +882,7 @@ msgstr "حذف جميع التصنيفات/الوسوم/الروابط"
 msgid "If something isn't working correctly, you can always try to reset all qTranslate settings. A Reset won't delete any posts but will remove all settings (including all languages added)."
 msgstr "اذا حدث اي شئ خاطئ يمكن اجراء اعادة تعيين الاعدادات للحالة الافتراضية. اعادة التعيين لن تقوم بمسح اي محتوي او موضوع فقط سيتم حذف الاعدادات (متضمنة اللغات التي تمت اضافتها)"
 
-#: admin/qtx_languages.php:93
+#: admin/qtx_languages.php:94
 #, fuzzy
 msgid "Cannot delete Default Language!"
 msgstr "لا يمكن تعطيل اللغة الاساسية"

diff --git a/lang/qtranslate-az_AZ.po b/lang/qtranslate-az_AZ.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: qTranslate-X 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-27 15:27-0600\n"
+"POT-Creation-Date: 2015-03-27 21:19-0600\n"
 "PO-Revision-Date: 2009-09-10 12:00+0400\n"
 "Last-Translator: Rashad Aliyev <rashadaliyev@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,8 +120,8 @@ msgstr "İsim"
 msgid "Action"
 msgstr "Fəaliyyət"
 
-#: admin/qtx_admin_utils.php:409 admin/qtx_configuration.php:1412
-#: admin/qtx_configuration.php:1437
+#: admin/qtx_admin_utils.php:409 admin/qtx_configuration.php:1414
+#: admin/qtx_configuration.php:1439
 msgid "Edit"
 msgstr "Düzəliş"
 
@@ -130,7 +130,7 @@ msgid "Stored"
 msgstr ""
 
 #: admin/qtx_admin_utils.php:421 admin/qtx_configuration.php:539
-#: admin/qtx_configuration.php:1395
+#: admin/qtx_configuration.php:1397
 msgid "Languages"
 msgstr "Dillər"
 
@@ -710,104 +710,100 @@ msgstr ""
 msgid "Draw a border around translatable fields."
 msgstr ""
 
-#: admin/qtx_configuration.php:1366
-msgid "Admin Color Scheme"
-msgstr ""
-
 #: admin/qtx_configuration.php:1366
 #, php-format
 msgid "The color in use is taken from your profile option %s, the third color."
 msgstr ""
 
-#: admin/qtx_configuration.php:1404
+#: admin/qtx_configuration.php:1406
 #, fuzzy
 msgid "List of Configured Languages"
 msgstr "Dil"
 
-#: admin/qtx_configuration.php:1409
+#: admin/qtx_configuration.php:1411
 #, php-format
 msgid "Only enabled languages are loaded at front-end, while all %d configured languages are listed here."
 msgstr ""
 
-#: admin/qtx_configuration.php:1410
+#: admin/qtx_configuration.php:1412
 msgid "The table below contains both pre-defined and manually added or modified languages."
 msgstr ""
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1438
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1440
 msgid "Delete"
 msgstr "Sil"
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1436
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1438
 msgid "Disable"
 msgstr "Məhrum etmək"
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1436
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1438
 msgid "Enable"
 msgstr "Aktivləşdir"
 
-#: admin/qtx_configuration.php:1411 admin/qtx_configuration.php:1438
+#: admin/qtx_configuration.php:1413 admin/qtx_configuration.php:1440
 msgid "Reset"
 msgstr ""
 
-#: admin/qtx_configuration.php:1411
+#: admin/qtx_configuration.php:1413
 #, php-format
 msgid "You may %s or %s a language, or %s manually added language, or %s previous modifications of a pre-defined language."
 msgstr ""
 
-#: admin/qtx_configuration.php:1412
+#: admin/qtx_configuration.php:1414
 #, php-format
 msgid "Click %s to modify language properties."
 msgstr ""
 
-#: admin/qtx_configuration.php:1434
+#: admin/qtx_configuration.php:1436
 #, fuzzy, php-format
 msgid "%s Flag"
 msgstr "Bayraq"
 
-#: admin/qtx_configuration.php:1436
+#: admin/qtx_configuration.php:1438
 msgid "Default"
 msgstr "Təməl"
 
-#: admin/qtx_configuration.php:1438
+#: admin/qtx_configuration.php:1440
 msgid "Pre-Defined"
 msgstr ""
 
-#: admin/qtx_configuration.php:1447
+#: admin/qtx_configuration.php:1449
 msgid "Enabling a language will cause qTranslate to update the Gettext-Database for the language, which can take a while depending on your server's connection speed."
 msgstr ""
 
-#: admin/qtx_configuration.php:1454
+#: admin/qtx_configuration.php:1456
 msgid "Add Language"
 msgstr "Dil Əlavə et"
 
-#: admin/qtx_configuration.php:1457
+#: admin/qtx_configuration.php:1459
 msgid "Add Language &raquo;"
 msgstr "Dil Əlavə et &raquo;"
 
-#: admin/qtx_configuration.php:1479
+#: admin/qtx_configuration.php:1481
 #, fuzzy
 msgid "Language Menu"
 msgstr "Dil Kodu"
 
-#: admin/qtx_configuration.php:1528
+#: admin/qtx_configuration.php:1530
 msgid "Help"
 msgstr ""
 
-#: admin/qtx_configuration.php:1530
+#: admin/qtx_configuration.php:1532
 #, php-format
 msgid "Menu item added is replaced with a sub-menu of available languages when menu is rendered. Depending on how your theme renders menu you may need to override and customize css entries %s and %s, originally defined in %s. The field \"URL\" of inserted menu item allows additional configuration described in %sFAQ%s."
 msgstr ""
 
-#: admin/qtx_configuration.php:1535
+#: admin/qtx_configuration.php:1537
 msgid "Add to Menu"
 msgstr ""
 
-#: admin/qtx_configuration.php:1545
+#: admin/qtx_configuration.php:1547
 #, fuzzy
 msgid "Language Switcher"
 msgstr "Dil Kodu"
 
-#: admin/qtx_configuration.php:1590
+#: admin/qtx_configuration.php:1592
 msgid "Settings"
 msgstr "Xüsusiyyətlər"
 
@@ -894,7 +890,7 @@ msgstr "Kateqoriyalar, Etiketlər və Link Kateqoriyaları üçün edilən tərc
 msgid "If something isn't working correctly, you can always try to reset all qTranslate settings. A Reset won't delete any posts but will remove all settings (including all languages added)."
 msgstr "Eyər hər hansı bir şey düzgün işləmirsə, qTranslate tənzimləmələrinizi istədiyiniz vaxt sıfırlaya bilərsiniz. Sıfırlama prosesi məzmunları yox ancaq (əlavə etdiyiniz dillər də daxil olmaqla) bütün tənzimləmələri silər."
 
-#: admin/qtx_languages.php:93
+#: admin/qtx_languages.php:94
 #, fuzzy
 msgid "Cannot delete Default Language!"
 msgstr "Ana Dil Ləğv Passivləşdirilə Bilməz!"